diff --git a/CHANGELOG.md b/CHANGELOG.md
index f228c6652..0ad531624 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,12 @@
-# v5.1.1-alpha1
+# v5.1.1-alpha2
+
+- 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.
+
+# v5.1.1-alpha
 
 - Move all banners to GitHub.
 - Adds library phpspreadsheet to JCB.
diff --git a/ComponentbuilderInstallerScript.php b/ComponentbuilderInstallerScript.php
index e02069517..685ff2eb9 100644
--- a/ComponentbuilderInstallerScript.php
+++ b/ComponentbuilderInstallerScript.php
@@ -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-alpha1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 5.1.1-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();
diff --git a/README.md b/README.md
index 3714ef1f9..c1cea0c26 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.1.1-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.1.1-alpha2) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 4th March, 2025
-+ *Version*: 5.1.1-alpha1
++ *Last Build*: 28th March, 2025
++ *Version*: 5.1.1-alpha2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **957964**
++ *Line count*: **975213**
 + *Field count*: **2098**
-+ *File count*: **6457**
++ *File count*: **6574**
 + *Folder count*: **645**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
diff --git a/admin/README.txt b/admin/README.txt
index 3714ef1f9..c1cea0c26 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.1.1-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.1.1-alpha2) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 4th March, 2025
-+ *Version*: 5.1.1-alpha1
++ *Last Build*: 28th March, 2025
++ *Version*: 5.1.1-alpha2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **957964**
++ *Line count*: **975213**
 + *Field count*: **2098**
-+ *File count*: **6457**
++ *File count*: **6574**
 + *Folder count*: **645**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
diff --git a/admin/compiler/joomla_4/ADMIN_AJAX_CONTROLLER.php b/admin/compiler/joomla_4/ADMIN_AJAX_CONTROLLER.php
index 2f67bb7db..7f9026741 100644
--- a/admin/compiler/joomla_4/ADMIN_AJAX_CONTROLLER.php
+++ b/admin/compiler/joomla_4/ADMIN_AJAX_CONTROLLER.php
@@ -72,7 +72,7 @@ class AjaxController extends BaseController
 		// return to a callback function
 		$callback     = $jinput->get('callback', null, 'CMD');
 		// Check Token!
-		$token        = Session::getFormToken();
+		$token        = Joomla___5ba38513_5c4f_4b0d_935e_49e986a6bce8___Power::getFormToken();
 		$call_token   = $jinput->get('token', 0, 'ALNUM');
 		if($jinput->get($token, 0, 'ALNUM') || $token === $call_token)
 		{
diff --git a/admin/compiler/joomla_4/ADMIN_AJAX_MODEL.php b/admin/compiler/joomla_4/ADMIN_AJAX_MODEL.php
index c02dcc00a..de1ddcced 100644
--- a/admin/compiler/joomla_4/ADMIN_AJAX_MODEL.php
+++ b/admin/compiler/joomla_4/ADMIN_AJAX_MODEL.php
@@ -56,7 +56,7 @@ class AjaxModel extends ListModel
 	{
 		parent::__construct($config, $factory);
 
-		$this->app_params = ComponentHelper::getParams('com_###component###');
-		$this->app ??= Factory::getApplication();
+		$this->app_params = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 	}###AJAX_MODEL_METHODS###
 }
diff --git a/admin/compiler/joomla_4/ADMIN_HEADERCHECK.php b/admin/compiler/joomla_4/ADMIN_HEADERCHECK.php
index e07898584..b6be60c54 100644
--- a/admin/compiler/joomla_4/ADMIN_HEADERCHECK.php
+++ b/admin/compiler/joomla_4/ADMIN_HEADERCHECK.php
@@ -51,7 +51,7 @@ class HeaderCheck
 	public function __construct()
 	{
 		// Initializes the application object.
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 
 		// Initializes the document object.
 		$this->document = $this->app->getDocument();
diff --git a/admin/compiler/joomla_4/ADMIN_HELPER_CLASS.php b/admin/compiler/joomla_4/ADMIN_HELPER_CLASS.php
index 87220944e..9e4d299a4 100644
--- a/admin/compiler/joomla_4/ADMIN_HELPER_CLASS.php
+++ b/admin/compiler/joomla_4/ADMIN_HELPER_CLASS.php
@@ -96,7 +96,7 @@ abstract class ###Component###Helper
 	public static function getContributors()
 	{
 		// get params
-		$params    = ComponentHelper::getParams('com_###component###');
+		$params    = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
 		// start contributors array
 		$contributors = [];
 		// get all Contributors (max 20)
@@ -134,7 +134,7 @@ abstract class ###Component###Helper
 	public static function addSubmenu($submenu)
 	{
 		// load user for access menus
-		$user = Factory::getApplication()->getIdentity();
+		$user = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();
 		// load the submenus to sidebar
 		###SUBMENU###
 	}###HELPER_CREATEUSER######HELPER_UIKIT######HELPER_EXEL###
@@ -216,7 +216,7 @@ abstract class ###Component###Helper
 		{
 			$type = 'item';
 		}
-		$db = Factory::getContainer()->get(DatabaseInterface::class);
+		$db = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);
 		$query = $db->getQuery(true);
 		$query->select(array('a.published'));
 		$query->from('#__###component###_'.$type.' AS a');
@@ -234,7 +234,7 @@ abstract class ###Component###Helper
 
 	public static function getGroupName($id)
 	{
-		$db = Factory::getContainer()->get(DatabaseInterface::class);
+		$db = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);
 		$query = $db->getQuery(true);
 		$query->select(array('a.title'));
 		$query->from('#__usergroups AS a');
@@ -268,7 +268,7 @@ abstract class ###Component###Helper
 		if (!Super___91004529_94a9_4590_b842_e7c6b624ecf5___Power::check($user))
 		{
 			// get the user object
-			$user = Factory::getApplication()->getIdentity();
+			$user = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();
 		}
 		// load the CMSObject
 		$result = new CMSObject;
@@ -472,7 +472,7 @@ abstract class ###Component###Helper
 		}
 
 		// Get the model through the MVCFactory
-		return Factory::getApplication()->bootComponent('com_' . $component)->getMVCFactory()->createModel($type, $prefix, $config);
+		return Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->bootComponent('com_' . $component)->getMVCFactory()->createModel($type, $prefix, $config);
 	}
 
 	/**
@@ -542,7 +542,7 @@ abstract class ###Component###Helper
 
 			if (!$asset->check() || !$asset->store())
 			{
-				Factory::getApplication()->enqueueMessage($asset->getError(), 'warning');
+				Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->enqueueMessage($asset->getError(), 'warning');
 				return false;
 			}
 			else
@@ -555,7 +555,7 @@ abstract class ###Component###Helper
 				$object->asset_id = (int) $asset->id;
 
 				// Update their asset_id to link to the asset table.
-				return Factory::getDbo()->updateObject('#__###component###_'.$table, $object, 'id');
+				return Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo()->updateObject('#__###component###_'.$table, $object, 'id');
 			}
 		}
 		return false;
@@ -572,7 +572,7 @@ abstract class ###Component###Helper
 		if (!$inherit)
 		{
 			// Need to find the asset id by the name of the component.
-			$db = Factory::getContainer()->get(DatabaseInterface::class);
+			$db = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);
 			$query = $db->getQuery(true)
 				->select($db->quoteName('id'))
 				->from($db->quoteName('#__assets'))
diff --git a/admin/compiler/joomla_4/ADMIN_HELPER_CONTROLLER.php b/admin/compiler/joomla_4/ADMIN_HELPER_CONTROLLER.php
index 91b90a0d1..81cb2fabb 100644
--- a/admin/compiler/joomla_4/ADMIN_HELPER_CONTROLLER.php
+++ b/admin/compiler/joomla_4/ADMIN_HELPER_CONTROLLER.php
@@ -41,10 +41,10 @@ class HelpController extends BaseController
 
 	public function help()
 	{
-		$user       = Factory::getApplication()->getIdentity();
-		$jinput     = Factory::getApplication()->input;
+		$user       = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();
+		$jinput     = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input;
 		// Check Token!
-		$token         = Session::getFormToken();
+		$token         = Joomla___5ba38513_5c4f_4b0d_935e_49e986a6bce8___Power::getFormToken();
 		$call_token    = $jinput->get('token', 0, 'ALNUM');
 		if($user->id != 0 && ($jinput->get($token, 0, 'ALNUM') || $token === $call_token))
 		{
@@ -83,7 +83,7 @@ class HelpController extends BaseController
 
 	protected function getHelpDocumentText($id)
 	{
-		$db       = Factory::getContainer()->get(DatabaseInterface::class);
+		$db       = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);
 		$query    = $db->getQuery(true);
 		$query->select(array('a.title','a.content'));
 		$query->from('#__###component###_help_document AS a');
@@ -96,18 +96,18 @@ class HelpController extends BaseController
 			$text = [];
 			$document = $db->loadObject();
 			// fix image issue
-			$images['src="images'] = 'src="'.Uri::root().'images';
-			$images["src='images"] = "src='".Uri::root()."images";
-			$images['src="/images'] = 'src="'.Uri::root().'images';
-			$images["src='/images"] = "src='".Uri::root()."images";
+			$images['src="images'] = 'src="'.Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root().'images';
+			$images["src='images"] = "src='".Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root()."images";
+			$images['src="/images'] = 'src="'.Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root().'images';
+			$images["src='/images"] = "src='".Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root()."images";
 			// set document template
 			$text[] = "<!doctype html>";
 			$text[] = '<html>';
 			$text[] = "<head>";
 			$text[] = '<meta charset="utf-8">';
 			$text[] = "<title>".$document->title."</title>";
-			$text[] = '<link type="text/css" href="'.Uri::root().'media/com_###component###/uikit/css/uikit.gradient.min.css" rel="stylesheet"></link>';
-			$text[] = '<script type="text/javascript" src="'.Uri::root().'media/com_###component###/uikit/js/uikit.min.js"></script>';
+			$text[] = '<link type="text/css" href="'.Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root().'media/com_###component###/uikit/css/uikit.gradient.min.css" rel="stylesheet"></link>';
+			$text[] = '<script type="text/javascript" src="'.Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root().'media/com_###component###/uikit/js/uikit.min.js"></script>';
 			$text[] = "</head>";
 			$text[] = '<body><br />';
 			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
diff --git a/admin/compiler/joomla_4/ADMIN_HELPER_EMAIL.php b/admin/compiler/joomla_4/ADMIN_HELPER_EMAIL.php
index ac42ef225..3576ca1a4 100644
--- a/admin/compiler/joomla_4/ADMIN_HELPER_EMAIL.php
+++ b/admin/compiler/joomla_4/ADMIN_HELPER_EMAIL.php
@@ -66,7 +66,7 @@ abstract class ###Component###Email
 	{
 		if (!self::$config)
 		{
-			self::$config = ComponentHelper::getParams('com_###component###');
+			self::$config = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
 		}
 
 		return self::$config;
@@ -153,7 +153,7 @@ abstract class ###Component###Email
 		if ('global' == $mailer)
 		{
 			// get the global details
-			$globalConf  = Factory::getConfig();
+			$globalConf  = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig();
 
 			$mailer      = $globalConf->get('mailer');
 			$smtpauth    = ($globalConf->get('smtpauth') == 0) ? null : 1;
diff --git a/admin/compiler/joomla_4/ADMIN_IMPORT_CONTROLLER.php b/admin/compiler/joomla_4/ADMIN_IMPORT_CONTROLLER.php
index 865a18c44..1af255bc7 100644
--- a/admin/compiler/joomla_4/ADMIN_IMPORT_CONTROLLER.php
+++ b/admin/compiler/joomla_4/ADMIN_IMPORT_CONTROLLER.php
@@ -35,21 +35,21 @@ class ImportController extends BaseController
 	public function import()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Joomla___5ba38513_5c4f_4b0d_935e_49e986a6bce8___Power::checkToken() or jexit(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JINVALID_TOKEN'));
 
 		$model = $this->getModel('import');
 		if ($model->import())
 		{
-			$cache = Factory::getCache('mod_menu');
+			$cache = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getCache('mod_menu');
 			$cache->clean();
 			// TODO: Reset the users acl here as well to kill off any missing bits
 		}
 
-		$app = Factory::getApplication();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$redirect_url = $app->getUserState('com_###component###.redirect_url');
 		if (empty($redirect_url))
 		{
-			$redirect_url = Route::_('index.php?option=com_###component###&view=import', false);
+			$redirect_url = Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###&view=import', false);
 		}
 		else
 		{
diff --git a/admin/compiler/joomla_4/ADMIN_IMPORT_CONTROLLER_CUSTOM.php b/admin/compiler/joomla_4/ADMIN_IMPORT_CONTROLLER_CUSTOM.php
index 59b242d3d..afc9ae354 100644
--- a/admin/compiler/joomla_4/ADMIN_IMPORT_CONTROLLER_CUSTOM.php
+++ b/admin/compiler/joomla_4/ADMIN_IMPORT_CONTROLLER_CUSTOM.php
@@ -35,21 +35,21 @@ class ###View###importController extends BaseController
 	public function import()
 	{
 		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Joomla___5ba38513_5c4f_4b0d_935e_49e986a6bce8___Power::checkToken() or jexit(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JINVALID_TOKEN'));
 
 		$model = $this->getModel('###View###');
 		if ($model->import())
 		{
-			$cache = Factory::getCache('mod_menu');
+			$cache = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getCache('mod_menu');
 			$cache->clean();
 			// TODO: Reset the users acl here as well to kill off any missing bits
 		}
 
-		$app = Factory::getApplication();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$redirect_url = $app->getUserState('com_###component###.redirect_url');
 		if (empty($redirect_url))
 		{
-			$redirect_url = Route::_('index.php?option=com_###component###&view=###view###', false);
+			$redirect_url = Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###&view=###view###', false);
 		}
 		else
 		{
diff --git a/admin/compiler/joomla_4/ADMIN_IMPORT_HTML.php b/admin/compiler/joomla_4/ADMIN_IMPORT_HTML.php
index 87dee6372..1294513fc 100644
--- a/admin/compiler/joomla_4/ADMIN_IMPORT_HTML.php
+++ b/admin/compiler/joomla_4/ADMIN_IMPORT_HTML.php
@@ -63,7 +63,7 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// get the session object
-		$session = Factory::getSession();
+		$session = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getSession();
 		// check if it has package
 		$this->hasPackage     = $session->get('hasPackage', false);
 		$this->dataType     = $session->get('dataType', false);
@@ -93,18 +93,18 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_###COMPONENT###_IMPORT_TITLE'), 'upload');
+		Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::title(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_TITLE'), 'upload');
 
 		if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
 		{
-			ToolbarHelper::preferences('com_###component###');
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::preferences('com_###component###');
 		}
 
 		// set help url for this view if found
 		$this->help_url = ###Component###Helper::getHelpUrl('import');
 		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($this->help_url))
 		{
-			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 	}
 }
diff --git a/admin/compiler/joomla_4/ADMIN_IMPORT_HTML_CUSTOM.php b/admin/compiler/joomla_4/ADMIN_IMPORT_HTML_CUSTOM.php
index 7265d0600..0f1609460 100644
--- a/admin/compiler/joomla_4/ADMIN_IMPORT_HTML_CUSTOM.php
+++ b/admin/compiler/joomla_4/ADMIN_IMPORT_HTML_CUSTOM.php
@@ -43,18 +43,18 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_###COMPONENT###_IMPORT_TITLE'), 'upload');
+		Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::title(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_TITLE'), 'upload');
 
 		if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
 		{
-			ToolbarHelper::preferences('com_###component###');
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::preferences('com_###component###');
 		}
 
 		// set help url for this view if found
 		$this->help_url = ###Component###Helper::getHelpUrl('###view###');
 		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($this->help_url))
 		{
-			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 	}
 }
diff --git a/admin/compiler/joomla_4/ADMIN_IMPORT_MODEL.php b/admin/compiler/joomla_4/ADMIN_IMPORT_MODEL.php
index 70efddb07..308eda103 100644
--- a/admin/compiler/joomla_4/ADMIN_IMPORT_MODEL.php
+++ b/admin/compiler/joomla_4/ADMIN_IMPORT_MODEL.php
@@ -65,7 +65,7 @@ class ImportModel extends BaseDatabaseModel
 	 */
 	protected function populateState()
 	{
-		$app = Factory::getApplication('administrator');
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication('administrator');
 
 		$this->setState('message', $app->getUserState('com_###component###.message'));
 		$app->setUserState('com_###component###.message', '');
@@ -85,8 +85,8 @@ class ImportModel extends BaseDatabaseModel
 	public function import()
 	{
 		$this->setState('action', 'import');
-		$app = Factory::getApplication();
-		$session = Factory::getSession();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
+		$session = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getSession();
 		$package = null;
 		$continue = false;
 		// get import type
@@ -123,7 +123,7 @@ class ImportModel extends BaseDatabaseModel
 					break;
 
 				default:
-					$app->setUserState('com_###component###.message', Text::_('COM_###COMPONENT###_IMPORT_NO_IMPORT_TYPE_FOUND'));
+					$app->setUserState('com_###component###.message', Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_NO_IMPORT_TYPE_FOUND'));
 
 					return false;
 					break;
@@ -137,7 +137,7 @@ class ImportModel extends BaseDatabaseModel
 				$this->remove($package['packagename']);
 			}
 
-			$app->setUserState('com_###component###.message', Text::_('COM_###COMPONENT###_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'));
+			$app->setUserState('com_###component###.message', Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'));
 			return false;
 		}
 
@@ -155,7 +155,7 @@ class ImportModel extends BaseDatabaseModel
 		if (!$this->setData($package,$this->dataType,$headerList))
 		{
 			// There was an error importing the package
-			$msg = Text::_('COM_###COMPONENT###_IMPORT_ERROR');
+			$msg = Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_ERROR');
 			$back = $session->get('backto_VDM_IMPORT', NULL);
 			if ($back)
 			{
@@ -167,7 +167,7 @@ class ImportModel extends BaseDatabaseModel
 		else
 		{
 			// Package imported sucessfully
-			$msg = Text::sprintf('COM_###COMPONENT###_IMPORT_SUCCESS', $package['packagename']);
+			$msg = Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('COM_###COMPONENT###_IMPORT_SUCCESS', $package['packagename']);
 			$back = $session->get('backto_VDM_IMPORT', NULL);
 			if ($back)
 			{
@@ -195,7 +195,7 @@ class ImportModel extends BaseDatabaseModel
 	protected function _getPackageFromUpload()
 	{
 		// Get the uploaded file information
-		$app = Factory::getApplication();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$input = $app->input;
 
 		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
@@ -204,26 +204,26 @@ class ImportModel extends BaseDatabaseModel
 		// Make sure that file uploads are enabled in php
 		if (!(bool) ini_get('file_uploads'))
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
 			return false;
 		}
 
 		// If there is no uploaded file, we have a problem...
 		if (!is_array($userfile))
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
 			return false;
 		}
 
 		// Check if there was a problem uploading the file.
 		if ($userfile['error'] || $userfile['size'] < 1)
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
 			return false;
 		}
 
 		// Build the appropriate paths
-		$config = Factory::getConfig();
+		$config = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig();
 		$tmp_dest = $config->get('tmp_path') . '/' . $userfile['name'];
 		$tmp_src = $userfile['tmp_name'];
 
@@ -233,7 +233,7 @@ class ImportModel extends BaseDatabaseModel
 		// Was the package downloaded?
 		if (!$p_file)
 		{
-			$session = Factory::getSession();
+			$session = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getSession();
 			$session->clear('package');
 			$session->clear('dataType');
 			$session->clear('hasPackage');
@@ -255,7 +255,7 @@ class ImportModel extends BaseDatabaseModel
 	 */
 	protected function _getPackageFromFolder()
 	{
-		$app = Factory::getApplication();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$input = $app->input;
 
 		// Get the path to the package to import
@@ -264,7 +264,7 @@ class ImportModel extends BaseDatabaseModel
 		// Did you give us a valid path?
 		if (!file_exists($p_dir))
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
 			return false;
 		}
 
@@ -274,14 +274,14 @@ class ImportModel extends BaseDatabaseModel
 		// Did you give us a valid package?
 		if (!$type)
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
 		}
 
 		// check the extention
 		if(!$this->checkExtension($p_dir))
 		{
 			// set error message
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 		}
 
@@ -300,7 +300,7 @@ class ImportModel extends BaseDatabaseModel
 	 */
 	protected function _getPackageFromUrl()
 	{
-		$app = Factory::getApplication();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$input = $app->input;
 
 		// Get the URL of the package to import
@@ -309,7 +309,7 @@ class ImportModel extends BaseDatabaseModel
 		// Did you give us a URL?
 		if (!$url)
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'), 'warning');
 			return false;
 		}
 
@@ -319,7 +319,7 @@ class ImportModel extends BaseDatabaseModel
 		// Was the package downloaded?
 		if (!$p_file)
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'), 'warning');
 			return false;
 		}
 
@@ -340,7 +340,7 @@ class ImportModel extends BaseDatabaseModel
 	 */
 	protected function check($archivename)
 	{
-		$app = Factory::getApplication();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		// Clean the name
 		$archivename = Path::clean($archivename);
 
@@ -349,11 +349,11 @@ class ImportModel extends BaseDatabaseModel
 		{
 			// Cleanup the import files
 			$this->remove($archivename);
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 		}
 
-		$config = Factory::getConfig();
+		$config = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig();
 		// set Package Name
 		$check['packagename'] = $archivename;
 
@@ -378,7 +378,7 @@ class ImportModel extends BaseDatabaseModel
 	{
 		jimport('joomla.filesystem.file');
 
-		$config = Factory::getConfig();
+		$config = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig();
 		$package = $config->get('tmp_path'). '/' .$package;
 
 		// Is the package file a valid file?
@@ -396,7 +396,7 @@ class ImportModel extends BaseDatabaseModel
 	protected function getAlias($name,$type = false)
 	{
 		// sanitize the name to an alias
-		if (Factory::getConfig()->get('unicodeslugs') == 1)
+		if (Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig()->get('unicodeslugs') == 1)
 		{
 			$alias = OutputFilter::stringURLUnicodeSlug($name);
 		}
diff --git a/admin/compiler/joomla_4/ADMIN_IMPORT_MODEL_CUSTOM.php b/admin/compiler/joomla_4/ADMIN_IMPORT_MODEL_CUSTOM.php
index 7b3b58651..465bbcec1 100644
--- a/admin/compiler/joomla_4/ADMIN_IMPORT_MODEL_CUSTOM.php
+++ b/admin/compiler/joomla_4/ADMIN_IMPORT_MODEL_CUSTOM.php
@@ -65,7 +65,7 @@ class ###View###importModel extends BaseDatabaseModel
 	 */
 	protected function populateState()
 	{
-		$app = Factory::getApplication('administrator');
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication('administrator');
 
 		$this->setState('message', $app->getUserState('com_###component###.message'));
 		$app->setUserState('com_###component###.message', '');
@@ -85,7 +85,7 @@ class ###View###importModel extends BaseDatabaseModel
 	protected function _getPackageFromUpload()
 	{
 		// Get the uploaded file information
-		$app = Factory::getApplication();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$input = $app->input;
 
 		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
@@ -94,26 +94,26 @@ class ###View###importModel extends BaseDatabaseModel
 		// Make sure that file uploads are enabled in php
 		if (!(bool) ini_get('file_uploads'))
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
 			return false;
 		}
 
 		// If there is no uploaded file, we have a problem...
 		if (!is_array($userfile))
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
 			return false;
 		}
 
 		// Check if there was a problem uploading the file.
 		if ($userfile['error'] || $userfile['size'] < 1)
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
 			return false;
 		}
 
 		// Build the appropriate paths
-		$config = Factory::getConfig();
+		$config = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig();
 		$tmp_dest = $config->get('tmp_path') . '/' . $userfile['name'];
 		$tmp_src = $userfile['tmp_name'];
 
@@ -123,7 +123,7 @@ class ###View###importModel extends BaseDatabaseModel
 		// Was the package downloaded?
 		if (!$p_file)
 		{
-			$session = Factory::getSession();
+			$session = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getSession();
 			$session->clear('package');
 			$session->clear('dataType');
 			$session->clear('hasPackage');
@@ -145,7 +145,7 @@ class ###View###importModel extends BaseDatabaseModel
 	 */
 	protected function _getPackageFromFolder()
 	{
-		$app = Factory::getApplication();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$input = $app->input;
 
 		// Get the path to the package to import
@@ -154,7 +154,7 @@ class ###View###importModel extends BaseDatabaseModel
 		// Did you give us a valid path?
 		if (!file_exists($p_dir))
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
 			return false;
 		}
 
@@ -164,14 +164,14 @@ class ###View###importModel extends BaseDatabaseModel
 		// Did you give us a valid package?
 		if (!$type)
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
 		}
 
 		// check the extention
 		if(!$this->checkExtension($p_dir))
 		{
 			// set error message
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 		}
 
@@ -190,7 +190,7 @@ class ###View###importModel extends BaseDatabaseModel
 	 */
 	protected function _getPackageFromUrl()
 	{
-		$app = Factory::getApplication();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$input = $app->input;
 
 		// Get the URL of the package to import
@@ -199,7 +199,7 @@ class ###View###importModel extends BaseDatabaseModel
 		// Did you give us a URL?
 		if (!$url)
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'), 'warning');
 			return false;
 		}
 
@@ -209,7 +209,7 @@ class ###View###importModel extends BaseDatabaseModel
 		// Was the package downloaded?
 		if (!$p_file)
 		{
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'), 'warning');
 			return false;
 		}
 
@@ -230,7 +230,7 @@ class ###View###importModel extends BaseDatabaseModel
 	 */
 	protected function check($archivename)
 	{
-		$app = Factory::getApplication();
+		$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		// Clean the name
 		$archivename = Path::clean($archivename);
 
@@ -239,11 +239,11 @@ class ###View###importModel extends BaseDatabaseModel
 		{
 			// Cleanup the import files
 			$this->remove($archivename);
-			$app->enqueueMessage(Text::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
+			$app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 		}
 
-		$config = Factory::getConfig();
+		$config = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig();
 		// set Package Name
 		$check['packagename'] = $archivename;
 
@@ -267,7 +267,7 @@ class ###View###importModel extends BaseDatabaseModel
 	 */
 	protected function remove($package)
 	{
-		$config = Factory::getConfig();
+		$config = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig();
 		$package = $config->get('tmp_path'). '/' .$package;
 
 		// Is the package file a valid file?
@@ -287,7 +287,7 @@ class ###View###importModel extends BaseDatabaseModel
 	protected function getAlias($name,$type = false)
 	{
 		// sanitize the name to an alias
-		if (Factory::getConfig()->get('unicodeslugs') == 1)
+		if (Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig()->get('unicodeslugs') == 1)
 		{
 			$alias = OutputFilter::stringURLUnicodeSlug($name);
 		}
diff --git a/admin/compiler/joomla_4/ADMIN_VIEW.php b/admin/compiler/joomla_4/ADMIN_VIEW.php
index 1790e1989..1fc79448d 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEW.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEW.php
@@ -19,9 +19,12 @@ defined('_JCB_TEMPLATE') or die;
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 ###EDITBODYFADEIN###
-<form action="<?php echo Route::_('index.php?option=com_###component###&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 ###EDITBODY###
 </form>
 </div>###EDITBODYSCRIPT###
diff --git a/admin/compiler/joomla_4/ADMIN_VIEWS.php b/admin/compiler/joomla_4/ADMIN_VIEWS.php
index 90dd4a345..863600280 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEWS.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEWS.php
@@ -22,7 +22,7 @@ defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
 if ($this->saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_###component###&task=###views###.saveOrderAjax&tmpl=component';
-	Html::_('sortablelist.sortable', '###view###List', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
+	Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('sortablelist.sortable', '###view###List', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
 ?>
 ###VIEWS_DEFAULT_BODY######VIEWS_FOOTER_SCRIPT###
diff --git a/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php b/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php
index 4ce16d9a2..a338c8ea0 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php
@@ -76,6 +76,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -104,7 +120,7 @@ class HtmlView extends BaseHtmlView
 		$this->user ??= $this->getCurrentUser();###ADMIN_DIPLAY_METHOD###
 		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
-		$this->return_here = urlencode(base64_encode((string) Uri::getInstance()));
+		$this->return_here = urlencode(base64_encode((string) Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::getInstance()));
 		// get global action permissions
 		$this->canDo = ###Component###Helper::getActions('###view###');###JVIEWLISTCANDO###
 
@@ -115,8 +131,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -141,11 +159,11 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_###COMPONENT###_###VIEWS###'), '###ICOMOON###');
+		Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::title(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_###VIEWS###'), '###ICOMOON###');
 
 		if ($this->canCreate)
 		{
-			ToolbarHelper::addNew('###view###.add');
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::addNew('###view###.add');
 		}
 
 		// Only load if there are items
@@ -153,28 +171,28 @@ class HtmlView extends BaseHtmlView
 		{
 			if ($this->canEdit)
 			{
-				ToolbarHelper::editList('###view###.edit');
+				Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::editList('###view###.edit');
 			}
 
 			if ($this->canState)
 			{
-				ToolbarHelper::publishList('###views###.publish');
-				ToolbarHelper::unpublishList('###views###.unpublish');
-				ToolbarHelper::archiveList('###views###.archive');
+				Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::publishList('###views###.publish');
+				Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::unpublishList('###views###.unpublish');
+				Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::archiveList('###views###.archive');
 
 				if ($this->canDo->get('core.admin'))
 				{
-					ToolbarHelper::checkin('###views###.checkin');
+					Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::checkin('###views###.checkin');
 				}
 			}###CUSTOM_ADMIN_DYNAMIC_BUTTONS######ADMIN_CUSTOM_BUTTONS_LIST###
 
 			if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete))
 			{
-				ToolbarHelper::deleteList('', '###views###.delete', 'JTOOLBAR_EMPTY_TRASH');
+				Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::deleteList('', '###views###.delete', 'JTOOLBAR_EMPTY_TRASH');
 			}
 			elseif ($this->canState && $this->canDelete)
 			{
-				ToolbarHelper::trash('###views###.trash');
+				Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::trash('###views###.trash');
 			}###EXPORTBUTTON###
 		}###ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST######IMPORTBUTTON###
 
@@ -182,13 +200,13 @@ class HtmlView extends BaseHtmlView
 		$this->help_url = ###Component###Helper::getHelpUrl('###views###');
 		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($this->help_url))
 		{
-			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 
 		// add the options comp button
 		if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
 		{
-			ToolbarHelper::preferences('com_###component###');
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::preferences('com_###component###');
 		}###FILTERFIELDDISPLAYHELPER######BATCHDISPLAYHELPER###
 	}
 
@@ -200,16 +218,16 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{###JQUERY###
-		$this->getDocument()->setTitle(Text::_('COM_###COMPONENT###_###VIEWS###'));
+		$this->getDocument()->setTitle(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_###VIEWS###'));
 		// add styles
 		foreach ($this->styles as $style)
 		{
-			Html::_('stylesheet', $style, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('stylesheet', $style, ['version' => 'auto']);
 		}
 		// add scripts
 		foreach ($this->scripts as $script)
 		{
-			Html::_('script', $script, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('script', $script, ['version' => 'auto']);
 		}###ADMIN_ADD_JAVASCRIPT_FILE###
 	}
 
@@ -233,6 +251,17 @@ class HtmlView extends BaseHtmlView
 		return Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/compiler/joomla_4/ADMIN_VIEWS_MODAL.php b/admin/compiler/joomla_4/ADMIN_VIEWS_MODAL.php
new file mode 100644
index 000000000..556b1977d
--- /dev/null
+++ b/admin/compiler/joomla_4/ADMIN_VIEWS_MODAL.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+
+###ADMIN_VIEWS_MODAL_HEADER###
+
+// No direct access to this file
+defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
+
+/** @var \###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator\View\###Views###\HtmlView $this */
+
+$app = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
+
+if ($app->isClient('site')) {
+    Joomla___5ba38513_5c4f_4b0d_935e_49e986a6bce8___Power::checkToken('get') or die(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+###VIEWS_MODAL_BODY######VIEWS_FOOTER_SCRIPT###
diff --git a/admin/compiler/joomla_4/ADMIN_VIEWS_MODEL.php b/admin/compiler/joomla_4/ADMIN_VIEWS_MODEL.php
index 7431385d4..c91a82fcb 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEWS_MODEL.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEWS_MODEL.php
@@ -76,7 +76,7 @@ class ###Views###Model extends ListModel
 
 		parent::__construct($config, $factory);
 
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 	}###ADMIN_CUSTOM_BUTTONS_METHOD_LIST###
 
 	/**
diff --git a/admin/compiler/joomla_4/ADMIN_VIEW_CONTROLLER.php b/admin/compiler/joomla_4/ADMIN_VIEW_CONTROLLER.php
index dd968b1e6..cb99ae359 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEW_CONTROLLER.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEW_CONTROLLER.php
@@ -149,13 +149,13 @@ class ###View###Controller extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Joomla___5ba38513_5c4f_4b0d_935e_49e986a6bce8___Power::checkToken() or exit(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('###View###', '', []);
 
 		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_###component###&view=###views###' . $this->getRedirectToListAppend(), false));
+		$this->setRedirect(Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###&view=###views###' . $this->getRedirectToListAppend(), false));
 
 		return parent::batch($model);
 	}
@@ -180,13 +180,13 @@ class ###View###Controller extends FormController
 
 		$cancel = parent::cancel($key);
 
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
+		if (!is_null($return) && Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::isInternal(base64_decode($return)))
 		{
 			$redirect = base64_decode($return);
 
 			// Redirect to the return value.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					$redirect, false
 				)
 			);
@@ -197,7 +197,7 @@ class ###View###Controller extends FormController
 
 			// Redirect to the item screen.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@@ -208,7 +208,7 @@ class ###View###Controller extends FormController
 
 			// Redirect to the list screen.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@@ -234,7 +234,7 @@ class ###View###Controller extends FormController
 
 		// Check if there is a return value
 		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
+		$canReturn = (!is_null($return) && Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::isInternal(base64_decode($return)));
 
 		if ($this->ref || $this->refid || $canReturn)
 		{
@@ -252,7 +252,7 @@ class ###View###Controller extends FormController
 
 			// Redirect to the return value.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					$redirect, false
 				)
 			);
@@ -263,7 +263,7 @@ class ###View###Controller extends FormController
 
 			// Redirect to the item screen.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@@ -274,7 +274,7 @@ class ###View###Controller extends FormController
 
 			// Redirect to the list screen.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
diff --git a/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
index 4cafee33a..42330c61e 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
@@ -36,6 +36,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Joomla___59106b64_dd51_4280_be0a_1b9b9ebb7161___Power
+	 * @since  5.2.1
+	 */
+	public Joomla___59106b64_dd51_4280_be0a_1b9b9ebb7161___Power $input;
+
 	/**
 	 * The state object
 	 *
@@ -108,6 +116,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * ###View### view display method
 	 *
@@ -120,7 +136,7 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null): void
 	{
 		// set params
-		$this->params = ComponentHelper::getParams('com_###component###');
+		$this->params = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
 		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form ??= $this->get('Form');
@@ -131,10 +147,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ###Component###Helper::getActions('###view###', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -155,7 +171,16 @@ class HtmlView extends BaseHtmlView
 		}###LINKEDVIEWITEMS###
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -170,11 +195,11 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
@@ -182,6 +207,18 @@ class HtmlView extends BaseHtmlView
 		###ADDTOOLBAR###
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		###ADDMODALTOOLBAR###
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
@@ -211,16 +248,16 @@ class HtmlView extends BaseHtmlView
 	protected function _prepareDocument(): void
 	{###JQUERY###
 		$isNew = ($this->item->id < 1);
-		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
+		$this->getDocument()->setTitle(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
 		// add styles
 		foreach ($this->styles as $style)
 		{
-			Html::_('stylesheet', $style, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('stylesheet', $style, ['version' => 'auto']);
 		}###AJAXTOKE######LINKEDVIEWTABLESCRIPTS###
 		// add scripts
 		foreach ($this->scripts as $script)
 		{
-			Html::_('script', $script, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('script', $script, ['version' => 'auto']);
 		}###DOCUMENT_CUSTOM_PHP###
 	}
 }
diff --git a/admin/compiler/joomla_4/ADMIN_VIEW_MODAL.php b/admin/compiler/joomla_4/ADMIN_VIEW_MODAL.php
new file mode 100644
index 000000000..08be00f4b
--- /dev/null
+++ b/admin/compiler/joomla_4/ADMIN_VIEW_MODAL.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
+
+/** @var \###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator\View\###View###\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/compiler/joomla_4/ADMIN_VIEW_MODEL.php b/admin/compiler/joomla_4/ADMIN_VIEW_MODEL.php
index b425ecfb7..2a5b1659a 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEW_MODEL.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEW_MODEL.php
@@ -229,7 +229,7 @@ class ###View###Model extends AdminModel
 	 */
 	protected function prepareTable($table)
 	{###LICENSE_TABLE_LOCKED_CHECK###
-		$date = Factory::getDate();
+		$date = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getDate();
 		$user = $this->getCurrentUser();
 
 		if (isset($table->name))
@@ -285,7 +285,7 @@ class ###View###Model extends AdminModel
 	protected function loadFormData()
 	{
 		// Check the session for previously entered form data.
-		$data = Factory::getApplication()->getUserState('com_###component###.edit.###view###.data', []);
+		$data = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getUserState('com_###component###.edit.###view###.data', []);
 
 		if (empty($data))
 		{
@@ -359,7 +359,7 @@ class ###View###Model extends AdminModel
 
 		if (empty($pks))
 		{
-			$this->setError(Text::_('JGLOBAL_NO_ITEM_SELECTED'));
+			$this->setError(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JGLOBAL_NO_ITEM_SELECTED'));
 			return false;
 		}
 
@@ -376,7 +376,7 @@ class ###View###Model extends AdminModel
 
 		if (!$this->canDo->get('core.batch'))
 		{
-			$this->setError(Text::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+			$this->setError(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
 			return false;
 		}
 
@@ -419,7 +419,7 @@ class ###View###Model extends AdminModel
 
 		if (!$done)
 		{
-			$this->setError(Text::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+			$this->setError(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
 			return false;
 		}
 
@@ -439,7 +439,7 @@ class ###View###Model extends AdminModel
 	 */
 	public function save($data)
 	{
-		$input    = Factory::getApplication()->getInput();
+		$input    = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getInput();
 		$filter   = InputFilter::getInstance();
 
 		// set the metadata to the Item Data
diff --git a/admin/compiler/joomla_4/ADMIN_VIEW_TABLE.php b/admin/compiler/joomla_4/ADMIN_VIEW_TABLE.php
index 0a38769fe..2fb449e97 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEW_TABLE.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEW_TABLE.php
@@ -107,7 +107,7 @@ class ###View###Table extends Table implements VersionableTableInterface, Taggab
 	 */
 	public function store($updateNulls = false)
 	{
-		$date   = Factory::getDate()->toSql();
+		$date   = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getDate()->toSql();
 		$userId = $this->getCurrentUser()->id;
 
 		if ($this->id)
@@ -137,11 +137,11 @@ class ###View###Table extends Table implements VersionableTableInterface, Taggab
 
 			if ($table->load(['alias' => $this->alias###JTABLEALIASCATEGORY###]) && ($table->id != $this->id || $this->id == 0))
 			{
-				$this->setError(Text::_('COM_###COMPONENT###_###VIEW###_ERROR_UNIQUE_ALIAS'));
+				$this->setError(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_###VIEW###_ERROR_UNIQUE_ALIAS'));
 
 				if ($table->published === -2)
 				{
-					$this->setError(Text::_('COM_###COMPONENT###_###VIEW###_ERROR_UNIQUE_ALIAS_TRASHED'));
+					$this->setError(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_###VIEW###_ERROR_UNIQUE_ALIAS_TRASHED'));
 				}
 
 				return false;
@@ -258,7 +258,7 @@ class ###View###Table extends Table implements VersionableTableInterface, Taggab
 	protected function getDefaultAssetValues($component, $try = true)
 	{
 		// Need to find the asset id by the name of the component.
-		$db = Factory::getContainer()->get(DatabaseInterface::class);
+		$db = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);
 		$query = $db->getQuery(true)
 			->select($db->quoteName('id'))
 			->from($db->quoteName('#__assets'))
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW.php
index 47e384fe5..9a502d4c3 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW.php
@@ -24,5 +24,5 @@ defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED######CUSTOM_ADMIN_CODE_BODY##
 <?php $urlId = (isset($this->item->id)) ? '&id='. (int) $this->item->id : ''; ?>
 ###CUSTOM_ADMIN_TOP_FORM######CUSTOM_ADMIN_BODY######CUSTOM_ADMIN_BOTTOM_FORM###
 <?php else: ?>
-		<h1><?php echo Text::_('COM_###COMPONENT###_NO_ACCESS_GRANTED'); ?></h1>
+		<h1><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_NO_ACCESS_GRANTED'); ?></h1>
 <?php endif; ?>
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS.php
index 6b23540da..fc7009dac 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS.php
@@ -23,5 +23,5 @@ defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED######CUSTOM_ADMIN_CODE_BODY##
 <?php if ($this->canDo->get('###sview###.access')): ?>###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###
 ###CUSTOM_ADMIN_TOP_FORM######CUSTOM_ADMIN_BODY######CUSTOM_ADMIN_BOTTOM_FORM###
 <?php else: ?>
-		<h1><?php echo Text::_('COM_###COMPONENT###_NO_ACCESS_GRANTED'); ?></h1>
+		<h1><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_NO_ACCESS_GRANTED'); ?></h1>
 <?php endif; ?>
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_CONTROLLER.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_CONTROLLER.php
index 0fbe25922..d7472fe85 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_CONTROLLER.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_CONTROLLER.php
@@ -60,6 +60,6 @@ class ###SViews###Controller extends AdminController
 	 */
 	public function dashboard(): void
 	{
-		$this->setRedirect(Route::_('index.php?option=com_###component###', false));
+		$this->setRedirect(Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###', false));
 	}###CUSTOM_ADMIN_CUSTOM_BUTTONS_CONTROLLER###
 }
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php
index a557e3aff..880997ef0 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php
@@ -72,9 +72,9 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null): void
 	{
 		// get component params
-		$this->params = ComponentHelper::getParams('com_###component###');
+		$this->params = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
 		// get the application
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		// get the user object
 		$this->user ??= $this->getCurrentUser();
 		// get global action permissions
@@ -99,12 +99,12 @@ class HtmlView extends BaseHtmlView
 		// add styles
 		foreach ($this->styles as $style)
 		{
-			Html::_('stylesheet', $style, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('stylesheet', $style, ['version' => 'auto']);
 		}###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS###
 		// add scripts
 		foreach ($this->scripts as $script)
 		{
-			Html::_('script', $script, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('script', $script, ['version' => 'auto']);
 		}###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS###
 	}
 
@@ -117,19 +117,19 @@ class HtmlView extends BaseHtmlView
 	protected function addToolbar(): void
 	{###HIDEMAINMENU###
 		// add title to the page
-		ToolbarHelper::title(Text::_('COM_###COMPONENT###_###SVIEWS###'),'###ICOMOON###');###CUSTOM_ADMIN_CUSTOM_BUTTONS###
+		Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::title(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_###SVIEWS###'),'###ICOMOON###');###CUSTOM_ADMIN_CUSTOM_BUTTONS###
 
 		// set help url for this view if found
 		$this->help_url = ###Component###Helper::getHelpUrl('###sviews###');
 		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($this->help_url))
 		{
-			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 
 		// add the options comp button
 		if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
 		{
-			ToolbarHelper::preferences('com_###component###');
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::preferences('com_###component###');
 		}
 	}###CUSTOM_ADMIN_GET_MODULE###
 
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_MODEL.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_MODEL.php
index bfa9f8e64..1a4508a9e 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_MODEL.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_MODEL.php
@@ -125,7 +125,7 @@ class ###SViews###Model extends ListModel
 	{
 		parent::__construct($config, $factory);
 
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$this->input ??= $this->app->getInput();
 
 		// Set the current user for authorisation checks (for those calling this model directly)
@@ -162,7 +162,7 @@ class ###SViews###Model extends ListModel
 		// check if this user has permission to access items
 		if (!$user->authorise('###sviews###.access', 'com_###component###'))
 		{
-			$this->app->enqueueMessage(Text::_('Not authorised!'), 'error');
+			$this->app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('Not authorised!'), 'error');
 			// redirect away if not a correct to default view
 			$this->app->redirect('index.php?option=com_###component###');
 			return false;
@@ -171,7 +171,7 @@ class ###SViews###Model extends ListModel
 		$items = parent::getItems();
 
 		// Get the global params
-		$globalParams = ComponentHelper::getParams('com_###component###', true);###CUSTOM_ADMIN_GET_ITEMS######CUSTOM_ADMIN_AFTER_GET_ITEMS###
+		$globalParams = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###', true);###CUSTOM_ADMIN_GET_ITEMS######CUSTOM_ADMIN_AFTER_GET_ITEMS###
 
 		// return items
 		return $items;
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_CONTROLLER.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_CONTROLLER.php
index b7fa6648b..9698f0a04 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_CONTROLLER.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_CONTROLLER.php
@@ -51,6 +51,6 @@ class ###SView###Controller extends BaseController
 	 */
 	public function dashboard(): void
 	{
-		$this->setRedirect(Route::_('index.php?option=com_###component###', false));
+		$this->setRedirect(Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###', false));
 	}###CUSTOM_ADMIN_CUSTOM_BUTTONS_CONTROLLER###
 }
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php
index 4d62671ec..f2efbcef4 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php
@@ -40,11 +40,11 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null): void
 	{
 		// get component params
-		$this->params = ComponentHelper::getParams('com_###component###');
+		$this->params = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
 		// get the application
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		// get the user object
-		$this->user ??= Factory::getApplication()->getIdentity();
+		$this->user ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();
 		// get global action permissions
 		$this->canDo = ###Component###Helper::getActions('###sview###');
 		$this->styles = $this->get('Styles');
@@ -67,12 +67,12 @@ class HtmlView extends BaseHtmlView
 		// add styles
 		foreach ($this->styles as $style)
 		{
-			Html::_('stylesheet', $style, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('stylesheet', $style, ['version' => 'auto']);
 		}###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS###
 		// add scripts
 		foreach ($this->scripts as $script)
 		{
-			Html::_('script', $script, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('script', $script, ['version' => 'auto']);
 		}###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS###
 	}
 
@@ -92,22 +92,22 @@ class HtmlView extends BaseHtmlView
 		// Check for empty title and add view name if param is set
 		if (empty($title))
 		{
-			$title = Text::_('COM_###COMPONENT###_###SVIEW###');
+			$title = Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_###SVIEW###');
 		}
 		// add title to the page
-		ToolbarHelper::title($title,'###ICOMOON###');###CUSTOM_ADMIN_CUSTOM_BUTTONS###
+		Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::title($title,'###ICOMOON###');###CUSTOM_ADMIN_CUSTOM_BUTTONS###
 
 		// set help url for this view if found
 		$this->help_url = ###Component###Helper::getHelpUrl('###sviews###');
 		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($this->help_url))
 		{
-			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 
 		// add the options comp button
 		if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
 		{
-			ToolbarHelper::preferences('com_###component###');
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::preferences('com_###component###');
 		}
 	}###CUSTOM_ADMIN_GET_MODULE###
 
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_MODEL.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_MODEL.php
index dc935fd94..eea79287e 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_MODEL.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_MODEL.php
@@ -139,7 +139,7 @@ class ###SView###Model extends ItemModel
 	{
 		parent::__construct($config, $factory);
 
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$this->input ??= $this->app->getInput();
 
 		// Set the current user for authorisation checks (for those calling this model directly)
@@ -185,7 +185,7 @@ class ###SView###Model extends ItemModel
 		// check if this user has permission to access item
 		if (!$this->user->authorise('###sview###.access', 'com_###component###'))
 		{
-			$this->app->enqueueMessage(Text::_('Not authorised!'), 'error');
+			$this->app->enqueueMessage(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('Not authorised!'), 'error');
 			// redirect away if not a correct to cPanel/default view
 			$this->app->redirect('index.php?option=com_###component###');
 			return false;
diff --git a/admin/compiler/joomla_4/DASH_MODEL.php b/admin/compiler/joomla_4/DASH_MODEL.php
index 4cbaf38a2..3ed7bfedf 100644
--- a/admin/compiler/joomla_4/DASH_MODEL.php
+++ b/admin/compiler/joomla_4/DASH_MODEL.php
@@ -51,7 +51,7 @@ class ###Component###Model extends ListModel
 	public function getIcons()
 	{
 		// load user for access menus
-		$user = Factory::getApplication()->getIdentity();
+		$user = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();
 		// reset icon array
 		$icons  = [];
 		// view groups array
diff --git a/admin/compiler/joomla_4/DASH_VIEW_HTML.php b/admin/compiler/joomla_4/DASH_VIEW_HTML.php
index 464b34941..452891aeb 100644
--- a/admin/compiler/joomla_4/DASH_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/DASH_VIEW_HTML.php
@@ -71,18 +71,18 @@ class HtmlView extends BaseHtmlView
 	protected function addToolbar(): void
 	{
 		$canDo = ###Component###Helper::getActions('###component###');
-		ToolbarHelper::title(Text::_('COM_###COMPONENT###_DASHBOARD'), 'grid-2');
+		Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::title(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_DASHBOARD'), 'grid-2');
 
 		// set help url for this view if found
 		$this->help_url = ###Component###Helper::getHelpUrl('###component###');
 		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($this->help_url))
 		{
-			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 
 		if ($canDo->get('core.admin') || $canDo->get('core.options'))
 		{
-			ToolbarHelper::preferences('com_###component###');
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::preferences('com_###component###');
 		}
 	}
 
@@ -95,18 +95,18 @@ class HtmlView extends BaseHtmlView
 	protected function _prepareDocument(): void
 	{
 		// set page title
-		$this->getDocument()->setTitle(Text::_('COM_###COMPONENT###_DASHBOARD'));
+		$this->getDocument()->setTitle(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_DASHBOARD'));
 		// add manifest to page JavaScript
 		$this->getDocument()->addScriptDeclaration("var manifest = JSON.parse(" . json_encode($this->manifest) . ");", "text/javascript");
 		// add styles
 		foreach ($this->styles as $style)
 		{
-			Html::_('stylesheet', $style, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('stylesheet', $style, ['version' => 'auto']);
 		}
 		// add scripts
 		foreach ($this->scripts as $script)
 		{
-			Html::_('script', $script, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('script', $script, ['version' => 'auto']);
 		}
 	}
 }
diff --git a/admin/compiler/joomla_4/FORM_MODAL_SELECT_FIELD.php b/admin/compiler/joomla_4/FORM_MODAL_SELECT_FIELD.php
new file mode 100644
index 000000000..9c1d06924
--- /dev/null
+++ b/admin/compiler/joomla_4/FORM_MODAL_SELECT_FIELD.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package	Joomla.Component.Builder
+ *
+ * @created	4th September 2022
+ * @author	 Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git		Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license	GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\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;
+	}
+}
\ No newline at end of file
diff --git a/admin/compiler/joomla_4/INSTALLER_SCRIPT.php b/admin/compiler/joomla_4/INSTALLER_SCRIPT.php
index ead990145..472d9fbbf 100644
--- a/admin/compiler/joomla_4/INSTALLER_SCRIPT.php
+++ b/admin/compiler/joomla_4/INSTALLER_SCRIPT.php
@@ -122,8 +122,8 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	{
 		$this->minimumJoomla = '4.3';
 		$this->minimumPhp = JOOMLA_MINIMUM_PHP;
-		$this->app ??= Factory::getApplication();
-		$this->db = Factory::getContainer()->get(DatabaseInterface::class);
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
+		$this->db = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);
 
 		// check if the files exist
 		if (is_file(JPATH_ROOT . '/administrator/components/com_###component###/###component###.php'))
@@ -212,7 +212,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		// Check for the minimum PHP version before continuing
 		if (!empty($this->minimumPhp) && version_compare(PHP_VERSION, $this->minimumPhp, '<'))
 		{
-			Log::add(Text::sprintf('JLIB_INSTALLER_MINIMUM_PHP', $this->minimumPhp), Log::WARNING, 'jerror');
+			Log::add(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('JLIB_INSTALLER_MINIMUM_PHP', $this->minimumPhp), Log::WARNING, 'jerror');
 
 			return false;
 		}
@@ -220,7 +220,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		// Check for the minimum Joomla version before continuing
 		if (!empty($this->minimumJoomla) && version_compare(JVERSION, $this->minimumJoomla, '<'))
 		{
-			Log::add(Text::sprintf('JLIB_INSTALLER_MINIMUM_JOOMLA', $this->minimumJoomla), Log::WARNING, 'jerror');
+			Log::add(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('JLIB_INSTALLER_MINIMUM_JOOMLA', $this->minimumJoomla), Log::WARNING, 'jerror');
 
 			return false;
 		}
@@ -361,7 +361,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 			{
 				if (is_file(JPATH_ROOT . $file) && !File::delete(JPATH_ROOT . $file))
 				{
-					echo Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $file) . '<br>';
+					echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $file) . '<br>';
 				}
 			}
 		}
@@ -372,7 +372,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 			{
 				if (is_dir(JPATH_ROOT . $folder) && !Folder::delete(JPATH_ROOT . $folder))
 				{
-					echo Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $folder) . '<br>';
+					echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $folder) . '<br>';
 				}
 			}
 		}
@@ -394,7 +394,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 
 				if (file_exists(JPATH_ROOT . $file) && !File::move(JPATH_ROOT . $file, JPATH_ROOT . '/cli/' . $name))
 				{
-					echo Text::sprintf('JLIB_INSTALLER_FILE_ERROR_MOVE', $name);
+					echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('JLIB_INSTALLER_FILE_ERROR_MOVE', $name);
 				}
 			}
 		}
@@ -450,7 +450,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 			{
 				// If its successfully update.
 				$this->app->enqueueMessage(
-					Text::sprintf('The (%s) was found in the <b>#__content_types</b> table, and updated.', $content->type_alias)
+					Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The (%s) was found in the <b>#__content_types</b> table, and updated.', $content->type_alias)
 				);
 			}
 		}
@@ -458,7 +458,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// If its successfully added.
 			$this->app->enqueueMessage(
-				Text::sprintf('The (%s) was added to the <b>#__content_types</b> table.', $content->type_alias)
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The (%s) was added to the <b>#__content_types</b> table.', $content->type_alias)
 			);
 		}
 	}
@@ -510,7 +510,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 			{
 				// If its successfully update.
 				$this->app->enqueueMessage(
-					Text::sprintf('The (%s) was found in the <b>#__action_log_config</b> table, and updated.', $content->type_alias)
+					Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The (%s) was found in the <b>#__action_log_config</b> table, and updated.', $content->type_alias)
 				);
 			}
 		}
@@ -518,7 +518,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// If its successfully added.
 			$this->app->enqueueMessage(
-				Text::sprintf('The (%s) was added to the <b>#__action_log_config</b> table.', $content->type_alias)
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The (%s) was added to the <b>#__action_log_config</b> table.', $content->type_alias)
 			);
 		}
 	}
@@ -549,14 +549,14 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// If its already set don't set it again.
 			$this->app->enqueueMessage(
-				Text::_('The (com_###component###) is already in the <b>#__action_logs_extensions</b> table.')
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('The (com_###component###) is already in the <b>#__action_logs_extensions</b> table.')
 			);
 		}
 		elseif ($this->db->insertObject('#__action_logs_extensions', $data))
 		{
 			// give a success message
 			$this->app->enqueueMessage(
-				Text::_('The (com_###component###) was successfully added to the <b>#__action_logs_extensions</b> table.')
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('The (com_###component###) was successfully added to the <b>#__action_logs_extensions</b> table.')
 			);
 		}
 	}
@@ -594,7 +594,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// give a success message
 			$this->app->enqueueMessage(
-				Text::_('The (com_###component###) rules was successfully added to the <b>#__assets</b> table.')
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('The (com_###component###) rules was successfully added to the <b>#__assets</b> table.')
 			);
 		}
 	}
@@ -632,7 +632,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// give a success message
 			$this->app->enqueueMessage(
-				Text::_('The (com_###component###) params was successfully added to the <b>#__extensions</b> table.')
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('The (com_###component###) params was successfully added to the <b>#__extensions</b> table.')
 			);
 		}
 	}
@@ -670,7 +670,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 				if ($done)
 				{
 					$this->app->enqueueMessage(
-						Text::sprintf('The <b>#__assets</b> table rules column was resized to the %s datatype for the components possible large permission rules.', $dataType)
+						Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The <b>#__assets</b> table rules column was resized to the %s datatype for the components possible large permission rules.', $dataType)
 					);
 				}
 			}
@@ -749,7 +749,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 			{
 				// If successfully remove Item add queued success message.
 				$this->app->enqueueMessage(
-					Text::sprintf('The (%s) type alias was removed from the <b>#__content_type</b> table.', $context)
+					Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The (%s) type alias was removed from the <b>#__content_type</b> table.', $context)
 				);
 			}
 
@@ -810,7 +810,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 			{
 				// If successfully remove context add queued success message.
 				$this->app->enqueueMessage(
-					Text::sprintf('The fields with context (%s) was removed from the <b>#__fields</b> table.', $context)
+					Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The fields with context (%s) was removed from the <b>#__fields</b> table.', $context)
 				);
 			}
 
@@ -846,7 +846,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// If successfully remove release_check add queued success message.
 			$this->app->enqueueMessage(
-				Text::sprintf('The fields values for (%s) was removed from the <b>#__fields_values</b> table.', $context)
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The fields values for (%s) was removed from the <b>#__fields_values</b> table.', $context)
 			);
 		}
 	}
@@ -900,7 +900,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 			{
 				// If successfully remove context add queued success message.
 				$this->app->enqueueMessage(
-					Text::sprintf('The fields with context (%s) was removed from the <b>#__fields_groups</b> table.', $context)
+					Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The fields with context (%s) was removed from the <b>#__fields_groups</b> table.', $context)
 				);
 			}
 		}
@@ -933,7 +933,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// If successfully removed Items add queued success message.
 			$this->app->enqueueMessage(
-				Text::sprintf('The (%s) items were removed from the <b>#__history</b> table.', $context)
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The (%s) items were removed from the <b>#__history</b> table.', $context)
 			);
 		}
 	}
@@ -967,7 +967,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		}
 
 		$this->app->enqueueMessage(
-			Text::_('All related items was removed from the <b>#__ucm_base</b> table.')
+			Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('All related items was removed from the <b>#__ucm_base</b> table.')
 		);
 	}
 
@@ -998,7 +998,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// If successfully removed Item add queued success message.
 			$this->app->enqueueMessage(
-				Text::sprintf('The (%s) type alias was removed from the <b>#__ucm_content</b> table.', $context)
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The (%s) type alias was removed from the <b>#__ucm_content</b> table.', $context)
 			);
 		}
 	}
@@ -1033,7 +1033,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// If successfully remove Item add queued success message.
 			$this->app->enqueueMessage(
-				Text::sprintf('The (%s) type alias was removed from the <b>#__contentitem_tag_map</b> table.', $context)
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The (%s) type alias was removed from the <b>#__contentitem_tag_map</b> table.', $context)
 			);
 		}
 	}
@@ -1065,7 +1065,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// If successfully removed ###component### view add queued success message.
 			$this->app->enqueueMessage(
-				Text::sprintf('The (%s) type alias was removed from the <b>#__action_log_config</b> table.', $context)
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('The (%s) type alias was removed from the <b>#__action_log_config</b> table.', $context)
 			);
 		}
 	}
@@ -1093,7 +1093,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// If successfully removed ###component### add queued success message.
 			$this->app->enqueueMessage(
-				Text::_('All related (com_###component###) items was removed from the <b>#__assets</b> table.')
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('All related (com_###component###) items was removed from the <b>#__assets</b> table.')
 			);
 		}
 	}
@@ -1123,7 +1123,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		{
 			// If successfully remove ###component### add queued success message.
 			$this->app->enqueueMessage(
-				Text::_('The (com_###component###) extension was removed from the <b>#__action_logs_extensions</b> table.')
+				Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('The (com_###component###) extension was removed from the <b>#__action_logs_extensions</b> table.')
 			);
 		}
 	}
@@ -1151,13 +1151,13 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 				$this->db->execute();
 
 				$this->app->enqueueMessage(
-					Text::_('Reverted the <b>#__assets</b> table rules column back to its default size of varchar(5120).')
+					Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('Reverted the <b>#__assets</b> table rules column back to its default size of varchar(5120).')
 				);
 			}
 			else
 			{
 				$this->app->enqueueMessage(
-					Text::_('Could not revert the <b>#__assets</b> table rules column back to its default size of varchar(5120), since there is still one or more components that still requires the column to be larger.')
+					Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('Could not revert the <b>#__assets</b> table rules column back to its default size of varchar(5120), since there is still one or more components that still requires the column to be larger.')
 				);
 			}
 		}
diff --git a/admin/compiler/joomla_4/SITE_ADMIN_VIEW.php b/admin/compiler/joomla_4/SITE_ADMIN_VIEW.php
index 285eb38ee..e6ba13119 100644
--- a/admin/compiler/joomla_4/SITE_ADMIN_VIEW.php
+++ b/admin/compiler/joomla_4/SITE_ADMIN_VIEW.php
@@ -22,7 +22,7 @@ defined('_JEXEC') or die;
 ?>
 <div class="###component###-###view###">
 <?php echo $this->toolbar->render(); ?>
-<form action="<?php echo Route::_('index.php?option=com_###component###&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 ###EDITBODY###
 </form>
 </div>###EDITBODYSCRIPT###
diff --git a/admin/compiler/joomla_4/SITE_ADMIN_VIEW_CONTROLLER.php b/admin/compiler/joomla_4/SITE_ADMIN_VIEW_CONTROLLER.php
index 041cb4278..de943723f 100644
--- a/admin/compiler/joomla_4/SITE_ADMIN_VIEW_CONTROLLER.php
+++ b/admin/compiler/joomla_4/SITE_ADMIN_VIEW_CONTROLLER.php
@@ -149,13 +149,13 @@ class ###View###Controller extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Joomla___5ba38513_5c4f_4b0d_935e_49e986a6bce8___Power::checkToken() or jexit(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('###View###', '', []);
 
 		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_###component###&view=###views###' . $this->getRedirectToListAppend(), false));
+		$this->setRedirect(Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###&view=###views###' . $this->getRedirectToListAppend(), false));
 
 		return parent::batch($model);
 	}
@@ -180,13 +180,13 @@ class ###View###Controller extends FormController
 
 		$cancel = parent::cancel($key);
 
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
+		if (!is_null($return) && Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::isInternal(base64_decode($return)))
 		{
 			$redirect = base64_decode($return);
 
 			// Redirect to the return value.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					$redirect, false
 				)
 			);
@@ -197,7 +197,7 @@ class ###View###Controller extends FormController
 
 			// Redirect to the item screen.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@@ -208,7 +208,7 @@ class ###View###Controller extends FormController
 
 			// Redirect to the list screen.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@@ -234,7 +234,7 @@ class ###View###Controller extends FormController
 
 		// Check if there is a return value
 		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
+		$canReturn = (!is_null($return) && Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::isInternal(base64_decode($return)));
 
 		if ($this->ref || $this->refid || $canReturn)
 		{
@@ -252,7 +252,7 @@ class ###View###Controller extends FormController
 
 			// Redirect to the return value.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					$redirect, false
 				)
 			);
@@ -263,7 +263,7 @@ class ###View###Controller extends FormController
 
 			// Redirect to the item screen.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@@ -274,7 +274,7 @@ class ###View###Controller extends FormController
 
 			// Redirect to the list screen.
 			$this->setRedirect(
-				Route::_(
+				Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
diff --git a/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php
index 87d613574..327e9f811 100644
--- a/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php
@@ -118,7 +118,7 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null)
 	{
 		// set params
-		$this->params = ComponentHelper::getParams('com_###component###');
+		$this->params = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
 		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form ??= $this->get('Form');
@@ -129,7 +129,7 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ###Component###Helper::getActions('###view###', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
+		$jinput = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
 		$return = $jinput->get('return', null, 'base64');
@@ -211,16 +211,16 @@ class HtmlView extends BaseHtmlView
 	protected function _prepareDocument(): void
 	{###JQUERY###
 		$isNew = ($this->item->id < 1);
-		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
+		$this->getDocument()->setTitle(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
 		// add styles
 		foreach ($this->styles as $style)
 		{
-			Html::_('stylesheet', $style, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('stylesheet', $style, ['version' => 'auto']);
 		}###AJAXTOKE######LINKEDVIEWTABLESCRIPTS###
 		// add scripts
 		foreach ($this->scripts as $script)
 		{
-			Html::_('script', $script, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('script', $script, ['version' => 'auto']);
 		}###DOCUMENT_CUSTOM_PHP###
 	}
 }
diff --git a/admin/compiler/joomla_4/SITE_ADMIN_VIEW_MODEL.php b/admin/compiler/joomla_4/SITE_ADMIN_VIEW_MODEL.php
index 0a3ba9fef..dc91b18c9 100644
--- a/admin/compiler/joomla_4/SITE_ADMIN_VIEW_MODEL.php
+++ b/admin/compiler/joomla_4/SITE_ADMIN_VIEW_MODEL.php
@@ -234,7 +234,7 @@ class ###View###Model extends AdminModel
 	 */
 	protected function prepareTable($table)
 	{###LICENSE_TABLE_LOCKED_CHECK###
-		$date = Factory::getDate();
+		$date = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getDate();
 		$user = $this->getCurrentUser();
 
 		if (isset($table->name))
@@ -291,7 +291,7 @@ class ###View###Model extends AdminModel
 	protected function loadFormData()
 	{
 		// Check the session for previously entered form data.
-		$data = Factory::getApplication()->getUserState('com_###component###.edit.###view###.data', []);
+		$data = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getUserState('com_###component###.edit.###view###.data', []);
 
 		if (empty($data))
 		{
@@ -368,7 +368,7 @@ class ###View###Model extends AdminModel
 
 		if (empty($pks))
 		{
-			$this->setError(Text::_('JGLOBAL_NO_ITEM_SELECTED'));
+			$this->setError(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JGLOBAL_NO_ITEM_SELECTED'));
 			return false;
 		}
 
@@ -385,7 +385,7 @@ class ###View###Model extends AdminModel
 
 		if (!$this->canDo->get('core.batch'))
 		{
-			$this->setError(Text::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+			$this->setError(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
 			return false;
 		}
 
@@ -428,7 +428,7 @@ class ###View###Model extends AdminModel
 
 		if (!$done)
 		{
-			$this->setError(Text::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+			$this->setError(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
 			return false;
 		}
 
@@ -449,7 +449,7 @@ class ###View###Model extends AdminModel
 	 */
 	public function save($data)
 	{
-		$input    = Factory::getApplication()->input;
+		$input    = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input;
 		$filter   = InputFilter::getInstance();
 
 		// set the metadata to the Item Data
diff --git a/admin/compiler/joomla_4/SITE_AJAX_CONTROLLER.php b/admin/compiler/joomla_4/SITE_AJAX_CONTROLLER.php
index 423691e92..644e2736b 100644
--- a/admin/compiler/joomla_4/SITE_AJAX_CONTROLLER.php
+++ b/admin/compiler/joomla_4/SITE_AJAX_CONTROLLER.php
@@ -67,7 +67,7 @@ class AjaxController extends BaseController
 		// return to a callback function
 		$callback     = $jinput->get('callback', null, 'CMD');
 		// Check Token!
-		$token        = Session::getFormToken();
+		$token        = Joomla___5ba38513_5c4f_4b0d_935e_49e986a6bce8___Power::getFormToken();
 		$call_token   = $jinput->get('token', 0, 'ALNUM');
 		if($jinput->get($token, 0, 'ALNUM') || $token === $call_token)
 		{
diff --git a/admin/compiler/joomla_4/SITE_AJAX_MODEL.php b/admin/compiler/joomla_4/SITE_AJAX_MODEL.php
index b56b2df9c..0381279d8 100644
--- a/admin/compiler/joomla_4/SITE_AJAX_MODEL.php
+++ b/admin/compiler/joomla_4/SITE_AJAX_MODEL.php
@@ -56,7 +56,7 @@ class AjaxModel extends ListModel
 	{
 		parent::__construct($config, $factory);
 
-		$this->app_params = ComponentHelper::getParams('com_###component###');
-		$this->app ??= Factory::getApplication();
+		$this->app_params = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 	}###AJAX_SITE_MODEL_METHODS###
 }
diff --git a/admin/compiler/joomla_4/SITE_DISPLAY_CONTROLLER.php b/admin/compiler/joomla_4/SITE_DISPLAY_CONTROLLER.php
index 110caef0b..0a49488a8 100644
--- a/admin/compiler/joomla_4/SITE_DISPLAY_CONTROLLER.php
+++ b/admin/compiler/joomla_4/SITE_DISPLAY_CONTROLLER.php
@@ -65,7 +65,7 @@ class DisplayController extends BaseController
 	 */
 	public function __construct($config = [], MVCFactoryInterface $factory = null, $app = null, $input = null)
 	{
-		$app ??= Factory::getApplication();
+		$app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$this->identity ??= $app->getIdentity();
 
 		parent::__construct($config, $factory, $app, $input);
@@ -108,21 +108,21 @@ class DisplayController extends BaseController
 			if ($refid > 0 && Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($ref))
 			{
 				// redirect to item of ref
-				$this->setRedirect(Route::_('index.php?option=com_###component###&view=' . (string) $ref . '&layout=edit&id=' . (int) $refid, false));
+				$this->setRedirect(Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###&view=' . (string) $ref . '&layout=edit&id=' . (int) $refid, false));
 			}
 			elseif (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($ref))
 			{
 				// redirect to ref
-				 $this->setRedirect(Route::_('index.php?option=com_###component###&view=' . (string) $ref, false));
+				 $this->setRedirect(Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###&view=' . (string) $ref, false));
 			}
 			else
 			{
 				// normal redirect back to the list default site view
-				$this->setRedirect(Route::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###', false));
+				$this->setRedirect(Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###', false));
 			}
 
 			// Somehow the person just went to the form - we don't allow that.
-        	throw new \Exception(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id), 403);
+			throw new \Exception(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id), 403);
 		}
 
 		// we may need to make this more dynamic in the future. (TODO)
diff --git a/admin/compiler/joomla_4/SITE_FORM_MODAL_SELECT_FIELD.php b/admin/compiler/joomla_4/SITE_FORM_MODAL_SELECT_FIELD.php
new file mode 100644
index 000000000..97b5965a7
--- /dev/null
+++ b/admin/compiler/joomla_4/SITE_FORM_MODAL_SELECT_FIELD.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package	Joomla.Component.Builder
+ *
+ * @created	4th September 2022
+ * @author	 Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git		Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license	GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\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;
+	}
+}
\ No newline at end of file
diff --git a/admin/compiler/joomla_4/SITE_HEADERCHECK.php b/admin/compiler/joomla_4/SITE_HEADERCHECK.php
index 55e244ed3..730a1b94d 100644
--- a/admin/compiler/joomla_4/SITE_HEADERCHECK.php
+++ b/admin/compiler/joomla_4/SITE_HEADERCHECK.php
@@ -51,7 +51,7 @@ class HeaderCheck
 	public function __construct()
 	{
 		// Initializes the application object.
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 
 		// Initializes the document object.
 		$this->document = $this->app->getDocument();
diff --git a/admin/compiler/joomla_4/SITE_HELPER_CLASS.php b/admin/compiler/joomla_4/SITE_HELPER_CLASS.php
index 7efeae84f..195d1a1ac 100644
--- a/admin/compiler/joomla_4/SITE_HELPER_CLASS.php
+++ b/admin/compiler/joomla_4/SITE_HELPER_CLASS.php
@@ -115,7 +115,7 @@ abstract class ###Component###Helper
 	public static function getContributors()
 	{
 		// get params
-		$params    = ComponentHelper::getParams('com_###component###');
+		$params    = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
 		// start contributors array
 		$contributors = [];
 		// get all Contributors (max 20)
@@ -172,7 +172,7 @@ abstract class ###Component###Helper
 		}
 
 		// Get the model through the MVCFactory
-		return Factory::getApplication()->bootComponent('com_' . $component)->getMVCFactory()->createModel($type, $prefix, $config);
+		return Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->bootComponent('com_' . $component)->getMVCFactory()->createModel($type, $prefix, $config);
 	}
 
 	/**
@@ -242,7 +242,7 @@ abstract class ###Component###Helper
 
 			if (!$asset->check() || !$asset->store())
 			{
-				Factory::getApplication()->enqueueMessage($asset->getError(), 'warning');
+				Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->enqueueMessage($asset->getError(), 'warning');
 				return false;
 			}
 			else
@@ -255,7 +255,7 @@ abstract class ###Component###Helper
 				$object->asset_id = (int) $asset->id;
 
 				// Update their asset_id to link to the asset table.
-				return Factory::getDbo()->updateObject('#__###component###_'.$table, $object, 'id');
+				return Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo()->updateObject('#__###component###_'.$table, $object, 'id');
 			}
 		}
 		return false;
@@ -272,7 +272,7 @@ abstract class ###Component###Helper
 		if (!$inherit)
 		{
 			// Need to find the asset id by the name of the component.
-			$db = Factory::getContainer()->get(DatabaseInterface::class);
+			$db = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);
 			$query = $db->getQuery(true)
 				->select($db->quoteName('id'))
 				->from($db->quoteName('#__assets'))
@@ -497,7 +497,7 @@ abstract class ###Component###Helper
 		{
 			$type = 'item';
 		}
-		$db = Factory::getContainer()->get(DatabaseInterface::class);
+		$db = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);
 		$query = $db->getQuery(true);
 		$query->select(array('a.published'));
 		$query->from('#__###component###_'.$type.' AS a');
@@ -515,7 +515,7 @@ abstract class ###Component###Helper
 
 	public static function getGroupName($id)
 	{
-		$db = Factory::getContainer()->get(DatabaseInterface::class);
+		$db = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);
 		$query = $db->getQuery(true);
 		$query->select(array('a.title'));
 		$query->from('#__usergroups AS a');
@@ -549,7 +549,7 @@ abstract class ###Component###Helper
 		if (!Super___91004529_94a9_4590_b842_e7c6b624ecf5___Power::check($user))
 		{
 			// get the user object
-			$user = Factory::getApplication()->getIdentity();
+			$user = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();
 		}
 		// load the CMSObject
 		$result = new CMSObject;
diff --git a/admin/compiler/joomla_4/SITE_HELPER_CONTROLLER.php b/admin/compiler/joomla_4/SITE_HELPER_CONTROLLER.php
index f4090b346..20628bc73 100644
--- a/admin/compiler/joomla_4/SITE_HELPER_CONTROLLER.php
+++ b/admin/compiler/joomla_4/SITE_HELPER_CONTROLLER.php
@@ -41,10 +41,10 @@ class HelpController extends BaseController
 
 	public function help()
 	{
-		$user       = Factory::getApplication()->getIdentity();
-		$jinput     = Factory::getApplication()->input;
+		$user       = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();
+		$jinput     = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input;
 		// Check Token!
-		$token         = Session::getFormToken();
+		$token         = Joomla___5ba38513_5c4f_4b0d_935e_49e986a6bce8___Power::getFormToken();
 		$call_token    = $jinput->get('token', 0, 'ALNUM');
 		if($user->id != 0 && ($jinput->get($token, 0, 'ALNUM') || $token === $call_token))
 		{
@@ -83,7 +83,7 @@ class HelpController extends BaseController
 
 	protected function getHelpDocumentText($id)
 	{
-		$db     = Factory::getContainer()->get(DatabaseInterface::class);
+		$db     = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);
 		$query  = $db->getQuery(true);
 		$query->select(array('a.title','a.content'));
 		$query->from('#__###component###_help_document AS a');
@@ -97,18 +97,18 @@ class HelpController extends BaseController
 			$text = [];
 			$document = $db->loadObject();
 			// fix image issue
-			$images['src="images'] = 'src="'.Uri::root().'images';
-			$images["src='images"] = "src='".Uri::root()."images";
-			$images['src="/images'] = 'src="'.Uri::root().'images';
-			$images["src='/images"] = "src='".Uri::root()."images";
+			$images['src="images'] = 'src="'.Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root().'images';
+			$images["src='images"] = "src='".Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root()."images";
+			$images['src="/images'] = 'src="'.Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root().'images';
+			$images["src='/images"] = "src='".Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root()."images";
 			// set document template
 			$text[] = "<!doctype html>";
 			$text[] = '<html>';
 			$text[] = "<head>";
 			$text[] = '<meta charset="utf-8">';
 			$text[] = "<title>".$document->title."</title>";
-			$text[] = '<link type="text/css" href="'.Uri::root().'media/com_###component###/uikit/css/uikit.gradient.min.css" rel="stylesheet"></link>';
-			$text[] = '<script type="text/javascript" src="'.Uri::root().'media/com_###component###/uikit/js/uikit.min.js"></script>';
+			$text[] = '<link type="text/css" href="'.Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root().'media/com_###component###/uikit/css/uikit.gradient.min.css" rel="stylesheet"></link>';
+			$text[] = '<script type="text/javascript" src="'.Joomla___eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::root().'media/com_###component###/uikit/js/uikit.min.js"></script>';
 			$text[] = "</head>";
 			$text[] = '<body><br />';
 			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
diff --git a/admin/compiler/joomla_4/SITE_ROUTER.php b/admin/compiler/joomla_4/SITE_ROUTER.php
index 4cc195d94..b5a3cbd42 100644
--- a/admin/compiler/joomla_4/SITE_ROUTER.php
+++ b/admin/compiler/joomla_4/SITE_ROUTER.php
@@ -85,7 +85,7 @@ class Router extends RouterView
 	{
 		$this->categoryFactory = $categoryFactory;
 		$this->db              = $db;
-		$this->params          = ComponentHelper::getParams('com_###component###');
+		$this->params          = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
 		$this->noIDs           = (bool) $this->params->get('sef_ids', false);###SITE_ROUTER_CONSTRUCTOR_BEFORE_PARENT###
 
 		parent::__construct($app, $menu);###SITE_ROUTER_CONSTRUCTOR_AFTER_PARENT###
diff --git a/admin/compiler/joomla_4/SITE_ROUTE_HELPER.php b/admin/compiler/joomla_4/SITE_ROUTE_HELPER.php
index 96fdd1822..0f14883e9 100644
--- a/admin/compiler/joomla_4/SITE_ROUTE_HELPER.php
+++ b/admin/compiler/joomla_4/SITE_ROUTE_HELPER.php
@@ -36,7 +36,7 @@ abstract class RouteHelper
 
 	protected static function _findItem($needles = null,$type = null)
 	{
-		$app      = Factory::getApplication();
+		$app      = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$menus    = $app->getMenu('site');
 		$language = isset($needles['language']) ? $needles['language'] : '*';
 
@@ -45,7 +45,7 @@ abstract class RouteHelper
 		{
 			self::$lookup[$language] = [];
 
-			$component  = ComponentHelper::getComponent('com_###component###');
+			$component  = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getComponent('com_###component###');
 
 			$attributes = array('component_id');
 			$values     = array($component->id);
@@ -116,7 +116,7 @@ abstract class RouteHelper
 		if ($type)
 		{
 			// Check if the global menu item has been set.
-			$params = ComponentHelper::getParams('com_###component###');
+			$params = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###');
 			if ($item = $params->get($type.'_menu', 0))
 			{
 				return $item;
diff --git a/admin/compiler/joomla_4/SITE_VIEWS_HTML.php b/admin/compiler/joomla_4/SITE_VIEWS_HTML.php
index 07113d005..a86628dfd 100644
--- a/admin/compiler/joomla_4/SITE_VIEWS_HTML.php
+++ b/admin/compiler/joomla_4/SITE_VIEWS_HTML.php
@@ -87,7 +87,7 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null): void
 	{
 		// get combined params of both component and menu
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$this->params = $this->app->getParams();
 		$this->menu = $this->app->getMenu()->getActive();
 		$this->styles = $this->get('Styles');
@@ -109,12 +109,12 @@ class HtmlView extends BaseHtmlView
 		// add styles
 		foreach ($this->styles as $style)
 		{
-			Html::_('stylesheet', $style, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('stylesheet', $style, ['version' => 'auto']);
 		}###SITE_DOCUMENT_CUSTOM_CSS###
 		// add scripts
 		foreach ($this->scripts as $script)
 		{
-			Html::_('script', $script, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('script', $script, ['version' => 'auto']);
 		}###SITE_DOCUMENT_CUSTOM_JS######SITE_JAVASCRIPT_FOR_BUTTONS###
 	}
 
@@ -131,7 +131,7 @@ class HtmlView extends BaseHtmlView
 		$this->help_url = ###Component###Helper::getHelpUrl('###sviews###');
 		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($this->help_url))
 		{
-			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 
 		// now initiate the toolbar
diff --git a/admin/compiler/joomla_4/SITE_VIEWS_MODEL.php b/admin/compiler/joomla_4/SITE_VIEWS_MODEL.php
index 20fa13ebd..11722644c 100644
--- a/admin/compiler/joomla_4/SITE_VIEWS_MODEL.php
+++ b/admin/compiler/joomla_4/SITE_VIEWS_MODEL.php
@@ -122,7 +122,7 @@ class ###SViews###Model extends ListModel
 	{
 		parent::__construct($config, $factory);
 
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$this->input ??= $this->app->getInput();
 
 		// Set the current user for authorisation checks (for those calling this model directly)
@@ -160,7 +160,7 @@ class ###SViews###Model extends ListModel
 		$items = parent::getItems();
 
 		// Get the global params
-		$globalParams = ComponentHelper::getParams('com_###component###', true);###SITE_GET_ITEMS######SITE_AFTER_GET_ITEMS###
+		$globalParams = Joomla___aeb8e463_291f_4445_9ac4_34b637c12dbd___Power::getParams('com_###component###', true);###SITE_GET_ITEMS######SITE_AFTER_GET_ITEMS###
 
 		// return items
 		return $items;
diff --git a/admin/compiler/joomla_4/SITE_VIEW_HTML.php b/admin/compiler/joomla_4/SITE_VIEW_HTML.php
index fc104516c..af0d8eeba 100644
--- a/admin/compiler/joomla_4/SITE_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/SITE_VIEW_HTML.php
@@ -71,7 +71,7 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null): void
 	{
 		// get combined params of both component and menu
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$this->params = $this->app->getParams();
 		$this->menu = $this->app->getMenu()->getActive();
 		$this->styles = $this->get('Styles') ?? [];
@@ -93,12 +93,12 @@ class HtmlView extends BaseHtmlView
 		// add styles
 		foreach ($this->styles as $style)
 		{
-			Html::_('stylesheet', $style, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('stylesheet', $style, ['version' => 'auto']);
 		}###SITE_DOCUMENT_CUSTOM_CSS###
 		// add scripts
 		foreach ($this->scripts as $script)
 		{
-			Html::_('script', $script, ['version' => 'auto']);
+			Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('script', $script, ['version' => 'auto']);
 		}###SITE_DOCUMENT_CUSTOM_JS######SITE_JAVASCRIPT_FOR_BUTTONS###
 	}
 
@@ -115,7 +115,7 @@ class HtmlView extends BaseHtmlView
 		$this->help_url = ###Component###Helper::getHelpUrl('###sview###');
 		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($this->help_url))
 		{
-			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
+			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 
 		// now initiate the toolbar
diff --git a/admin/compiler/joomla_4/SITE_VIEW_MODEL.php b/admin/compiler/joomla_4/SITE_VIEW_MODEL.php
index e017632af..0290ce150 100644
--- a/admin/compiler/joomla_4/SITE_VIEW_MODEL.php
+++ b/admin/compiler/joomla_4/SITE_VIEW_MODEL.php
@@ -139,7 +139,7 @@ class ###SView###Model extends ItemModel
 	{
 		parent::__construct($config, $factory);
 
-		$this->app ??= Factory::getApplication();
+		$this->app ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();
 		$this->input ??= $this->app->getInput();
 
 		// Set the current user for authorisation checks (for those calling this model directly)
diff --git a/admin/compiler/joomla_4/default_batch_body.php b/admin/compiler/joomla_4/default_batch_body.php
index 6ca60b2b1..1ba970783 100644
--- a/admin/compiler/joomla_4/default_batch_body.php
+++ b/admin/compiler/joomla_4/default_batch_body.php
@@ -22,5 +22,5 @@ defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
 
 ?>
 
-<p><?php echo Text::_('COM_###COMPONENT###_###VIEWS###_BATCH_TIP'); ?></p>
+<p><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_###VIEWS###_BATCH_TIP'); ?></p>
 <?php echo $this->batchDisplay; ?>
\ No newline at end of file
diff --git a/admin/compiler/joomla_4/default_batch_footer.php b/admin/compiler/joomla_4/default_batch_footer.php
index 701e3c69b..2615f443d 100644
--- a/admin/compiler/joomla_4/default_batch_footer.php
+++ b/admin/compiler/joomla_4/default_batch_footer.php
@@ -22,9 +22,9 @@ defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
 ?>
 <!-- clear the batch values if cancel -->
 <button class="btn" type="button" onclick="###BATCH_ONCLICK_CANCEL_SCRIPT###" data-dismiss="modal">
-	<?php echo Text::_('JCANCEL'); ?>
+	<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JCANCEL'); ?>
 </button>
 <!-- post the batch values if process -->
 <button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('###view###.batch');">
-	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
+	<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JGLOBAL_BATCH_PROCESS'); ?>
 </button>
\ No newline at end of file
diff --git a/admin/compiler/joomla_4/default_import.php b/admin/compiler/joomla_4/default_import.php
index 05ff76fe1..e3d652348 100644
--- a/admin/compiler/joomla_4/default_import.php
+++ b/admin/compiler/joomla_4/default_import.php
@@ -21,10 +21,10 @@ use Joomla\CMS\HTML\HTMLHelper as Html;
 // No direct access to this file
 defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
 
-Html::_('jquery.framework');
-Html::_('bootstrap.tooltip');
-Html::_('script', 'system/core.js', false, true);
-Html::_('behavior.keepalive');
+Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('jquery.framework');
+Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('bootstrap.tooltip');
+Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('script', 'system/core.js', false, true);
+Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('behavior.keepalive');
 
 ?>
 <script type="text/javascript">
@@ -41,7 +41,7 @@ Joomla.continueImport = function() {
     }
     // do field validation
     if (error) {
-        alert("<?php echo Text::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS', true); ?>");
+        alert("<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS', true); ?>");
     } else {
         document.getElementById('loading').style.display = 'block';
         form.gettype.value = 'continue';
@@ -53,7 +53,7 @@ Joomla.submitbutton = function() {
     var form = document.getElementById('adminForm');
     // do field validation
     if (form.import_package.value == "") {
-        alert("<?php echo Text::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_SELECT_A_FILE', true); ?>");
+        alert("<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_SELECT_A_FILE', true); ?>");
     } else {
         document.getElementById('loading').style.display = 'block';
         form.gettype.value = 'upload';
@@ -65,7 +65,7 @@ Joomla.submitbutton3 = function() {
     var form = document.getElementById('adminForm');
     // do field validation
     if (form.import_directory.value == ""){
-        alert("<?php echo Text::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY', true); ?>");
+        alert("<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY', true); ?>");
     } else {
         document.getElementById('loading').style.display = 'block';
         form.gettype.value = 'folder';
@@ -77,7 +77,7 @@ Joomla.submitbutton4 = function() {
     var form = document.getElementById('adminForm');
     // do field validation
     if (form.import_url.value == "" || form.import_url.value == "http://") {
-        alert("<?php echo Text::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL', true); ?>");
+        alert("<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL', true); ?>");
     } else {
         document.getElementById('loading').style.display = 'block';
         form.gettype.value = 'url';
@@ -111,16 +111,16 @@ document.addEventListener('DOMContentLoaded', function() {
 </script>
 
 <div id="installer-import" class="clearfix">
-<form enctype="multipart/form-data" action="<?php echo Route::_('index.php?option=com_###component###&view=import');?>" method="post" name="adminForm" id="adminForm" class="form-horizontal form-validate">
+<form enctype="multipart/form-data" action="<?php echo Joomla___d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_###component###&view=import');?>" method="post" name="adminForm" id="adminForm" class="form-horizontal form-validate">
 	<div id="main-card">
 
 	<?php if ($this->hasPackage && Super___0a59c65c_9daf_4bc9_baf4_e063ff9e6a8a___Power::check($this->headerList) && Super___0a59c65c_9daf_4bc9_baf4_e063ff9e6a8a___Power::check($this->headers)) : ?>
 		<fieldset class="uploadform">
-			<legend><?php echo Text::_('COM_###COMPONENT###_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend>
+			<legend><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend>
 			<div class="control-group">
-				<label class="control-label" ><h4><?php echo Text::_('COM_###COMPONENT###_IMPORT_TABLE_COLUMNS'); ?></h4></label>
+				<label class="control-label" ><h4><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_TABLE_COLUMNS'); ?></h4></label>
 				<div class="controls">
-					<label class="control-label" ><h4><?php echo Text::_('COM_###COMPONENT###_IMPORT_FILE_COLUMNS'); ?></h4></label>
+					<label class="control-label" ><h4><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_FILE_COLUMNS'); ?></h4></label>
 				</div>
 			</div>
 			<?php foreach($this->headerList as $name => $title): ?>
@@ -128,8 +128,8 @@ document.addEventListener('DOMContentLoaded', function() {
 					<label for="<?php echo $name; ?>" class="control-label" ><?php echo $title; ?></label>
 					<div class="controls">
 					<select  name="<?php echo $name; ?>"  id="vdm_<?php echo $name; ?>" required class="required input_box" >
-						<option value=""><?php echo Text::_('COM_###COMPONENT###_IMPORT_PLEASE_SELECT_COLUMN'); ?></option>
-						<option value="IGNORE"><?php echo Text::_('COM_###COMPONENT###_IMPORT_IGNORE_COLUMN'); ?></option>
+						<option value=""><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_PLEASE_SELECT_COLUMN'); ?></option>
+						<option value="IGNORE"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_IGNORE_COLUMN'); ?></option>
 						<?php foreach($this->headers as $value => $option): ?>
 							<?php $selected = (strtolower($option) ==  strtolower ($title) || strtolower($option) == strtolower($name))? 'selected="selected"':''; ?>
 							<option value="<?php echo Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::html($value); ?>" class="required" <?php echo $selected ?>><?php echo Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::html($option); ?></option>
@@ -139,61 +139,61 @@ document.addEventListener('DOMContentLoaded', function() {
 				</div>
 			<?php endforeach; ?>
 			<div class="form-actions">
-				<input class="btn btn-primary" type="button" value="<?php echo Text::_('COM_###COMPONENT###_IMPORT_CONTINUE'); ?>" onclick="Joomla.continueImport()" />
+				<input class="btn btn-primary" type="button" value="<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_CONTINUE'); ?>" onclick="Joomla.continueImport()" />
 			</div>
 		</fieldset>
 		<input type="hidden" name="gettype" value="continue" />
 	<?php else: ?>
-		<?php echo Html::_('uitab.startTabSet', 'myTab', array('active' => 'upload')); ?>
+		<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('uitab.startTabSet', 'myTab', array('active' => 'upload')); ?>
 
-		<?php echo Html::_('uitab.addTab', 'myTab', 'upload', Text::_('COM_###COMPONENT###_IMPORT_FROM_UPLOAD', true)); ?>
+		<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('uitab.addTab', 'myTab', 'upload', Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_FROM_UPLOAD', true)); ?>
 			<fieldset class="uploadform">
-				<legend><?php echo Text::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
+				<legend><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
 				<div class="control-group">
-					<label for="import_package" class="control-label"><?php echo Text::_('COM_###COMPONENT###_IMPORT_SELECT_FILE'); ?></label>
+					<label for="import_package" class="control-label"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_SELECT_FILE'); ?></label>
 					<div class="controls">
 						<input class="input_box" id="import_package" name="import_package" type="file" size="57" />
 					</div>
 				</div>
 				<div class="form-actions">
-					<input class="btn btn-primary" type="button" value="<?php echo Text::_('COM_###COMPONENT###_IMPORT_UPLOAD_BOTTON'); ?>" onclick="Joomla.submitbutton()" />&nbsp;&nbsp;&nbsp;<small><?php echo Text::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+					<input class="btn btn-primary" type="button" value="<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_UPLOAD_BOTTON'); ?>" onclick="Joomla.submitbutton()" />&nbsp;&nbsp;&nbsp;<small><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
 				</div>
 			</fieldset>
-		<?php echo Html::_('uitab.endTab'); ?>
+		<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('uitab.endTab'); ?>
 
-		<?php echo Html::_('uitab.addTab', 'myTab', 'directory', Text::_('COM_###COMPONENT###_IMPORT_FROM_DIRECTORY', true)); ?>
+		<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('uitab.addTab', 'myTab', 'directory', Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_FROM_DIRECTORY', true)); ?>
 			<fieldset class="uploadform">
-				<legend><?php echo Text::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
+				<legend><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
 				<div class="control-group">
-					<label for="import_directory" class="control-label"><?php echo Text::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_DIRECTORY'); ?></label>
+					<label for="import_directory" class="control-label"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_DIRECTORY'); ?></label>
 					<div class="controls">
 						<input type="text" id="import_directory" name="import_directory" class="span5 input_box" size="70" value="<?php echo $this->state->get('import.directory'); ?>" />
 					</div>
 				</div>
 				<div class="form-actions">
-					<input type="button" class="btn btn-primary" value="<?php echo Text::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton3()" />&nbsp;&nbsp;&nbsp;<small><?php echo Text::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+					<input type="button" class="btn btn-primary" value="<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton3()" />&nbsp;&nbsp;&nbsp;<small><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
 				</div>
 				</fieldset>
-		<?php echo Html::_('uitab.endTab'); ?>
+		<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('uitab.endTab'); ?>
 
-		<?php echo Html::_('uitab.addTab', 'myTab', 'url', Text::_('COM_###COMPONENT###_IMPORT_FROM_URL', true)); ?>
+		<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('uitab.addTab', 'myTab', 'url', Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_FROM_URL', true)); ?>
 			<fieldset class="uploadform">
-				<legend><?php echo Text::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
+				<legend><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
 				<div class="control-group">
-					<label for="import_url" class="control-label"><?php echo Text::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_URL'); ?></label>
+					<label for="import_url" class="control-label"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_URL'); ?></label>
 					<div class="controls">
 						<input type="text" id="import_url" name="import_url" class="span5 input_box" size="70" value="http://" />
 					</div>
 				</div>
 				<div class="form-actions">
-					<input type="button" class="btn btn-primary" value="<?php echo Text::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton4()" />&nbsp;&nbsp;&nbsp;<small><?php echo Text::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+					<input type="button" class="btn btn-primary" value="<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton4()" />&nbsp;&nbsp;&nbsp;<small><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
 				</div>
 			</fieldset>
-		<?php echo Html::_('uitab.endTab'); ?>
-		<?php echo Html::_('uitab.endTabSet'); ?>
+		<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('uitab.endTab'); ?>
+		<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('uitab.endTabSet'); ?>
 		<input type="hidden" name="gettype" value="upload" />
 	<?php endif; ?>
 	<input type="hidden" name="task" value="import.import" />
-	<?php echo Html::_('form.token'); ?>
+	<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('form.token'); ?>
 </form>
 </div>
\ No newline at end of file
diff --git a/admin/compiler/joomla_4/default_import_custom.php b/admin/compiler/joomla_4/default_import_custom.php
index 91b71fce6..e532204ce 100644
--- a/admin/compiler/joomla_4/default_import_custom.php
+++ b/admin/compiler/joomla_4/default_import_custom.php
@@ -22,9 +22,9 @@ use Joomla\CMS\HTML\HTMLHelper as Html;
 // No direct access to this file
 defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
 
-Html::_('jquery.framework');
-Html::_('bootstrap.tooltip');
-Html::_('script', 'system/core.js', false, true);
-Html::_('behavior.keepalive');
+Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('jquery.framework');
+Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('bootstrap.tooltip');
+Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('script', 'system/core.js', false, true);
+Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('behavior.keepalive');
 
 ?>###IMPORT_DEFAULT_VIEW_CUSTOM###
diff --git a/admin/compiler/joomla_4/default_main.php b/admin/compiler/joomla_4/default_main.php
index 91b3fcb0a..ccb947490 100644
--- a/admin/compiler/joomla_4/default_main.php
+++ b/admin/compiler/joomla_4/default_main.php
@@ -26,12 +26,12 @@ defined('_JEXEC') or die;
 			<div class="dashboard-content">
 				<a class="icon" href="<?php echo $icon->url; ?>">
 					<img alt="<?php echo $icon->alt; ?>" src="components/com_###component###/assets/images/icons/<?php  echo $icon->image; ?>">
-					<span class="dashboard-title"><?php echo Text::_($icon->name); ?></span>
+					<span class="dashboard-title"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_($icon->name); ?></span>
 				</a>
 			 </div>
 		</div>
 	<?php endforeach; ?>
 	<div class="clearfix"></div>
 <?php else: ?>
-	<div class="alert alert-error"><h4 class="alert-heading"><?php echo Text::_("Permission denied, or not correctly set"); ?></h4><div class="alert-message"><?php echo Text::_("Please notify your System Administrator if result is unexpected."); ?></div></div>
+	<div class="alert alert-error"><h4 class="alert-heading"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_("Permission denied, or not correctly set"); ?></h4><div class="alert-message"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_("Please notify your System Administrator if result is unexpected."); ?></div></div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/admin/compiler/joomla_4/default_toolbar.php b/admin/compiler/joomla_4/default_toolbar.php
index 6fb862f1e..4da476b18 100644
--- a/admin/compiler/joomla_4/default_toolbar.php
+++ b/admin/compiler/joomla_4/default_toolbar.php
@@ -23,30 +23,30 @@ defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
 ?>
 <div id="filter-bar" class="btn-toolbar">
 	<div class="filter-search btn-group pull-left">
-		<label for="filter_search" class="element-invisible"><?php echo Text::_('Search');?></label>
-		<input type="text" name="filter_search" id="filter_search" placeholder="<?php echo Text::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="hasTooltip" title="<?php echo Html::tooltipText('Search ###Views###'); ?>" />
+		<label for="filter_search" class="element-invisible"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('Search');?></label>
+		<input type="text" name="filter_search" id="filter_search" placeholder="<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="hasTooltip" title="<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::tooltipText('Search ###Views###'); ?>" />
 	</div>
 	<div class="btn-group pull-left">
-		<button type="submit" class="btn hasTooltip" title="<?php echo Html::tooltipText('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
-		<button type="button" class="btn hasTooltip" title="<?php echo Html::tooltipText('JSEARCH_FILTER_CLEAR'); ?>" onclick="document.id('filter_search').value='';this.form.submit();"><i class="icon-remove"></i></button>
+		<button type="submit" class="btn hasTooltip" title="<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::tooltipText('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
+		<button type="button" class="btn hasTooltip" title="<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::tooltipText('JSEARCH_FILTER_CLEAR'); ?>" onclick="document.id('filter_search').value='';this.form.submit();"><i class="icon-remove"></i></button>
 	</div>
 	<div class="btn-group pull-right hidden-phone">
-		<label for="limit" class="element-invisible"><?php echo Text::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC');?></label>
+		<label for="limit" class="element-invisible"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC');?></label>
 		<?php echo $this->pagination->getLimitBox(); ?>
 	</div>
 	<div class="btn-group pull-right hidden-phone">
-		<label for="directionTable" class="element-invisible"><?php echo Text::_('JFIELD_ORDERING_DESC');?></label>
+		<label for="directionTable" class="element-invisible"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JFIELD_ORDERING_DESC');?></label>
 		<select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">
-			<option value=""><?php echo Text::_('JFIELD_ORDERING_DESC');?></option>
-			<option value="asc" <?php if ($this->listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo Text::_('JGLOBAL_ORDER_ASCENDING');?></option>
-			<option value="desc" <?php if ($this->listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo Text::_('JGLOBAL_ORDER_DESCENDING');?></option>
+			<option value=""><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JFIELD_ORDERING_DESC');?></option>
+			<option value="asc" <?php if ($this->listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JGLOBAL_ORDER_ASCENDING');?></option>
+			<option value="desc" <?php if ($this->listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JGLOBAL_ORDER_DESCENDING');?></option>
 		</select>
 	</div>
 	<div class="btn-group pull-right">
-		<label for="sortTable" class="element-invisible"><?php echo Text::_('JGLOBAL_SORT_BY');?></label>
+		<label for="sortTable" class="element-invisible"><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JGLOBAL_SORT_BY');?></label>
 		<select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
-			<option value=""><?php echo Text::_('JGLOBAL_SORT_BY');?></option>
-			<?php echo Html::_('select.options', $this->getSortFields(), 'value', 'text', $this->listOrder);?>
+			<option value=""><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JGLOBAL_SORT_BY');?></option>
+			<?php echo Joomla___34690c75_1090_47eb_8c06_7228dc7eedd6___Power::_('select.options', $this->getSortFields(), 'value', 'text', $this->listOrder);?>
 		</select>
 	</div>
 </div>
diff --git a/admin/compiler/joomla_4/default_vdm.php b/admin/compiler/joomla_4/default_vdm.php
index 2af4045b4..22989e03c 100644
--- a/admin/compiler/joomla_4/default_vdm.php
+++ b/admin/compiler/joomla_4/default_vdm.php
@@ -20,21 +20,21 @@ use Joomla\CMS\Language\Text;
 defined('_JEXEC') or die;
 
 ?>
-<img alt="<?php echo Text::_('COM_###COMPONENT###'); ?>" width="100%"  src="components/com_###component###/assets/images/vdm-component.###COMP_IMAGE_TYPE###">
+<img alt="<?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###'); ?>" width="100%"  src="components/com_###component###/assets/images/vdm-component.###COMP_IMAGE_TYPE###">
 <ul class="list-striped">
-	<li><b><?php echo Text::_('COM_###COMPONENT###_VERSION'); ?>:</b> <?php echo $this->manifest->version; ?>&nbsp;&nbsp;<span class="update-notice" id="component-update-notice"></span></li>
-	<li><b><?php echo Text::_('COM_###COMPONENT###_DATE'); ?>:</b> <?php echo $this->manifest->creationDate; ?></li>
-	<li><b><?php echo Text::_('COM_###COMPONENT###_AUTHOR'); ?>:</b> <a href="mailto:<?php echo $this->manifest->authorEmail; ?>"><?php echo $this->manifest->author; ?></a></li>
-	<li><b><?php echo Text::_('COM_###COMPONENT###_WEBSITE'); ?>:</b> <a href="<?php echo $this->manifest->authorUrl; ?>" target="_blank"><?php echo $this->manifest->authorUrl; ?></a></li>
-	<li><b><?php echo Text::_('COM_###COMPONENT###_LICENSE'); ?>:</b> <?php echo $this->manifest->license; ?></li>
+	<li><b><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_VERSION'); ?>:</b> <?php echo $this->manifest->version; ?>&nbsp;&nbsp;<span class="update-notice" id="component-update-notice"></span></li>
+	<li><b><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_DATE'); ?>:</b> <?php echo $this->manifest->creationDate; ?></li>
+	<li><b><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_AUTHOR'); ?>:</b> <a href="mailto:<?php echo $this->manifest->authorEmail; ?>"><?php echo $this->manifest->author; ?></a></li>
+	<li><b><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_WEBSITE'); ?>:</b> <a href="<?php echo $this->manifest->authorUrl; ?>" target="_blank"><?php echo $this->manifest->authorUrl; ?></a></li>
+	<li><b><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_LICENSE'); ?>:</b> <?php echo $this->manifest->license; ?></li>
 	<li><b><?php echo $this->manifest->copyright; ?></b></li>
 </ul>
 <div class="clearfix"></div>
 <?php if(Super___0a59c65c_9daf_4bc9_baf4_e063ff9e6a8a___Power::check($this->contributors)): ?>
 	<?php if(count($this->contributors) > 1): ?>
-		<h3><?php echo Text::_('COM_###COMPONENT###_CONTRIBUTORS'); ?></h3>
+		<h3><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_CONTRIBUTORS'); ?></h3>
 	<?php else: ?>
-		<h3><?php echo Text::_('COM_###COMPONENT###_CONTRIBUTOR'); ?></h3>
+		<h3><?php echo Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_###COMPONENT###_CONTRIBUTOR'); ?></h3>
 	<?php endif; ?>
 	<ul class="list-striped">
 		<?php foreach($this->contributors as $contributor): ?>
diff --git a/admin/compiler/joomla_4/layoutlinkedview.php b/admin/compiler/joomla_4/layoutlinkedview.php
index 9617296d8..9b57ea428 100644
--- a/admin/compiler/joomla_4/layoutlinkedview.php
+++ b/admin/compiler/joomla_4/layoutlinkedview.php
@@ -24,7 +24,7 @@ defined('_JEXEC') or die;
 
 // set the defaults
 $items = $displayData->###LAYOUTITEMS###;
-$user = Factory::getApplication()->getIdentity();
+$user = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();
 $id = $displayData->item->id;
 ###LAYOUTITEMSHEADER###
 
diff --git a/admin/compiler/joomla_4/layoutmetadata.php b/admin/compiler/joomla_4/layoutmetadata.php
index 80877adb6..0a56077ba 100644
--- a/admin/compiler/joomla_4/layoutmetadata.php
+++ b/admin/compiler/joomla_4/layoutmetadata.php
@@ -27,7 +27,7 @@ $fieldSets = $form->getFieldsets('metadata');
 
 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
-		<p class="alert alert-info"><?php echo $this->escape(Text::_($fieldSet->description)); ?></p>
+		<p class="alert alert-info"><?php echo $this->escape(Joomla___ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_($fieldSet->description)); ?></p>
 	<?php endif; ?>
 
 	<?php
diff --git a/admin/compiler/joomla_4/settings.json b/admin/compiler/joomla_4/settings.json
index 453a3ab4f..480af9648 100644
--- a/admin/compiler/joomla_4/settings.json
+++ b/admin/compiler/joomla_4/settings.json
@@ -328,6 +328,12 @@
 					"newName": "default.php",
 					"type": "single"
 				},
+				"ADMIN_VIEW_MODAL.php": {
+					"path": "c0mp0n3nt/admin/tmpl/[[[name]]]",
+					"rename": "new",
+					"newName": "modal.php",
+					"type": "single"
+				},
 				"ADMIN_VIEW_MODEL.php": {
 					"path": "c0mp0n3nt/admin/src/Model",
 					"rename": "new",
@@ -386,6 +392,12 @@
 					"newName": "default.php",
 					"type": "list"
 				},
+				"ADMIN_VIEWS_MODAL.php": {
+					"path": "c0mp0n3nt/admin/tmpl/[[[name]]]",
+					"rename": "new",
+					"newName": "modal.php",
+					"type": "list"
+				},
 				"ADMIN_VIEWS_EMPTYSTATE.php": {
 					"path": "c0mp0n3nt/admin/tmpl/[[[name]]]",
 					"rename": "new",
@@ -464,6 +476,12 @@
 					"newName": "[[[Key]]]Field.php",
 					"type": "fieldcustom"
 				},
+				"FORM_MODAL_SELECT_FIELD.php": {
+					"path": "c0mp0n3nt/admin/src/Field",
+					"rename": "new",
+					"newName": "ModalSelectField.php",
+					"type": "fieldmodalselect_override"
+				},
 				"FORM_LIST_FIELD.php": {
 					"path": "c0mp0n3nt/admin/src/Field",
 					"rename": "new",
@@ -743,6 +761,12 @@
 					"newName": "[[[Key]]]Field.php",
 					"type": "fieldcustom"
 				},
+				"SITE_FORM_MODAL_SELECT_FIELD.php": {
+					"path": "c0mp0n3nt/site/src/Field",
+					"rename": "new",
+					"newName": "ModalSelectField.php",
+					"type": "fieldmodalselect_override"
+				},
 				"SITE_FORM_LIST_FIELD.php": {
 					"path": "c0mp0n3nt/site/src/Field",
 					"rename": "new",
@@ -874,4 +898,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/admin/config.xml b/admin/config.xml
index 5d1863161..fda995281 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -958,7 +958,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_FIELD_NAME_BUILDER_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_FIELD_NAME_BUILDER_DESCRIPTION"
 			class="btn-group btn-group-yesno"
-			default="1">
+			default="2">
 			<!-- Option Set. -->
 			<option value="1">
 				COM_COMPONENTBUILDER_CONFIG_DEFAULT</option>
@@ -972,7 +972,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_TYPE_NAME_BUILDER_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_TYPE_NAME_BUILDER_DESCRIPTION"
 			class="btn-group btn-group-yesno"
-			default="1">
+			default="2">
 			<!-- Option Set. -->
 			<option value="1">
 				COM_COMPONENTBUILDER_CONFIG_DEFAULT</option>
diff --git a/admin/forms/admin_fields.xml b/admin/forms/admin_fields.xml
index 701e499be..01706aee4 100644
--- a/admin/forms/admin_fields.xml
+++ b/admin/forms/admin_fields.xml
@@ -122,16 +122,25 @@
 			icon="list"
 			min="1">
 			<form hidden="true" name="list_addfields_modal" repeat="true">
-				<!-- Field Field. Type: Fields. (custom) -->
+				<!-- Field Field. Type: Modalselect. (custom) -->
 				<field
-					type="fields"
+					type="ModalSelect"
 					name="field"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL"
-					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION"
-					layout="joomla.form.field.list-fancy-select"
-					multiple="false"
+					sql_title_table="#__componentbuilder_field"
+					sql_title_column="name"
+					sql_title_key="guid"
+					urlSelect="index.php?option=com_componentbuilder&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+					titleSelect="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_TITLESELECT"
+					iconSelect="icon-lamp"
+					select="true"
+					new="false"
+					edit="false"
+					clear="true"
 					required="true"
-					button="false"
+					class="input-large"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_HINT"
 				/>
 				<!-- List Field. Type: List. (joomla) -->
 				<field
diff --git a/admin/forms/admin_view.xml b/admin/forms/admin_view.xml
index 1620204be..f2c496d95 100644
--- a/admin/forms/admin_view.xml
+++ b/admin/forms/admin_view.xml
@@ -705,16 +705,25 @@
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_DESCRIPTION"
 			icon="list">
 			<form hidden="true" name="list_addlinked_views_modal" repeat="true">
-				<!-- Adminview Field. Type: Adminviews. (custom) -->
+				<!-- Adminview Field. Type: Modalselect. (custom) -->
 				<field
-					type="adminviews"
+					type="ModalSelect"
 					name="adminview"
 					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION"
-					layout="joomla.form.field.list-fancy-select"
-					multiple="false"
+					sql_title_table="#__componentbuilder_admin_view"
+					sql_title_column="system_name"
+					sql_title_key="guid"
+					urlSelect="index.php?option=com_componentbuilder&amp;view=admin_views&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+					titleSelect="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_TITLESELECT"
+					iconSelect="icon-stack"
+					select="true"
+					new="false"
+					edit="false"
+					clear="true"
 					required="true"
-					button="false"
+					class="input-large"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_HINT"
 				/>
 				<!-- Tab Field. Type: Integer. (joomla) -->
 				<field
diff --git a/admin/forms/component_admin_views.xml b/admin/forms/component_admin_views.xml
index a3ada9675..132d8b2d8 100644
--- a/admin/forms/component_admin_views.xml
+++ b/admin/forms/component_admin_views.xml
@@ -135,16 +135,25 @@
 			icon="list"
 			min="1">
 			<form hidden="true" name="list_addadmin_views_modal" repeat="true">
-				<!-- Adminview Field. Type: Adminviews. (custom) -->
+				<!-- Adminview Field. Type: Modalselect. (custom) -->
 				<field
-					type="adminviews"
+					type="ModalSelect"
 					name="adminview"
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_LABEL"
-					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_DESCRIPTION"
-					layout="joomla.form.field.list-fancy-select"
-					multiple="false"
+					sql_title_table="#__componentbuilder_admin_view"
+					sql_title_column="system_name"
+					sql_title_key="guid"
+					urlSelect="index.php?option=com_componentbuilder&amp;view=admin_views&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+					titleSelect="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_TITLESELECT"
+					iconSelect="icon-stack"
+					select="true"
+					new="false"
+					edit="false"
+					clear="true"
 					required="true"
-					button="false"
+					class="input-large"
+					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_HINT"
 				/>
 				<!-- Icomoon Field. Type: List. (joomla) -->
 				<field
diff --git a/admin/forms/component_config.xml b/admin/forms/component_config.xml
index f1313108c..516db2bf9 100644
--- a/admin/forms/component_config.xml
+++ b/admin/forms/component_config.xml
@@ -134,16 +134,25 @@
 			default=""
 			icon="list">
 			<form hidden="true" name="list_addconfig_modal" repeat="true">
-				<!-- Field Field. Type: Fields. (custom) -->
+				<!-- Field Field. Type: Modalselect. (custom) -->
 				<field
-					type="fields"
+					type="ModalSelect"
 					name="field"
 					label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_LABEL"
-					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_DESCRIPTION"
-					layout="joomla.form.field.list-fancy-select"
-					multiple="false"
+					sql_title_table="#__componentbuilder_field"
+					sql_title_column="name"
+					sql_title_key="guid"
+					urlSelect="index.php?option=com_componentbuilder&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+					titleSelect="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_TITLESELECT"
+					iconSelect="icon-lamp"
+					select="true"
+					new="false"
+					edit="false"
+					clear="true"
 					required="true"
-					button="false"
+					class="input-large"
+					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_HINT"
 				/>
 				<!-- Custom_value Field. Type: Textarea. (joomla) -->
 				<field
diff --git a/admin/forms/component_custom_admin_views.xml b/admin/forms/component_custom_admin_views.xml
index 6503df3c2..69fb86c1e 100644
--- a/admin/forms/component_custom_admin_views.xml
+++ b/admin/forms/component_custom_admin_views.xml
@@ -133,16 +133,25 @@
 			default=""
 			icon="list">
 			<form hidden="true" name="list_addcustom_admin_views_modal" repeat="true">
-				<!-- Customadminview Field. Type: Customadminviews. (custom) -->
+				<!-- Customadminview Field. Type: Modalselect. (custom) -->
 				<field
-					type="customadminviews"
+					type="ModalSelect"
 					name="customadminview"
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_LABEL"
-					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_DESCRIPTION"
-					layout="joomla.form.field.list-fancy-select"
-					multiple="false"
+					sql_title_table="#__componentbuilder_custom_admin_view"
+					sql_title_column="system_name"
+					sql_title_key="guid"
+					urlSelect="index.php?option=com_componentbuilder&amp;view=custom_admin_views&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+					titleSelect="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_TITLESELECT"
+					iconSelect="icon-screen"
+					select="true"
+					new="false"
+					edit="false"
+					clear="true"
 					required="true"
-					button="false"
+					class="input-large"
+					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_HINT"
 				/>
 				<!-- Icomoon Field. Type: List. (joomla) -->
 				<field
diff --git a/admin/forms/component_site_views.xml b/admin/forms/component_site_views.xml
index 69f419793..0eac4e967 100644
--- a/admin/forms/component_site_views.xml
+++ b/admin/forms/component_site_views.xml
@@ -134,16 +134,25 @@
 			default=""
 			icon="list">
 			<form hidden="true" name="list_addsite_views_modal" repeat="true">
-				<!-- Siteview Field. Type: Siteviews. (custom) -->
+				<!-- Siteview Field. Type: Modalselect. (custom) -->
 				<field
-					type="siteviews"
+					type="ModalSelect"
 					name="siteview"
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_LABEL"
-					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_DESCRIPTION"
-					layout="joomla.form.field.list-fancy-select"
-					multiple="false"
+					sql_title_table="#__componentbuilder_site_view"
+					sql_title_column="system_name"
+					sql_title_key="guid"
+					urlSelect="index.php?option=com_componentbuilder&amp;view=site_views&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+					titleSelect="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_TITLESELECT"
+					iconSelect="icon-palette"
+					select="true"
+					new="false"
+					edit="false"
+					clear="true"
 					required="true"
-					button="false"
+					class="input-large"
+					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_HINT"
 				/>
 				<!-- Menu Field. Type: Checkbox. (joomla) -->
 				<field
diff --git a/admin/forms/joomla_module.xml b/admin/forms/joomla_module.xml
index 191d44a12..202b44170 100644
--- a/admin/forms/joomla_module.xml
+++ b/admin/forms/joomla_module.xml
@@ -735,16 +735,25 @@
 					max="100"
 					nested_depth="1">
 					<form hidden="true" name="list_fields_modal" repeat="true">
-						<!-- Field Field. Type: Fields. (custom) -->
+						<!-- Field Field. Type: Modalselect. (custom) -->
 						<field
-							type="fields"
+							type="ModalSelect"
 							name="field"
 							label="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_LABEL"
-							description="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_DESCRIPTION"
-							layout="joomla.form.field.list-fancy-select"
-							multiple="false"
+							sql_title_table="#__componentbuilder_field"
+							sql_title_column="name"
+							sql_title_key="guid"
+							urlSelect="index.php?option=com_componentbuilder&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+							titleSelect="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_TITLESELECT"
+							iconSelect="icon-lamp"
+							select="true"
+							new="false"
+							edit="false"
+							clear="true"
 							required="true"
-							button="false"
+							class="input-large"
+							description="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_DESCRIPTION"
+							hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_HINT"
 						/>
 						<!-- Custom_value Field. Type: Textarea. (joomla) -->
 						<field
diff --git a/admin/forms/joomla_plugin.xml b/admin/forms/joomla_plugin.xml
index f47c7dc8f..6e192401a 100644
--- a/admin/forms/joomla_plugin.xml
+++ b/admin/forms/joomla_plugin.xml
@@ -610,16 +610,25 @@
 					max="100"
 					nested_depth="1">
 					<form hidden="true" name="list_fields_modal" repeat="true">
-						<!-- Field Field. Type: Fields. (custom) -->
+						<!-- Field Field. Type: Modalselect. (custom) -->
 						<field
-							type="fields"
+							type="ModalSelect"
 							name="field"
 							label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_LABEL"
-							description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_DESCRIPTION"
-							layout="joomla.form.field.list-fancy-select"
-							multiple="false"
+							sql_title_table="#__componentbuilder_field"
+							sql_title_column="name"
+							sql_title_key="guid"
+							urlSelect="index.php?option=com_componentbuilder&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+							titleSelect="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_TITLESELECT"
+							iconSelect="icon-lamp"
+							select="true"
+							new="false"
+							edit="false"
+							clear="true"
 							required="true"
-							button="false"
+							class="input-large"
+							description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_DESCRIPTION"
+							hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_HINT"
 						/>
 						<!-- Custom_value Field. Type: Textarea. (joomla) -->
 						<field
diff --git a/admin/forms/library_config.xml b/admin/forms/library_config.xml
index 4f32c5f22..4482f9d07 100644
--- a/admin/forms/library_config.xml
+++ b/admin/forms/library_config.xml
@@ -121,16 +121,25 @@
 			default=""
 			icon="list">
 			<form hidden="true" name="list_addconfig_modal" repeat="true">
-				<!-- Field Field. Type: Fields. (custom) -->
+				<!-- Field Field. Type: Modalselect. (custom) -->
 				<field
-					type="fields"
+					type="ModalSelect"
 					name="field"
 					label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_LABEL"
-					description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_DESCRIPTION"
-					layout="joomla.form.field.list-fancy-select"
-					multiple="false"
+					sql_title_table="#__componentbuilder_field"
+					sql_title_column="name"
+					sql_title_key="guid"
+					urlSelect="index.php?option=com_componentbuilder&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+					titleSelect="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_TITLESELECT"
+					iconSelect="icon-lamp"
+					select="true"
+					new="false"
+					edit="false"
+					clear="true"
 					required="true"
-					button="false"
+					class="input-large"
+					description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_HINT"
 				/>
 				<!-- Custom_value Field. Type: Textarea. (joomla) -->
 				<field
diff --git a/admin/forms/power.xml b/admin/forms/power.xml
index 58408da13..9b889e0d0 100644
--- a/admin/forms/power.xml
+++ b/admin/forms/power.xml
@@ -177,15 +177,25 @@
 			max="30"
 			min="0">
 			<form hidden="true" name="list_load_selection_modal" repeat="true">
-				<!-- Load Field. Type: Namespaces. (custom) -->
+				<!-- Load Field. Type: Modalselect. (custom) -->
 				<field
-					type="namespaces"
+					type="ModalSelect"
 					name="load"
 					label="COM_COMPONENTBUILDER_POWER_LOAD_LABEL"
-					layout="joomla.form.field.list-fancy-select"
-					multiple="false"
-					default="0"
-					button="false"
+					sql_title_table="#__componentbuilder_power"
+					sql_title_column="system_name"
+					sql_title_key="guid"
+					urlSelect="index.php?option=com_componentbuilder&amp;view=powers&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+					titleSelect="COM_COMPONENTBUILDER_POWER_LOAD_TITLESELECT"
+					iconSelect="icon-flash"
+					select="true"
+					new="false"
+					edit="false"
+					clear="true"
+					required="true"
+					class="input-large"
+					description="COM_COMPONENTBUILDER_POWER_LOAD_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_POWER_LOAD_HINT"
 				/>
 			</form>
 		</field>
@@ -491,16 +501,26 @@
 			max="100"
 			min="0">
 			<form hidden="true" name="list_use_selection_modal" repeat="true">
-				<!-- Use Field. Type: Namespaces. (custom) -->
+				<!-- Use Field. Type: Modalselect. (custom) -->
 				<field
-					type="namespaces"
+					type="ModalSelect"
 					name="use"
 					label="COM_COMPONENTBUILDER_POWER_USE_LABEL"
-					class="span12"
-					layout="joomla.form.field.list-fancy-select"
-					multiple="false"
-					default="0"
-					button="false"
+					sql_title_table="#__componentbuilder_power"
+					sql_title_column="system_name"
+					sql_title_key="guid"
+					urlSelect="index.php?option=com_componentbuilder&amp;view=powers&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
+					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="false"
+					edit="true"
+					clear="true"
+					required="true"
+					class="input-large"
+					description="COM_COMPONENTBUILDER_POWER_USE_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_POWER_USE_HINT"
 				/>
 				<!-- As Field. Type: Text. (joomla) -->
 				<field
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 5f0559a20..6a16af8c9 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -323,7 +323,9 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Admin Fi
 COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD="Field"
 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"
@@ -523,7 +525,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL="Add PHP (save Method - after
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL="Add MySQL - (Install)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW="Adminview"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION="Select an admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_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"
@@ -871,12 +875,12 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT="Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LABEL="Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_DESCRIPTION="The name of the list of records in this view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_HINT="List of Records Name Here"
-COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_LABEL="Name (list of records)<br /><small><a href='https://docs.joomla.org/J3.x:File_Structure_and_Naming_Conventions' target='_blank'>Naming Conventions</a></small>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_LABEL="Name (list of records)<br /><small><a href='https://git.vdm.dev/joomla/Component-Builder/wiki/Component-Structure-and-MVC-Implementation' target='_blank'>Naming Conventions</a></small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_MESSAGE="Error! Please add list of records name here."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_DESCRIPTION="Type null if single record view is not to be set"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_HINT="Single Record Name Here"
-COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL="Name (single record)<br /><small><a href='https://docs.joomla.org/J3.x:File_Structure_and_Naming_Conventions' target='_blank'>Naming Conventions</a></small>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL="Name (single record)<br /><small><a href='https://git.vdm.dev/joomla/Component-Builder/wiki/Component-Structure-and-MVC-Implementation' target='_blank'>Naming Conventions</a></small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_MESSAGE="Error! Please add single record name here."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NEW="A New Admin View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NEW_TAB="New Tab"
@@ -2246,7 +2250,9 @@ COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADD_API_DESCRIPTION="add API option t
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADD_API_LABEL="API"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW="Adminview"
 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"
@@ -2532,7 +2538,9 @@ COM_COMPONENTBUILDER_COMPONENT_CONFIG_ERROR_UNIQUE_ALIAS="Another Component Conf
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Component Config has the same alias ."
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD="Field"
 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"
@@ -2589,7 +2597,7 @@ COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MODIFIED_DATE_DESC="The date t
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_HINT="codename"
-COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_LABEL="Name in Code<br /><small><a href=&quot;https://docs.joomla.org/J3.x:File_Structure_and_Naming_Conventions&quot; target=&quot;_blank&quot;>Naming Conventions</a></small>"
+COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_LABEL="Name in Code<br /><small><a href='https://git.vdm.dev/joomla/Component-Builder/wiki/Component-Structure-and-MVC-Implementation' target='_blank'>Naming Conventions</a></small>"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_MESSAGE="Error! Please add name in code here."
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_HINT="Name Here"
@@ -2683,7 +2691,9 @@ 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="Customadminview"
 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)"
@@ -3236,7 +3246,9 @@ 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="Siteview"
 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"
@@ -3763,7 +3775,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CLOCK="Clock"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CMD="CMD"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_HINT="codename"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_LABEL="Name in Code<br /><small><a href=&quot;https://docs.joomla.org/J3.x:File_Structure_and_Naming_Conventions&quot; target=&quot;_blank&quot;>Naming Conventions</a></small>"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_LABEL="Name in Code<br /><small><a href='https://git.vdm.dev/joomla/Component-Builder/wiki/Component-Structure-and-MVC-Implementation' target='_blank'>Naming Conventions</a></small>"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_MESSAGE="Error! Please add name in code here."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COG="Cog"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COGS="Cogs"
@@ -4077,6 +4089,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_TIP="All changes will be applied to all
 COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_USE="Custom Codes Batch Use"
 COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_CODE="Code"
+COM_COMPONENTBUILDER_CUSTOM_CODES_COMMENT_TYPE="Comment Type"
 COM_COMPONENTBUILDER_CUSTOM_CODES_CREATE="Custom Codes Create"
 COM_COMPONENTBUILDER_CUSTOM_CODES_CREATE_DESC="Allows the users in this group to create create custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_DASHBOARD_LIST="Custom Codes Dashboard List"
@@ -5732,7 +5745,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAMESPACE_PREFIX_LABEL="Namespace Prefix"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAMESPACE_PREFIX_MESSAGE="Error! Please add namespace prefix here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_HINT="codename"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL="Name in Code<br /><small><a href=&quot;https://docs.joomla.org/J3.x:File_Structure_and_Naming_Conventions&quot; target=&quot;_blank&quot;>Naming Conventions</a></small>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL="Name in Code<br /><small><a href='https://git.vdm.dev/joomla/Component-Builder/wiki/Component-Structure-and-MVC-Implementation' target='_blank'>Naming Conventions</a></small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_MESSAGE="Error! Please add name in code here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Name Here"
@@ -6079,7 +6092,9 @@ 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_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)"
@@ -6486,7 +6501,9 @@ 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_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)"
@@ -7304,7 +7321,9 @@ COM_COMPONENTBUILDER_LIBRARY_CONFIG_ERROR_UNIQUE_ALIAS="Another Library Config h
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Library Config has the same alias ."
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD="Field"
 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"
@@ -7818,11 +7837,14 @@ 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="Load"
+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="Method"
@@ -7878,12 +7900,14 @@ 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="Use"
+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"
@@ -8353,7 +8377,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_CLOCK="Clock"
 COM_COMPONENTBUILDER_SITE_VIEW_CMD="CMD"
 COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_HINT="codename"
-COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_LABEL="Name in Code<br /><small><a href=&quot;https://docs.joomla.org/J3.x:File_Structure_and_Naming_Conventions&quot; target=&quot;_blank&quot;>Naming Conventions</a></small>"
+COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_LABEL="Name in Code<br /><small><a href='https://git.vdm.dev/joomla/Component-Builder/wiki/Component-Structure-and-MVC-Implementation' target='_blank'>Naming Conventions</a></small>"
 COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_MESSAGE="Error! Please add name in code here."
 COM_COMPONENTBUILDER_SITE_VIEW_COG="Cog"
 COM_COMPONENTBUILDER_SITE_VIEW_COGS="Cogs"
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index 765897a5b..9916fa211 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -103,13 +103,29 @@ $can = ComponentbuilderHelper::getActions('field');
 	?>
 	<tr>
 		<td>
-			<?php if ($canDo->get('field.edit')): ?>
+			<?php if (!$displayData->isModal && $canDo->get('field.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'fields.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $displayData->escape($item->name); ?>
+				<?php if (!$displayData->isModal): ?>
+					<?php echo $displayData->escape($item->name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$displayData->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $displayData->escape($link, false) . '">' . $displayData->escape($item->name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.field"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $displayData->escape($item->name, false) . '"'
+							. ' data-uri="' . $displayData->escape($link, false) . '"'
+							. ' data-html="' . $displayData->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $displayData->escape($item->name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?>
 		</td>
 		<td>
@@ -128,7 +144,7 @@ $can = ComponentbuilderHelper::getActions('field');
 			<?php echo Text::_($item->store); ?>
 		</td>
 		<td>
-			<?php if ($user->authorise('core.edit', 'com_componentbuilder.field.category.' . (int)$item->catid)): ?>
+			<?php if (!$displayData->isModal && $user->authorise('core.edit', 'com_componentbuilder.field.category.' . (int)$item->catid)): ?>
 				<a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_componentbuilder.field"><?php echo $displayData->escape($item->category_title); ?></a>
 			<?php else: ?>
 				<?php echo $displayData->escape($item->category_title); ?>
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 14565dd46..748ae594a 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -2097,7 +2097,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_files_folders_urls
 --
 
 INSERT INTO `#__componentbuilder_joomla_component` (`id`, `add_menu_prefix`, `add_namespace_prefix`, `menu_prefix`, `mvc_versiondate`, `add_css_admin`, `add_css_site`, `add_email_helper`, `add_git_folder_path`, `add_javascript`, `add_jcb_powers_path`, `add_php_helper_admin`, `add_php_helper_both`, `add_php_helper_site`, `add_php_method_install`, `add_php_postflight_install`, `add_php_method_uninstall`, `add_php_postflight_update`, `add_php_preflight_install`, `add_php_preflight_update`, `add_placeholders`, `add_powers`, `add_sql`, `add_sql_uninstall`, `addcontributors`, `addfootable`, `adduikit`, `assets_table_fix`, `add_admin_event`, `add_backup_folder_path`, `add_site_event`, `add_update_server`, `add_sales_server`, `sales_server`, `update_server`, `update_server_target`, `php_admin_event`, `php_site_event`, `preferred_joomla_version`, `addreadme`, `readme`, `remove_line_breaks`, `author`, `backup_folder_path`, `bom`, `buildcomp`, `buildcompsql`, `companyname`, `component_version`, `update_server_url`, `copyright`, `creatuserhelper`, `crowdin_account_api_key`, `crowdin_project_api_key`, `crowdin_project_identifier`, `crowdin_username`, `css_admin`, `css_site`, `dashboard`, `dashboard_type`, `debug_linenr`, `description`, `email`, `emptycontributors`, `export_buy_link`, `joomla_source_link`, `export_key`, `git_folder_path`, `guid`, `image`, `javascript`, `jcb_powers_path`, `license`, `name`, `system_name`, `toignore`, `translation_tool`, `name_code`, `namespace_prefix`, `number`, `php_helper_admin`, `php_helper_both`, `php_helper_site`, `php_method_install`, `php_postflight_install`, `php_method_uninstall`, `php_postflight_update`, `php_preflight_install`, `php_preflight_update`, `short_description`, `sql`, `sql_uninstall`, `website`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `metakey`, `metadesc`, `metadata`) VALUES
-(25, 1, 1, '»', '', '', '', '', '', '', 1, '', 1, '', '', 1, '', 1, 1, 1, '', 1, '', '', '{}', '', 3, 3, '', '', '', 1, '', '', '', 2, '', '', 5, 1, 'IyAjIyNDb21wb25lbnRfbmFtZSMjIyAoIyMjVkVSU0lPTiMjIykNCg0KIVsjIyNDb21wb25lbnRfbmFtZSMjIyBpbWFnZV0oaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL25hbWliaWEvZGVtby1qb29tbGEtMy1jb21wb25lbnQvbWFzdGVyL2FkbWluL2Fzc2V0cy9pbWFnZXMvdmRtLWNvbXBvbmVudC5qcGcgIlRoZSAjIyNDb21wb25lbnRfbmFtZSMjIyIpDQoNCiMjI0RFU0NSSVBUSU9OIyMjDQoNCiMgQnVpbGQgRGV0YWlscw0KDQorICpDb21wYW55KjogWyMjI0NPTVBBTllOQU1FIyMjXSgjIyNBVVRIT1JXRUJTSVRFIyMjKQ0KKyAqQXV0aG9yKjogWyMjI0FVVEhPUiMjI10obWFpbHRvOiMjI0FVVEhPUkVNQUlMIyMjKQ0KKyAqTmFtZSo6IFsjIyNDb21wb25lbnRfbmFtZSMjI10oIyMjQVVUSE9SV0VCU0lURSMjIykNCisgKkZpcnN0IEJ1aWxkKjogIyMjQ1JFQVRJT05EQVRFIyMjDQorICpMYXN0IEJ1aWxkKjogIyMjQlVJTEREQVRFIyMjDQorICpWZXJzaW9uKjogIyMjVkVSU0lPTiMjIw0KKyAqQ29weXJpZ2h0KjogIyMjQ09QWVJJR0hUIyMjDQorICpMaWNlbnNlKjogIyMjTElDRU5TRSMjIw0KDQojIyBCdWlsZCBUaW1lDQoNCioqIyMjdG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjdG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqIChhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNhdmVkIC0NCmR1ZSB0byBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwOi8vdmRtLmJ6L2NvbXBvbmVudC1idWlsZGVyKSkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gbmV2ZXIgbWFraW5nIG9uZSBtaXN0YWtlIG9yIHRha2luZyBhbnkgY29mZmVlIGJyZWFrLikNCg0KKyAqTGluZSBjb3VudCo6ICoqIyMjTElORV9DT1VOVCMjIyoqDQorICpGaWxlIGNvdW50KjogKiojIyNGSUxFX0NPVU5UIyMjKioNCisgKkZvbGRlciBjb3VudCo6ICoqIyMjRk9MREVSX0NPVU5UIyMjKioNCg0KKiojIyNhY3R1YWxIb3Vyc1NwZW50IyMjIEhvdXJzKiogb3IgKiojIyNhY3R1YWxEYXlzU3BlbnQjIyMgRWlnaHQgSG91ciBEYXlzKiogKHRoZSBhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNwZW50KQ0KDQo+ICh3aXRoIHRoZSBmb2xsb3dpbmcgYnJlYWsgZG93bjoNCj4gKipkZWJ1Z2dpbmcgQCMjI2RlYnVnZ2luZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA0Ow0KPiAqKnBsYW5uaW5nIEAjIyNwbGFubmluZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA3Ow0KPiAqKm1hcHBpbmcgQCMjI21hcHBpbmdIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gMTA7DQo+ICoqb2ZmaWNlIEAjIyNvZmZpY2VIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gNjspDQoNCioqIyMjYWN0dWFsVG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjYWN0dWFsVG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqDQooYSB0b3RhbCBvZiB0aGUgcmVhbGlzdGljIHRpbWUgZnJhbWUgZm9yIHRoaXMgcHJvamVjdCkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gd2l0aCB0aGUgbm9ybWFsIGV2ZXJ5ZGF5IHJlYWxpdGllcyBhdCB0aGUgb2ZmaWNlLCB0aGF0IGluY2x1ZGVzIHRoZSBjb21wb25lbnQgcGxhbm5pbmcsIG1hcHBpbmcgJiBkZWJ1Z2dpbmcuKQ0KDQpQcm9qZWN0IGR1cmF0aW9uOiAqKiMjI3Byb2plY3RXZWVrVGltZSMjIyB3ZWVrcyoqIG9yICoqIyMjcHJvamVjdE1vbnRoVGltZSMjIyBtb250aHMqKg0KDQo+IFRoaXMgKipjb21wb25lbnQqKiB3YXMgYnVpbGQgd2l0aCBhIEpvb21sYSBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwOi8vdmRtLmJ6L2NvbXBvbmVudC1idWlsZGVyKS4NCj4gRGV2ZWxvcGVkIGJ5IFtMbGV3ZWxseW4gdmFuIGRlciBNZXJ3ZV0obWFpbHRvOmpvb21sYUB2ZG0uaW8pDQoNCltDVVNUT01DT0RFPXJlYWRNRWNvbnRyaWJ1dG9yc10=', 1, 'Llewellyn van der Merwe', '', 'default.txt', '', '', 'Vast Development Method', '5.0.1', 'https://raw.githubusercontent.com/Llewellynvdm/Joomla-Demo-Component/master/demo_updateserver.xml', 'Copyright (C) 2015. All Rights Reserved', '', 'JILgVnNbSgHgf9RPxlh7otasmCGPimV8QP42x0kSWeA=', 'aXKb9zCIDNGHmdSNpdo7Mr75Xuv+SOQC8pETHg8lLBI=', '', 'cnqCiitw+U9zsOHvOHFlLdzzeTR9ouOmBf/E0lXwB5A=', '', '', '', 1, '', 'This is just a simple demonstration showcasing the most basic functionality of the [Joomla!](http://www.joomla.org) Component Builder (JCB). While this example covers the fundamentals, JCB offers a wide range of powerful features and customization options for building advanced Joomla! extensions with ease.', 'joomla@vdm.io', '', '', 'https://github.com/Llewellynvdm/Joomla-Demo-Component', 'NCteC3cHmStryBixCsmGD+s7g0i7WPWj4DsRvNS5kgQ=', '', 'efde995e-60aa-4b39-b644-44349dfb660d', 'images/vdm/demo500.jpg', '', 'libraries/jcb_demo', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html', 'Demo', 'Demo (public)', '.git', '', 'Demo', 'Demo', 4, '', 'W0NVU1RPTUNPREU9Z2V0SXRlbUltcG9ydEZpZWxkcysNCgkJLy8gSEVSRSBXRSBTRUxFQ1QgVEhFIFRBUkdFVCBUQUJMRVMgRk9SIE9VUiBJVEVNIElNUE9SVA0KCQkkcGFyZW50ICYjNjE7ICdsb29rJzsNCgkJJHRhYmxlcyAmIzYxOyAmIzkxOw0KCQkJJ2xvb2snICYjNjE7PiB0cnVlJiM0NDsNCgkJCSdkZXRhaWwnICYjNjE7PiBmYWxzZQ0KCQkmIzkzOzsNCiwkZmllbGRfbmFtZSAmIzYxOyYjNjE7JiM2MTsgJ2VudGl0eV90eXBlJyB8fCAkZmllbGRfbmFtZSAmIzYxOyYjNjE7JiM2MTsgJ2VudGl0eScgfHwNCgkJCQkJXQ0KW0NVU1RPTUNPREU9bmljZUZhbmN5RGF0ZV0=', '', '', 'W0NVU1RPTUNPREU9ZGF0YWJhc2VTY2hlbWFDaGVja0NhbGxdDQpbQ1VTVE9NQ09ERT11bmxvY2tUaGVQb3dlck9mSm9vbWxhRGV2ZWxvcG1lbnQrRGVtb10=', '', 'W0NVU1RPTUNPREU9ZGF0YWJhc2VTY2hlbWFDaGVja0NhbGxd', 'W0NVU1RPTUNPREU9cGhwQ29uZmlndXJhdGlvbkNoZWNrQ2FsbF0=', 'W0NVU1RPTUNPREU9cGhwQ29uZmlndXJhdGlvbkNoZWNrQ2FsbF0=', 'Demo Component', '', '', 'https://www.vdm.io/', '{\"language_options\":{\"activate\":\"0\",\"use_percentagelanguageadd\":\"1\",\"percentagelanguageadd\":\"50\"},\"joomla_component_headers\":{\"add_admin_component\":\"0\",\"admin_component\":\"\",\"power_admin_component\":[],\"add_site_component\":\"0\",\"site_component\":\"\",\"power_site_component\":[],\"add_admin_helper\":\"0\",\"admin_helper\":\"\",\"power_admin_helper\":[],\"add_site_helper\":\"0\",\"site_helper\":\"\",\"power_site_helper\":[]}}', 1, '2016-10-18 11:44:09', '2025-02-21 14:30:43', 85, '', 10, '', '', '{\"robots\":\"\",\"rights\":\"\"}');
+(25, 1, 1, '»', '', '', '', '', '', '', 1, '', 1, '', '', 1, '', 1, 1, 1, '', 1, '', '', '{}', '', 3, 3, '', '', '', 1, '', '', '', 2, '', '', 5, 1, 'IyAjIyNDb21wb25lbnRfbmFtZSMjIyAoIyMjVkVSU0lPTiMjIykNCg0KIVsjIyNDb21wb25lbnRfbmFtZSMjIyBpbWFnZV0oaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL25hbWliaWEvZGVtby1qb29tbGEtMy1jb21wb25lbnQvbWFzdGVyL2FkbWluL2Fzc2V0cy9pbWFnZXMvdmRtLWNvbXBvbmVudC5qcGcgIlRoZSAjIyNDb21wb25lbnRfbmFtZSMjIyIpDQoNCiMjI0RFU0NSSVBUSU9OIyMjDQoNCiMgQnVpbGQgRGV0YWlscw0KDQorICpDb21wYW55KjogWyMjI0NPTVBBTllOQU1FIyMjXSgjIyNBVVRIT1JXRUJTSVRFIyMjKQ0KKyAqQXV0aG9yKjogWyMjI0FVVEhPUiMjI10obWFpbHRvOiMjI0FVVEhPUkVNQUlMIyMjKQ0KKyAqTmFtZSo6IFsjIyNDb21wb25lbnRfbmFtZSMjI10oIyMjQVVUSE9SV0VCU0lURSMjIykNCisgKkZpcnN0IEJ1aWxkKjogIyMjQ1JFQVRJT05EQVRFIyMjDQorICpMYXN0IEJ1aWxkKjogIyMjQlVJTEREQVRFIyMjDQorICpWZXJzaW9uKjogIyMjVkVSU0lPTiMjIw0KKyAqQ29weXJpZ2h0KjogIyMjQ09QWVJJR0hUIyMjDQorICpMaWNlbnNlKjogIyMjTElDRU5TRSMjIw0KDQojIyBCdWlsZCBUaW1lDQoNCioqIyMjdG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjdG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqIChhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNhdmVkIC0NCmR1ZSB0byBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwOi8vdmRtLmJ6L2NvbXBvbmVudC1idWlsZGVyKSkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gbmV2ZXIgbWFraW5nIG9uZSBtaXN0YWtlIG9yIHRha2luZyBhbnkgY29mZmVlIGJyZWFrLikNCg0KKyAqTGluZSBjb3VudCo6ICoqIyMjTElORV9DT1VOVCMjIyoqDQorICpGaWxlIGNvdW50KjogKiojIyNGSUxFX0NPVU5UIyMjKioNCisgKkZvbGRlciBjb3VudCo6ICoqIyMjRk9MREVSX0NPVU5UIyMjKioNCg0KKiojIyNhY3R1YWxIb3Vyc1NwZW50IyMjIEhvdXJzKiogb3IgKiojIyNhY3R1YWxEYXlzU3BlbnQjIyMgRWlnaHQgSG91ciBEYXlzKiogKHRoZSBhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNwZW50KQ0KDQo+ICh3aXRoIHRoZSBmb2xsb3dpbmcgYnJlYWsgZG93bjoNCj4gKipkZWJ1Z2dpbmcgQCMjI2RlYnVnZ2luZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA0Ow0KPiAqKnBsYW5uaW5nIEAjIyNwbGFubmluZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA3Ow0KPiAqKm1hcHBpbmcgQCMjI21hcHBpbmdIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gMTA7DQo+ICoqb2ZmaWNlIEAjIyNvZmZpY2VIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gNjspDQoNCioqIyMjYWN0dWFsVG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjYWN0dWFsVG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqDQooYSB0b3RhbCBvZiB0aGUgcmVhbGlzdGljIHRpbWUgZnJhbWUgZm9yIHRoaXMgcHJvamVjdCkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gd2l0aCB0aGUgbm9ybWFsIGV2ZXJ5ZGF5IHJlYWxpdGllcyBhdCB0aGUgb2ZmaWNlLCB0aGF0IGluY2x1ZGVzIHRoZSBjb21wb25lbnQgcGxhbm5pbmcsIG1hcHBpbmcgJiBkZWJ1Z2dpbmcuKQ0KDQpQcm9qZWN0IGR1cmF0aW9uOiAqKiMjI3Byb2plY3RXZWVrVGltZSMjIyB3ZWVrcyoqIG9yICoqIyMjcHJvamVjdE1vbnRoVGltZSMjIyBtb250aHMqKg0KDQo+IFRoaXMgKipjb21wb25lbnQqKiB3YXMgYnVpbGQgd2l0aCBhIEpvb21sYSBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwOi8vdmRtLmJ6L2NvbXBvbmVudC1idWlsZGVyKS4NCj4gRGV2ZWxvcGVkIGJ5IFtMbGV3ZWxseW4gdmFuIGRlciBNZXJ3ZV0obWFpbHRvOmpvb21sYUB2ZG0uaW8pDQoNCltDVVNUT01DT0RFPXJlYWRNRWNvbnRyaWJ1dG9yc10=', 1, 'Llewellyn van der Merwe', '', 'default.txt', '', '', 'Vast Development Method', '5.0.1', 'https://raw.githubusercontent.com/Llewellynvdm/Joomla-Demo-Component/master/demo_updateserver.xml', 'Copyright (C) 2015. All Rights Reserved', '', '+CEfhGv7BCpJgqulP6WIdk1BO2IcIaYJSzEgEXyF2hE=', 'aXKb9zCIDNGHmdSNpdo7Mr75Xuv+SOQC8pETHg8lLBI=', '', 'cnqCiitw+U9zsOHvOHFlLdzzeTR9ouOmBf/E0lXwB5A=', '', '', '', 1, '', 'This is just a simple demonstration showcasing the most basic functionality of the [Joomla!](http://www.joomla.org) Component Builder (JCB). While this example covers the fundamentals, JCB offers a wide range of powerful features and customization options for building advanced Joomla! extensions with ease.', 'joomla@vdm.io', '', '', 'https://github.com/Llewellynvdm/Joomla-Demo-Component', '8zJ7SbinDc2vYboxjMoqsYPrGxAoby1yLWaG9pI9X30=', '', 'efde995e-60aa-4b39-b644-44349dfb660d', 'images/vdm/demo500.jpg', '', 'libraries/jcb_demo', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html', 'Demo', 'Demo J5', '.git', '', 'Demo', 'Demo', 4, '', 'W0NVU1RPTUNPREU9Z2V0SXRlbUltcG9ydEZpZWxkcysNCgkJLy8gSEVSRSBXRSBTRUxFQ1QgVEhFIFRBUkdFVCBUQUJMRVMgRk9SIE9VUiBJVEVNIElNUE9SVA0KCQkkcGFyZW50ICYjNjE7ICdsb29rJzsNCgkJJHRhYmxlcyAmIzYxOyAmIzkxOw0KCQkJJ2xvb2snICYjNjE7PiB0cnVlJiM0NDsNCgkJCSdkZXRhaWwnICYjNjE7PiBmYWxzZQ0KCQkmIzkzOzsNCiwkZmllbGRfbmFtZSAmIzYxOyYjNjE7JiM2MTsgJ2VudGl0eV90eXBlJyB8fCAkZmllbGRfbmFtZSAmIzYxOyYjNjE7JiM2MTsgJ2VudGl0eScgfHwNCgkJCQkJXQ0KW0NVU1RPTUNPREU9bmljZUZhbmN5RGF0ZV0=', '', '', 'W0NVU1RPTUNPREU9ZGF0YWJhc2VTY2hlbWFDaGVja0NhbGxdDQpbQ1VTVE9NQ09ERT11bmxvY2tUaGVQb3dlck9mSm9vbWxhRGV2ZWxvcG1lbnQrRGVtb10=', '', 'W0NVU1RPTUNPREU9ZGF0YWJhc2VTY2hlbWFDaGVja0NhbGxd', 'W0NVU1RPTUNPREU9cGhwQ29uZmlndXJhdGlvbkNoZWNrQ2FsbF0=', 'W0NVU1RPTUNPREU9cGhwQ29uZmlndXJhdGlvbkNoZWNrQ2FsbF0=', 'Demo Component', '', '', 'https://www.vdm.io/', '{\"language_options\":{\"activate\":\"0\",\"use_percentagelanguageadd\":\"1\",\"percentagelanguageadd\":\"50\"},\"joomla_component_headers\":{\"add_admin_component\":\"0\",\"admin_component\":\"\",\"power_admin_component\":[],\"add_site_component\":\"0\",\"site_component\":\"\",\"power_site_component\":[],\"add_admin_helper\":\"0\",\"admin_helper\":\"\",\"power_admin_helper\":[],\"add_site_helper\":\"0\",\"site_helper\":\"\",\"power_site_helper\":[]}}', 1, '2016-10-18 11:44:09', '2025-03-27 19:30:15', 91, '', 10, '', '', '{\"robots\":\"\",\"rights\":\"\"}');
 
 --
 -- Dumping data for table `#__componentbuilder_joomla_module`
@@ -2128,10 +2128,16 @@ INSERT INTO `#__componentbuilder_admin_view` (`id`, `add_category_submenu`, `add
 (109, 1, 1, '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 1, 1, 1, '', '', '', '', '', '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{\"addtabs0\":{\"name\":\"Details\"},\"addtabs1\":{\"name\":\"Media\"},\"addtabs2\":{\"name\":\"Participants\"},\"addtabs3\":{\"name\":\"More\"}}', '{}', '', 1, 'LmNvbnRyb2wtd3JhcHBlci1tb3JlIC5jb250cm9sLWxhYmVsIHsNCiAgICBkaXNwbGF5OiBub25lOyAvLyBqdXN0IGZvciBmdW4gOikNCn0=', '', '{}', '', 'c1053952-8a84-4398-aef1-41726f7c0043', 'images/vdm/icon/look.png', 'images/vdm/icon/look_add.png', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Looks', 'Look', '', '', '', '', '', '', '', '', '', '', '', 'IFtDVVNUT01DT0RFPXNhdmVHVUlEUG93ZXJd', '', '', 'W0NVU1RPTUNPREU9dmRtVXBsb2FkZXJDb25maWcrdmRtLXVpa2l0LXVwbG9hZGVyLGZpbGVfdmRtX3VwbG9hZGVyLGdldEZpbGVUeXBlRGV0YWlscyx1cGxvYWRGaWxlLGRpc3BsYXlGaWxlcyxkZWxldGVGaWxlXQ0KW0NVU1RPTUNPREU9YWRkVWlraXRUaHJlZVRvQWRtaW5WaWV3c10=', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', '', '', 'The demo view', '', '', 'Look', 1, '{\"privacy\":{\"activate\":\"1\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"23\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2016-10-18 11:44:46', '2024-09-19 22:30:12', 42, '', 1, 110),
 (283, 1, '', '', '', 1, '', '', '', '', '', '', '', 1, '', '', '', '', '', '', '', 1, 1, 1, '', '', '', '', '', '', 1, '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{\"ajax_input0\":{\"value_name\":\"guid\",\"task_name\":\"getFileTypeDetails\",\"input_default\":\"NULL\",\"input_filter\":\"STRING\",\"method_name\":\"getFileTypeDetails\",\"user_check\":\"1\"},\"ajax_input1\":{\"value_name\":\"target\",\"task_name\":\"getFileTypeDetails\",\"input_default\":\"NULL\",\"input_filter\":\"BASE64\",\"method_name\":\"getFileTypeDetails\",\"user_check\":\"1\"},\"ajax_input2\":{\"value_name\":\"guid\",\"task_name\":\"uploadFile\",\"input_default\":\"NULL\",\"input_filter\":\"STRING\",\"method_name\":\"uploadFile\",\"user_check\":\"1\"},\"ajax_input3\":{\"value_name\":\"entity\",\"task_name\":\"uploadFile\",\"input_default\":\"NULL\",\"input_filter\":\"STRING\",\"method_name\":\"uploadFile\",\"user_check\":\"1\"},\"ajax_input4\":{\"value_name\":\"target\",\"task_name\":\"uploadFile\",\"input_default\":\"NULL\",\"input_filter\":\"BASE64\",\"method_name\":\"uploadFile\",\"user_check\":\"1\"},\"ajax_input5\":{\"value_name\":\"guid\",\"task_name\":\"deleteFile\",\"input_default\":\"NULL\",\"input_filter\":\"STRING\",\"method_name\":\"deleteFile\",\"user_check\":\"1\"},\"ajax_input6\":{\"value_name\":\"entity\",\"task_name\":\"displayFiles\",\"input_default\":\"NULL\",\"input_filter\":\"STRING\",\"method_name\":\"displayFiles\",\"user_check\":\"1\"},\"ajax_input7\":{\"value_name\":\"target\",\"task_name\":\"displayFiles\",\"input_default\":\"NULL\",\"input_filter\":\"BASE64\",\"method_name\":\"displayFiles\",\"user_check\":\"1\"}}', '', '', '', '', '{}', '', '19a973ea-cdfa-4c79-bbbd-1b8a37286b27', '', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'File Types', 'File Type', '', '', '', 'CS8qKg0KCSAqIEdldCB0aGUgZmlsZSB0eXBlIGRldGFpbHMsIGlmIGl0IGV4aXN0cy4NCgkgKg0KCSAqIEBwYXJhbSBzdHJpbmcgJGd1aWQgICAgVGhlIGZpbGUgdHlwZSBndWlkDQoJICogQHBhcmFtIHN0cmluZyAkdGFyZ2V0ICBUaGUgdGFyZ2V0IGVudGl0eSBuYW1lDQoJICoNCgkgKiBAcmV0dXJuIGFycmF5DQoJICogQHNpbmNlIDUuMC4yDQoJICovDQoJcHVibGljIGZ1bmN0aW9uIGdldEZpbGVUeXBlRGV0YWlscyhzdHJpbmcgJGd1aWQsIHN0cmluZyAkdGFyZ2V0KTogYXJyYXkNCgl7DQoJCWlmIChTdXBlcl9fXzljNTEzYmFmX2IyNzlfNDNmZF9hZTI5X2E1ODVjOGNiYzRmMF9fX1Bvd2VyOjp2YWxpZCgkZ3VpZCkpDQoJCXsNCgkJCXRyeQ0KCQkJew0KCQkJCSR0YXJnZXQgPSBiYXNlNjRfZGVjb2RlKCR0YXJnZXQpOw0KCQkJCSR0eXBlID0gU3VwZXJfX184ODRlY2E3OF8yODFmXzRlYWJfYjk2Ml9kOTdlMzU1YWYxNmRfX19Qb3dlcjo6XygnRmlsZS5UeXBlJyktPmdldCgkZ3VpZCwgJHRhcmdldCk7DQoJCQl9DQoJCQljYXRjaCAoXEV4Y2VwdGlvbiAkZXJyb3IpDQoJCQl7DQoJCQkJcmV0dXJuIFsnZXJyb3InID0+ICRlcnJvci0+Z2V0TWVzc2FnZSgpXTsNCgkJCX0NCg0KCQkJaWYgKCR0eXBlICE9PSBudWxsKQ0KCQkJew0KCQkJCXJldHVybiBbJ2RhdGEnID0+ICR0eXBlXTsNCgkJCX0NCgkJfQ0KDQoJCXJldHVybiBbJ2Vycm9yJyA9PiBUZXh0OjpfKCdGaWxlIHR5cGUgZGV0YWlscyBjb3VsZCBub3QgYmUgZm91bmQnKV07DQoJfQ0KDQoJLyoqDQoJICogVXBsb2FkIGEgZmlsZSwgb2YgYSBnaXZlbiBmaWxlIHR5cGUgYW5kIGxpbmsgaXQgdG8gYW4gZW50aXR5Lg0KCSAqDQoJICogQHBhcmFtIHN0cmluZyAkZ3VpZCAgICBUaGUgZmlsZSB0eXBlIGd1aWQNCgkgKiBAcGFyYW0gc3RyaW5nICRlbnRpdHkgIFRoZSBlbnRpdHkgZ3VpZA0KCSAqIEBwYXJhbSBzdHJpbmcgJHRhcmdldCAgVGhlIHRhcmdldCBlbnRpdHkgbmFtZQ0KCSAqDQoJICogQHJldHVybiBhcnJheQ0KCSAqIEBzaW5jZSA1LjAuMg0KCSAqLw0KCXB1YmxpYyBmdW5jdGlvbiB1cGxvYWRGaWxlKHN0cmluZyAkZ3VpZCwgc3RyaW5nICRlbnRpdHksIHN0cmluZyAkdGFyZ2V0KTogYXJyYXkNCgl7DQoJCWlmIChTdXBlcl9fXzljNTEzYmFmX2IyNzlfNDNmZF9hZTI5X2E1ODVjOGNiYzRmMF9fX1Bvd2VyOjp2YWxpZCgkZ3VpZCkNCgkJCSYmIFN1cGVyX19fOWM1MTNiYWZfYjI3OV80M2ZkX2FlMjlfYTU4NWM4Y2JjNGYwX19fUG93ZXI6OnZhbGlkKCRlbnRpdHkpKQ0KCQl7DQoJCQl0cnkNCgkJCXsNCgkJCQkkdGFyZ2V0ID0gYmFzZTY0X2RlY29kZSgkdGFyZ2V0KTsNCgkJCQlTdXBlcl9fXzg4NGVjYTc4XzI4MWZfNGVhYl9iOTYyX2Q5N2UzNTVhZjE2ZF9fX1Bvd2VyOjpfKCdGaWxlLk1hbmFnZXInKS0+dXBsb2FkKCRndWlkLCAkZW50aXR5LCAkdGFyZ2V0KTsNCgkJCX0NCgkJCWNhdGNoIChcRXhjZXB0aW9uICRlcnJvcikNCgkJCXsNCgkJCQlyZXR1cm4gWydlcnJvcicgPT4gJGVycm9yLT5nZXRNZXNzYWdlKCldOw0KCQkJfQ0KDQoJCQlyZXR1cm4gWydzdWNjZXNzJyA9PiBUZXh0OjpfKCdUaGUgZmlsZSB3YXMgc3VjY2Vzc2Z1bGx5IHVwbG9hZGVkJyldOw0KCQl9DQoNCgkJcmV0dXJuIFsnZXJyb3InID0+IFRleHQ6Ol8oJ1RoZSBmaWxlIGZhaWxlZCB0byB1cGxvYWQnKV07DQoJfQ0KDQoJLyoqDQoJICogRGVsZXRlIGEgZmlsZSBvZiBhIGdpdmVuIGVudGl0eS4NCgkgKg0KCSAqIEBwYXJhbSBzdHJpbmcgJGd1aWQgICAgVGhlIGZpbGUgZ3VpZA0KCSAqDQoJICogQHJldHVybiBhcnJheQ0KCSAqIEBzaW5jZSA1LjAuMg0KCSAqLw0KCXB1YmxpYyBmdW5jdGlvbiBkZWxldGVGaWxlKHN0cmluZyAkZ3VpZCk6IGFycmF5DQoJew0KCQlpZiAoU3VwZXJfX185YzUxM2JhZl9iMjc5XzQzZmRfYWUyOV9hNTg1YzhjYmM0ZjBfX19Qb3dlcjo6dmFsaWQoJGd1aWQpKQ0KCQl7DQoJCQl0cnkNCgkJCXsNCgkJCQlTdXBlcl9fXzg4NGVjYTc4XzI4MWZfNGVhYl9iOTYyX2Q5N2UzNTVhZjE2ZF9fX1Bvd2VyOjpfKCdGaWxlLk1hbmFnZXInKS0+ZGVsZXRlKCRndWlkKTsNCgkJCX0NCgkJCWNhdGNoIChcRXhjZXB0aW9uICRlcnJvcikNCgkJCXsNCgkJCQlyZXR1cm4gWydlcnJvcicgPT4gJGVycm9yLT5nZXRNZXNzYWdlKCldOw0KCQkJfQ0KDQoJCQlyZXR1cm4gWydzdWNjZXNzJyA9PiBUZXh0OjpfKCdUaGUgZmlsZSB3YXMgc3VjY2Vzc2Z1bGx5IGRlbGV0ZWQnKV07DQoJCX0NCg0KCQlyZXR1cm4gWydlcnJvcicgPT4gVGV4dDo6XygnVGhlIGZpbGUgY291bGQgbm90IGJlIGRlbGV0ZWQnKV07DQoJfQ0KDQoJLyoqDQoJICogTG9hZCB0aGUgZGlzcGxheSBvZiB0aGUgZmlsZXMgbGlua2VkIHRoaXMgZW50aXR5Lg0KCSAqDQoJICogQHBhcmFtIHN0cmluZyAkZW50aXR5ICBUaGUgZW50aXR5IGd1aWQNCgkgKiBAcGFyYW0gc3RyaW5nICR0YXJnZXQgIFRoZSB0YXJnZXQgZW50aXR5IG5hbWUNCgkgKg0KCSAqIEByZXR1cm4gYXJyYXkNCgkgKiBAc2luY2UgNS4wLjINCgkgKi8NCglwdWJsaWMgZnVuY3Rpb24gZGlzcGxheUZpbGVzKHN0cmluZyAkZW50aXR5LCBzdHJpbmcgJHRhcmdldCk6IGFycmF5DQoJew0KCQlpZiAoU3VwZXJfX185YzUxM2JhZl9iMjc5XzQzZmRfYWUyOV9hNTg1YzhjYmM0ZjBfX19Qb3dlcjo6dmFsaWQoJGVudGl0eSkpDQoJCXsNCgkJCSRkaXNwbGF5ID0gbnVsbDsNCg0KCQkJdHJ5DQoJCQl7DQoJCQkJJHRhcmdldCA9IGJhc2U2NF9kZWNvZGUoJHRhcmdldCk7DQoJCQkJJGRhdGEgPSBTdXBlcl9fXzg4NGVjYTc4XzI4MWZfNGVhYl9iOTYyX2Q5N2UzNTVhZjE2ZF9fX1Bvd2VyOjpfKCdGaWxlLkRpc3BsYXknKS0+Z2V0KCRlbnRpdHksICR0YXJnZXQpOw0KDQoJCQkJaWYgKCRkYXRhICE9PSBudWxsKQ0KCQkJCXsNCgkJCQkJJGRpc3BsYXlEYXRhID0gIFsnZGF0YScgPT4gJGRhdGEsICdlbnRpdHknID0+ICRlbnRpdHksICd0YXJnZXQnID0+ICR0YXJnZXRdOw0KCQkJCQkkZGlzcGxheSA9IEpvb21sYV9fXzdhYjgyMjcyXzBiM2RfNGJiMV9hZjM1X2U2M2EwOTZjZmUwYl9fX1Bvd2VyOjpyZW5kZXIoJ2RlbW9sb29rZmlsZWRpc3BsYXknLCAkZGlzcGxheURhdGEpOw0KCQkJCX0NCgkJCQllbHNlDQoJCQkJew0KCQkJCQlyZXR1cm4gWydkYXRhJyA9PiAnPGI+JyAuIFRleHQ6OnNwcmludGYoJ05vIGZpbGVzIGxpbmtlZCB0byAlcy4nLCAkdGFyZ2V0KSAuICc8L2I+J107DQoJCQkJfQ0KCQkJfQ0KCQkJY2F0Y2ggKFxFeGNlcHRpb24gJGVycm9yKQ0KCQkJew0KCQkJCXJldHVybiBbJ2Vycm9yJyA9PiAkZXJyb3ItPmdldE1lc3NhZ2UoKV07DQoJCQl9DQoNCgkJCWlmICghZW1wdHkoJGRpc3BsYXkpKQ0KCQkJew0KCQkJCXJldHVybiBbJ2RhdGEnID0+ICRkaXNwbGF5XTsNCgkJCX0NCgkJfQ0KDQoJCXJldHVybiBbJ2Vycm9yJyA9PiBUZXh0OjpfKCdUaGUgZmlsZSBkaXNwbGF5IGNvdWxkIG5vdCBiZSBsb2FkZWQnKV07DQoJfQ==', '', '', '', '', '', '', '', 'W0NVU1RPTUNPREU9c2F2ZUdVSURQb3dlcl0=', '', '', 'Ly8gSm9vbWxhX19fN2FiODIyNzJfMGIzZF80YmIxX2FmMzVfZTYzYTA5NmNmZTBiX19fUG93ZXI6OnJlbmRlcignZGVtb2xvb2tmaWxlZGlzcGxheScsICRkaXNwbGF5RGF0YSk7', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', '', '', 'File Type', 2, 'LS0NCi0tIER1bXBpbmcgZGF0YSBmb3IgdGFibGUgYCNfX2RlbW9fZmlsZV90eXBlYA0KLS0NCg0KSU5TRVJUIElOVE8gYCNfX2RlbW9fZmlsZV90eXBlYCAoYGlkYCwgYGNyb3BgLCBgZG9jdW1lbnRfZm9ybWF0c2AsIGBkb3dubG9hZF9hY2Nlc3NgLCBgZmlsZV9mb3JtYXRzYCwgYGd1aWRgLCBgaW1hZ2VfZm9ybWF0c2AsIGBtZWRpYV9mb3JtYXRzYCwgYG5hbWVgLCBgcGF0aGAsIGB0YXJnZXRgLCBgdHlwZWAsIGBwYXJhbXNgLCBgcHVibGlzaGVkYCwgYGNyZWF0ZWRgLCBgbW9kaWZpZWRgLCBgdmVyc2lvbmAsIGBoaXRzYCwgYGFjY2Vzc2AsIGBvcmRlcmluZ2AsIGBtZXRha2V5YCwgYG1ldGFkZXNjYCwgYG1ldGFkYXRhYCkgVkFMVUVTDQooMSwgJycsICd7XCIwXCI6XCJwZGZcIn0nLCAxLCAnJywgJzYwODM0ZTAyLWJkMGItNDBhYS1iMGZlLWE0MGJiYTIyNTU2OCcsICcnLCAnJywgJ0RvY3VtZW50JywgJy9kb2N1bWVudHMnLCAne1wiMFwiOlwibG9va1wifScsIDIsICcnLCAxLCAnMjAxOS0wOS0wMyAyMjozOToyMScsICcyMDE5LTA5LTAzIDIyOjQ0OjIzJywgMSwgJycsIDEsIDEsICcnLCAnJywgJ3tcInJvYm90c1wiOlwiXCIsXCJhdXRob3JcIjpcIlwiLFwicmlnaHRzXCI6XCJcIn0nKSwNCigyLCAnJywgJ3tcIjBcIjpcIm9kc1wiLFwiMVwiOlwieGxzXCIsXCIyXCI6XCJ4bHN4XCIsXCIzXCI6XCJjc3ZcIixcIjRcIjpcInRzdlwifScsIDEsICcnLCAnY2RiMTk3YjctZjQ3Yy00NTc3LThhOTQtMDMwMGY1NTk5MzZiJywgJycsICcnLCAnSW1wb3J0JywgJy9pbXBvcnRzJywgJ3tcIjBcIjpcImltcG9ydGVyXCJ9JywgMiwgJycsIDEsICcyMDE5LTA5LTAzIDIyOjM5OjIxJywgJzIwMTktMDktMDMgMjI6NDQ6MjMnLCAxLCAnJywgMSwgMSwgJycsICcnLCAne1wicm9ib3RzXCI6XCJcIixcImF1dGhvclwiOlwiXCIsXCJyaWdodHNcIjpcIlwifScpOw==', 'File Types (demo-look)', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"2c74c3f5-2bfc-4916-b105-4f5d5e2bea25\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2020-09-08 21:58:20', '2025-03-04 21:02:45', 36, '', 1, 245),
 (284, 1, '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{}', '', '', '', '', '{}', '', '595ba2c9-21fa-43a4-9af7-93c9cfb21b82', 'images/vdm/icon/detail.png', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Details', 'Detail', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'Add More Details', '', '', 'Details (look)', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"3429\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2020-09-07 22:09:41', '2024-09-19 22:29:45', 7, '', 1, 246),
-(285, 1, '', '', '', 1, '', '', '', '', '', 1, '', '', '', '', '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{}', '', '', '', '', '{}', 'Files', '224eb9c7-8b40-48cf-bf77-2afa291fd54a', 'images/vdm/icon/file.png', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Files', 'File', '', 'CQlmb3JlYWNoICgkZmlsZVBhdGhzIGFzICRmaWxlUGF0aCkNCgkJew0KCQkJaWYgKGlzX2ZpbGUoJGZpbGVQYXRoKSAmJiBpc193cml0YWJsZSgkZmlsZVBhdGgpKQ0KCQkJew0KCQkJCUpvb21sYV9fXzU1ZTllOGYwXzNjNWVfNDgzYV9hMDYzXzdjNzU2NWIwMGVkN19fX1Bvd2VyOjpkZWxldGUoJGZpbGVQYXRoKTsgLy8gcmVtb3ZlIGZyb20gZmlsZSBzeXN0ZW0NCgkJCX0NCgkJfQ==', '', '', '', '', '', '', '', 'CQkkZmlsZVBhdGhzID0gU3VwZXJfX185ZDc2YjhkY18zODgzXzQ3NTVfYjExY18xMzFkMTljYThhNTNfX19Qb3dlcjo6XygnRGF0YS5JdGVtcycpLT50YWJsZSgnW1tbdmlld11dXScpLT52YWx1ZXMoJHBrcywgJ2lkJywgJ2ZpbGVfcGF0aCcpID8/IFtdOw==', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'Files', '', '', 'Files', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"2c74c3f5-2bfc-4916-b105-4f5d5e2bea25\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2020-09-07 22:38:14', '2025-03-02 22:14:23', 17, '', 1, 247),
+(285, 1, '', '', '', 1, '', '', '', '', '', 1, '', '', '', '', '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{}', '', '', '', '', '{}', 'Files', '224eb9c7-8b40-48cf-bf77-2afa291fd54a', 'images/vdm/icon/file.png', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Files', 'File', '', 'CQlmb3JlYWNoICgkZmlsZVBhdGhzIGFzICRmaWxlUGF0aCkNCgkJew0KCQkJaWYgKGlzX2ZpbGUoJGZpbGVQYXRoKSAmJiBpc193cml0YWJsZSgkZmlsZVBhdGgpKQ0KCQkJew0KCQkJCUpvb21sYV9fXzU1ZTllOGYwXzNjNWVfNDgzYV9hMDYzXzdjNzU2NWIwMGVkN19fX1Bvd2VyOjpkZWxldGUoJGZpbGVQYXRoKTsgLy8gcmVtb3ZlIGZyb20gZmlsZSBzeXN0ZW0NCgkJCX0NCgkJfQ==', '', '', '', '', '', '', '', 'CQkkZmlsZVBhdGhzID0gU3VwZXJfX185ZDc2YjhkY18zODgzXzQ3NTVfYjExY18xMzFkMTljYThhNTNfX19Qb3dlcjo6XygnRGF0YS5JdGVtcycpLT50YWJsZSgnW1tbdmlld11dXScpLT52YWx1ZXMoJHBrcywgJ2lkJywgJ2ZpbGVfcGF0aCcpID8/IFtdOw==', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'Files', '', '', 'Files', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"65341477-33f1-4d58-9b3c-c371168809da\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2020-09-07 22:38:14', '2025-03-28 10:18:59', 18, '', 1, 247),
 (286, 1, '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 1, '', 1, '', '', '', '', '', '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":1},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":1},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":1},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":1},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":1},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":1},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":1},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":1},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":1}}', '{}', '{}', '{}', '', '', '', '', '{}', '', '60b7b30d-9229-4ce2-b055-9efbb7ac4cea', '', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'User Entity Maps', 'User Entity Map', '', '', '', '', '', '', '', '', '', '', '', 'W0NVU1RPTUNPREU9c2F2ZUdVSURQb3dlcl0=', '', '', '', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', '', '', 'User Entity Maps', '', '', 'User Entity Map', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"3404\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2020-09-07 22:49:46', '2024-09-16 23:34:45', 4, '', 1, 248),
 (293, 1, '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{}', '', '', '', '', '{}', '', 'ab2bbdfc-c0a0-4ffc-9556-67d5af8bec64', '', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Importer Message Logs', 'Importer Message Log', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'Importer Message Logs', '', '', 'Importer Message Logs', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"2c74c3f5-2bfc-4916-b105-4f5d5e2bea25\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2020-02-06 17:25:28', '2025-02-17 10:13:58', 6, '', 1, 249),
-(294, 1, '', '', '', 1, '', '', '', '', '', 1, 1, '', '', '', '', '', '', 1, 1, 1, '', 1, '', '', '', '', 1, '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{}', '', '', '', '', '{}', 'The item import queue', 'a9f19a16-fadb-44ea-a9b6-41130aad05ec', '', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Items Import Queue', 'Item Import', '', 'CQlpZiAoIWVtcHR5KCRmaWxlcykpDQoJCXsNCgkJCSRmaWxlcyA9IFN1cGVyX19fOWQ3NmI4ZGNfMzg4M180NzU1X2IxMWNfMTMxZDE5Y2E4YTUzX19fUG93ZXI6Ol8oJ0RhdGEuSXRlbXMnKS0+dGFibGUoJ2ZpbGUnKS0+dmFsdWVzKCRmaWxlcywgJ2d1aWQnLCAnaWQnKTsNCgkJCWlmICghZW1wdHkoJGZpbGVzKSkNCgkJCXsNCgkJCQkkbW9kZWwgPSBTdXBlcl9fXzY0MGI1MzUyX2ZiMDlfNDI1Zl9hMjZlX2NkNDRlZGEwM2YxNV9fX1Bvd2VyOjpnZXRNb2RlbCgnZmlsZScpOw0KCQkJCSRtb2RlbC0+ZGVsZXRlKCRmaWxlcyk7DQoJCQl9DQoJCX0=', 'CQlpZiAoIWVtcHR5KCRmaWxlcykpDQoJCXsNCgkJCSR1cGRhdGUgPSBbXTsNCgkJCWZvcmVhY2ggKCRmaWxlcyBhcyAkZmlsZSkNCgkJCXsNCgkJCQkkdXBkYXRlW10gPSAob2JqZWN0KSBbJ2d1aWQnID0+ICRmaWxlLCAncHVibGlzaGVkJyA9PiAkdmFsdWVdOw0KCQkJfQ0KCQkJU3VwZXJfX185ZDc2YjhkY18zODgzXzQ3NTVfYjExY18xMzFkMTljYThhNTNfX19Qb3dlcjo6XygnRGF0YS5JdGVtcycpLT50YWJsZSgnZmlsZScpLT5zZXQoJHVwZGF0ZSwgJ2d1aWQnKTsNCgkJfQ==', '', '', '', '', '', '', 'CQkkZmlsZXMgPSBTdXBlcl9fXzlkNzZiOGRjXzM4ODNfNDc1NV9iMTFjXzEzMWQxOWNhOGE1M19fX1Bvd2VyOjpfKCdEYXRhLkl0ZW1zJyktPnRhYmxlKCdbW1t2aWV3XV1dJyktPnZhbHVlcygkcGtzLCAnaWQnLCAnZmlsZScpOw==', 'CQkkZmlsZXMgPSBTdXBlcl9fXzlkNzZiOGRjXzM4ODNfNDc1NV9iMTFjXzEzMWQxOWNhOGE1M19fX1Bvd2VyOjpfKCdEYXRhLkl0ZW1zJyktPnRhYmxlKCdbW1t2aWV3XV1dJyktPnZhbHVlcygkcGtzLCAnaWQnLCAnZmlsZScpOw==', 'W0NVU1RPTUNPREU9c2F2ZUdVSURQb3dlcl0=', '', '', '', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', 'CQkkZmlsZSA9IChvYmplY3QpIFsnZ3VpZCcgPT4gJHZhbGlkRGF0YVsnZmlsZSddLCAncHVibGlzaGVkJyA9PiAkdmFsaWREYXRhWydwdWJsaXNoZWQnXV07DQoJCVN1cGVyX19fOWQ3NmI4ZGNfMzg4M180NzU1X2IxMWNfMTMxZDE5Y2E4YTUzX19fUG93ZXI6Ol8oJ0RhdGEuSXRlbScpLT50YWJsZSgnZmlsZScpLT5zZXQoJGZpbGUsICdndWlkJywgJ3VwZGF0ZScpOw==', '', 'Item Import Queue', '', '', 'Item Import', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"2c74c3f5-2bfc-4916-b105-4f5d5e2bea25\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2020-11-05 18:35:12', '2025-03-03 09:01:55', 10, '', 1, 250);
+(294, 1, '', '', '', 1, '', '', '', '', '', 1, 1, '', '', '', '', '', '', 1, 1, 1, '', 1, '', '', '', '', 1, '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{}', '', '', '', '', '{}', 'The item import queue', 'a9f19a16-fadb-44ea-a9b6-41130aad05ec', '', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Items Import Queue', 'Item Import', '', 'CQlpZiAoIWVtcHR5KCRmaWxlcykpDQoJCXsNCgkJCSRmaWxlcyA9IFN1cGVyX19fOWQ3NmI4ZGNfMzg4M180NzU1X2IxMWNfMTMxZDE5Y2E4YTUzX19fUG93ZXI6Ol8oJ0RhdGEuSXRlbXMnKS0+dGFibGUoJ2ZpbGUnKS0+dmFsdWVzKCRmaWxlcywgJ2d1aWQnLCAnaWQnKTsNCgkJCWlmICghZW1wdHkoJGZpbGVzKSkNCgkJCXsNCgkJCQkkbW9kZWwgPSBTdXBlcl9fXzY0MGI1MzUyX2ZiMDlfNDI1Zl9hMjZlX2NkNDRlZGEwM2YxNV9fX1Bvd2VyOjpnZXRNb2RlbCgnZmlsZScpOw0KCQkJCSRtb2RlbC0+ZGVsZXRlKCRmaWxlcyk7DQoJCQl9DQoJCX0=', 'CQlpZiAoIWVtcHR5KCRmaWxlcykpDQoJCXsNCgkJCSR1cGRhdGUgPSBbXTsNCgkJCWZvcmVhY2ggKCRmaWxlcyBhcyAkZmlsZSkNCgkJCXsNCgkJCQkkdXBkYXRlW10gPSAob2JqZWN0KSBbJ2d1aWQnID0+ICRmaWxlLCAncHVibGlzaGVkJyA9PiAkdmFsdWVdOw0KCQkJfQ0KCQkJU3VwZXJfX185ZDc2YjhkY18zODgzXzQ3NTVfYjExY18xMzFkMTljYThhNTNfX19Qb3dlcjo6XygnRGF0YS5JdGVtcycpLT50YWJsZSgnZmlsZScpLT5zZXQoJHVwZGF0ZSwgJ2d1aWQnKTsNCgkJfQ==', '', '', '', '', '', '', 'CQkkZmlsZXMgPSBTdXBlcl9fXzlkNzZiOGRjXzM4ODNfNDc1NV9iMTFjXzEzMWQxOWNhOGE1M19fX1Bvd2VyOjpfKCdEYXRhLkl0ZW1zJyktPnRhYmxlKCdbW1t2aWV3XV1dJyktPnZhbHVlcygkcGtzLCAnaWQnLCAnZmlsZScpOw==', 'CQkkZmlsZXMgPSBTdXBlcl9fXzlkNzZiOGRjXzM4ODNfNDc1NV9iMTFjXzEzMWQxOWNhOGE1M19fX1Bvd2VyOjpfKCdEYXRhLkl0ZW1zJyktPnRhYmxlKCdbW1t2aWV3XV1dJyktPnZhbHVlcygkcGtzLCAnaWQnLCAnZmlsZScpOw==', 'W0NVU1RPTUNPREU9c2F2ZUdVSURQb3dlcl0=', '', '', '', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', 'CQkkZmlsZSA9IChvYmplY3QpIFsnZ3VpZCcgPT4gJHZhbGlkRGF0YVsnZmlsZSddLCAncHVibGlzaGVkJyA9PiAkdmFsaWREYXRhWydwdWJsaXNoZWQnXV07DQoJCVN1cGVyX19fOWQ3NmI4ZGNfMzg4M180NzU1X2IxMWNfMTMxZDE5Y2E4YTUzX19fUG93ZXI6Ol8oJ0RhdGEuSXRlbScpLT50YWJsZSgnZmlsZScpLT5zZXQoJGZpbGUsICdndWlkJywgJ3VwZGF0ZScpOw==', '', 'Item Import Queue', '', '', 'Item Import', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"2c74c3f5-2bfc-4916-b105-4f5d5e2bea25\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2020-11-05 18:35:12', '2025-03-03 09:01:55', 10, '', 1, 250),
+(296, 1, '', '', 1, 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 1, '', 1, '', '', '', '', '', '', 1, '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{\"addtabs0\":{\"name\":\"Details\"},\"addtabs1\":{\"name\":\"Cities\"}}', '{}', '', 1, '', '', '{}', '', '6c6345a1-e3e4-4840-8918-831034e95b19', 'images/vdm/icon/state.png#joomlaImage://local-images/vdm/icon/state.png?width=128&height=128', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'States', 'State', '', '', '', '', '', '', '', '', '', '', '', 'W0NVU1RPTUNPREU9c2F2ZUdVSURQb3dlcl0=', 'W0NVU1RPTUNPREU9Zm9ybUNvbnRyb2xsZXJFZGl0XQ==', '', '', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', '', '', 'States', 2, 'LS0NCi0tIER1bXBpbmcgZGF0YSBmb3IgdGFibGUgYCNfX2RlbW9fc3RhdGVgDQotLQ0KDQpJTlNFUlQgSU5UTyBgI19fZGVtb19zdGF0ZWAgKGBpZGAsIGBjb3VudHJ5YCwgYGZpcHNfY29kZWAsIGBuYW1lYCwgYHR5cGVgLCBgd2lraWRhdGFpZGAsIGBsYXRpdHVkZWAsIGBsb25naXR1ZGVgLCBgbWV0YWtleWAsIGBtZXRhZGVzY2AsIGBtZXRhZGF0YWAsIGBvcmRlcmluZ2AsIGBwdWJsaXNoZWRgLCBgbW9kaWZpZWRgLCBgY3JlYXRlZGAsIGBoaXRzYCwgYHZlcnNpb25gLCBgcGFyYW1zYCwgYGd1aWRgLCBgaXNvMmApIFZBTFVFUw0KKDEsICc2MmI1MDM5Mi01NGUyLTQ0OTAtYWQ5NC04ZGUwNzczNWE1ODQnLCAyMSwgJ0tob21hcycsICdyZWdpb24nLCAnUTgzNDUwOCcsIC0yMi42Mzc3ODU0MCwgMTcuMTAxMTkzMTAsICcnLCAnJywgJ3tcInJvYm90c1wiOlwiXCIsXCJhdXRob3JcIjpcIlwiLFwicmlnaHRzXCI6XCJcIn0nLCAxLCAxLCAnMjAyNS0wMy0yNiAxOTo1NTo0NycsICcyMDI1LTAzLTI1IDE2OjIzOjM0JywgJycsIDExLCAnJywgJ2M4NDBjNWFlLWQzODQtNDg0Ny1iNTBkLWE4MmVmMjk4M2M0ZCcsICdOQScpLA0KKDIsICcyZmNhOWU3OS1jOGM5LTQ1N2YtYTJhMi05M2JlNzkyMDdlZGUnLCAxMSwgJ1dldGVybiBDYXBlJywgJ3Byb3ZpbmNlJywgJ1ExMjcxNjcnLCAtMzMuMjI3NzkxODAsIDIxLjg1Njg1ODYwLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgMiwgMSwgJzIwMjUtMDMtMjYgMTU6NTU6NDYnLCAnMjAyNS0wMy0yNiAxNToyMDowNScsICcnLCAzLCAnJywgJ2EyMDE1ZGVkLTBmZWQtNDA2NC04ZTYzLTgzYTQ5NWUxYTA5YicsICdXQycpLA0KKDMsICc2MmI1MDM5Mi01NGUyLTQ0OTAtYWQ5NC04ZGUwNzczNWE1ODQnLCAxNTIsICdPdGpvem9uZGp1cGEnLCAncmVnaW9uJywgJ1E4NzY1MDYnLCAtMjAuNTQ4NjkxNjAsIDE3LjY2ODg4NzAwLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgMywgMSwgJzIwMjUtMDMtMjYgMTk6NTY6NDQnLCAnMjAyNS0wMy0yNiAxNTo0NDoxMScsICcnLCAzLCAnJywgJ2RlNTc3MzI1LTFkZWQtNDZkOS1hMDJjLTIzMWJjZDhhNDYxZScsICdPRCcpLA0KKDQsICc2MmI1MDM5Mi01NGUyLTQ0OTAtYWQ5NC04ZGUwNzczNWE1ODQnLCAxNTIsICdFcm9uZ28nLCAncmVnaW9uJywgJ1E2NDg3NTMnLCAtMjIuMjU2NTY4MjAsIDE1LjQwNjgwNzkwLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgNCwgMSwgJzIwMjUtMDMtMjYgMTk6NTU6MDgnLCAnMjAyNS0wMy0yNiAxNTo1MDo1MCcsICcnLCA0LCAnJywgJzJjMDM3N2M3LWRkMzAtNGE2Ny1iOGI5LTdjZTFhZmY0ZmY5YicsICdFUicpLA0KKDksICc2MmI1MDM5Mi01NGUyLTQ0OTAtYWQ5NC04ZGUwNzczNWE1ODQnLCAxNTIsICdIYXJkYXAnLCAncmVnaW9uJywgJ1E3NTI2NzYnLCAtMjYuODQyOTY0NTAsIDE3LjI5MDI4MzkwLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgJycsIDEsICcyMDI1LTAzLTI3IDA2OjIxOjE3JywgJzIwMjUtMDMtMjYgMjE6MjE6NTUnLCAnJywgMiwgJycsICdhNmU3Zjk2My01Mjg4LTQyM2EtYjlmYi02ZTkyYjlmYmEyNDEnLCAnS0EnKSwNCigxMSwgJzJmY2E5ZTc5LWM4YzktNDU3Zi1hMmEyLTkzYmU3OTIwN2VkZScsIDA2LCAnR2F1dGVuZycsICdwcm92aW5jZScsICdRMTMzMDgzJywgLTI2LjI3MDc1OTMwLCAyOC4xMTIyNjc5MCwgJycsICcnLCAne1wicm9ib3RzXCI6XCJcIixcImF1dGhvclwiOlwiXCIsXCJyaWdodHNcIjpcIlwifScsIDYsIDEsICcyMDI1LTAzLTI3IDIwOjA0OjMxJywgJzIwMjUtMDMtMjcgMTI6NDA6MjMnLCAnJywgMTUsICcnLCAnOWZkY2U4NzUtMDZlZC00NDk4LTk2NGUtMGY3MjM2MzFmZTFmJywgJ0dQJyksDQooMTIsICc2MmI1MDM5Mi01NGUyLTQ0OTAtYWQ5NC04ZGUwNzczNWE1ODQnLCAzMSwgJ0thcmFzJywgJ3JlZ2lvbicsICdRNTczNDY3JywgLTI2Ljg0Mjk2NDUwLCAxNy4yOTAyODM5MCwgJycsICcnLCAnJywgJycsIDEsICcnLCAnMjAyNS0wMy0yOCAwODozNjozMCcsICcnLCAxLCAnJywgJ2NjMDdjNTViLWZmZTQtNDNiMy05N2I3LTIzYjU3NDZjMDlmOScsICdLQScpLA0KKDEzLCAnNjJiNTAzOTItNTRlMi00NDkwLWFkOTQtOGRlMDc3MzVhNTg0JywgNDAsICdLYXZhbmdvIEVhc3QnLCAncmVnaW9uJywgJ1ExNDgyNDAzMicsIDE4LjI3MTA0ODAwLCAxOC40Mjc2MDQ3MCwgJycsICcnLCAnJywgJycsIDEsICcnLCAnMjAyNS0wMy0yOCAwODo0NDozOScsICcnLCAxLCAnJywgJ2Q1M2NmNDE3LTg0YmMtNGE3Mi04YWNiLTI4MzY3ZjQxYmZiYicsICdLRScpLA0KKDE0LCAnNjJiNTAzOTItNTRlMi00NDkwLWFkOTQtOGRlMDc3MzVhNTg0JywgMzIsICdLdW5lbmUnLCAncmVnaW9uJywgJ1E4MzQ1MTMnLCAtMTkuNDA4NjMxNzAsIDEzLjkxNDM5OTAwLCAnJywgJycsICcnLCAnJywgMSwgJycsICcyMDI1LTAzLTI4IDA4OjQ3OjU3JywgJycsIDEsICcnLCAnYTU1ZjhkNWEtZjQxZi00YjBkLWI2YTQtNjk3MjY0NzdmYzUyJywgJ0tVJyksDQooMTUsICc2MmI1MDM5Mi01NGUyLTQ0OTAtYWQ5NC04ZGUwNzczNWE1ODQnLCAzMywgJ09oYW5nd2VuYScsICdyZWdpb24nLCAnUTg0NTcwMicsIC0xNy41OTc5MjkxMCwgMTYuODE3ODM3NzAsICcnLCAnJywgJycsICcnLCAxLCAnJywgJzIwMjUtMDMtMjggMDg6NTM6NTknLCAnJywgMSwgJycsICczZWU1YjEwZS02MGQ0LTRlYjAtYTVlYS1hZTk4ZGI0NWJlYmUnLCAnT1cnKSwNCigxNiwgJzYyYjUwMzkyLTU0ZTItNDQ5MC1hZDk0LThkZTA3NzM1YTU4NCcsIDM1LCAnT21haGVrZScsICdyZWdpb24nLCAnUTgzODc3NScsIDE5LjE4ODAwNDcwLCAtMjEuODQ2NjY1MTAsICcnLCAnJywgJ3tcInJvYm90c1wiOlwiXCIsXCJhdXRob3JcIjpcIlwiLFwicmlnaHRzXCI6XCJcIn0nLCA3LCAxLCAnMjAyNS0wMy0yOCAwODo1OTo0NicsICcyMDI1LTAzLTI4IDA4OjU4OjA3JywgJycsIDMsICcnLCAnYWI4ODg0MmYtMGU2Ni00N2NkLTk3MTItNmQ1YWFkM2IxNzliJywgJ09IJyksDQooMTcsICc2MmI1MDM5Mi01NGUyLTQ0OTAtYWQ5NC04ZGUwNzczNWE1ODQnLCAzNiwgJ09tdXNhdGknLCAncmVnaW9uJywgJ1E3NjQzODUnLCAxNC44NDU0NjE5MCwgLTE4LjQwNzAyOTQwLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgOCwgMSwgJzIwMjUtMDMtMjggMDk6MDE6NTgnLCAnMjAyNS0wMy0yOCAwOTowMTowMicsICcnLCAyLCAnJywgJ2RkMDE1ZmU3LTUwYjktNGExZS1iZTY2LTJlNWRlYjZlYTA1ZScsICdPUycpLA0KKDE4LCAnNjJiNTAzOTItNTRlMi00NDkwLWFkOTQtOGRlMDc3MzVhNTg0JywgMzcsICdPc2hhbmEnLCAncmVnaW9uJywgJ1E1MzQ1MjgnLCAxNS42ODgxNzg4MCwgLTE4LjQzMDUwNjQwLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgOSwgMSwgJzIwMjUtMDMtMjggMDk6MDU6NTUnLCAnMjAyNS0wMy0yOCAwOTowNDoyMScsICcnLCAzLCAnJywgJzZmMTE0ZDEzLWNlN2YtNDc1MS04MDI5LWZmNzcyM2E5MzJhMicsICdPTicpLA0KKDE5LCAnNjJiNTAzOTItNTRlMi00NDkwLWFkOTQtOGRlMDc3MzVhNTg0JywgMzgsICdPc2hpa290bycsICdyZWdpb24nLCAnUTg3NjUxMicsIDE2LjkxMjI1MTAwLCAtMTguNDE1MjU3NTAsICcnLCAnJywgJ3tcInJvYm90c1wiOlwiXCIsXCJhdXRob3JcIjpcIlwiLFwicmlnaHRzXCI6XCJcIn0nLCAxMCwgMSwgJzIwMjUtMDMtMjggMDk6MDk6MjMnLCAnMjAyNS0wMy0yOCAwOTowODowOCcsICcnLCAyLCAnJywgJ2IwNjUwYTZkLTU2ZDgtNDc2NS1iNTY2LWY2YjkzMjU1ZjdmNCcsICdPVCcpLA0KKDIwLCAnNjJiNTAzOTItNTRlMi00NDkwLWFkOTQtOGRlMDc3MzVhNTg0JywgMjgsICdaYW1iZXppJywgJ3JlZ2lvbicsICdRNDczMTkwJywgMjMuOTUzNjQ2NjAsIC0xNy44MTkzNDE5MCwgJycsICcnLCAne1wicm9ib3RzXCI6XCJcIixcImF1dGhvclwiOlwiXCIsXCJyaWdodHNcIjpcIlwifScsIDExLCAxLCAnMjAyNS0wMy0yOCAwOToxMzozMScsICcyMDI1LTAzLTI4IDA5OjEwOjUyJywgJycsIDIsICcnLCAnZWRjM2FkZDYtMTk3Ny00NDNlLWFmNDAtMzZmNzAwYWQzMWMwJywgJ0NBJyk7', 'States', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"c31eea82-d52d-4586-9d34-c73abfebf5f3\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2025-03-24 08:26:24', '2025-03-28 12:25:29', 40, '', 1, 170),
+(297, 1, '', '', 1, 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 1, '', 1, '', '', '', '', '', '', 1, '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{}', '', 1, '', '', '{}', '', '3dbb581b-619a-4fb0-a6f6-e4a136ea31e2', 'images/vdm/icon/city.png#joomlaImage://local-images/vdm/icon/city.png?width=128&height=128', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Cities', 'City', '', '', '', '', '', '', '', '', '', '', '', 'W0NVU1RPTUNPREU9c2F2ZUdVSURQb3dlcl0=', 'W0NVU1RPTUNPREU9Zm9ybUNvbnRyb2xsZXJFZGl0XQ==', '', '', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', '', '', 'Cities', 2, '--
-- Dumping data for table `#__demo_city`
--

INSERT INTO `#__demo_city` (`id`, `name`, `latitude`, `longitude`, `guid`, `wikidataid`, `metakey`, `metadesc`, `metadata`, `ordering`, `published`, `modified`, `created`, `hits`, `version`, `params`, `state`) VALUES
(1, 'Windhoek', -22.55941000, 17.08323000, 'bbb0d564-ce06-44d3-8a1f-d5e57f56b113', 'Q3935', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', 1, 1, '2025-03-27 06:27:39', '2025-03-25 16:15:07', '', 3, '', 'c840c5ae-d384-4847-b50d-a82ef2983c4d'),
(2, 'Katutura', -22.52306000, 17.06028000, '242767e2-b762-49c3-86f3-f20b0c31782a', 'Q864100', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:27:30', '2025-03-26 14:33:30', '', 2, '', 'c840c5ae-d384-4847-b50d-a82ef2983c4d'),
(3, 'Grootfontein', -19.56667000, 18.11667000, '6f134147-6248-4a80-b3f2-8b8fe5dadaf8', 'Q986336', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:27:21', '2025-03-26 15:44:11', '', 2, '', 'de577325-1ded-46d9-a02c-231bcd8a461e'),
(4, 'Okahandja', -21.98333000, 16.91667000, '30c4b604-a6bb-4eba-a0a4-976ea0f72183', 'Q597491', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:27:14', '2025-03-26 15:44:11', '', 2, '', 'de577325-1ded-46d9-a02c-231bcd8a461e'),
(5, 'Okakarara', -20.58333000, 17.43333000, 'e1029056-9b2c-4f24-8f85-6d77aa59d247', 'Q992077', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:27:04', '2025-03-26 15:44:11', '', 2, '', 'de577325-1ded-46d9-a02c-231bcd8a461e'),
(6, 'Otavi', -19.65000000, 17.33333000, '7c63b580-4ee0-499f-b34b-efbc4675bff6', 'Q1013965', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:26:56', '2025-03-26 15:44:11', '', 2, '', 'de577325-1ded-46d9-a02c-231bcd8a461e'),
(7, 'Otjiwarongo', -20.46369000, 16.64772000, '4ed6c60e-5e13-4d68-83e8-5e2f5e6d0a75', 'Q993149', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:26:43', '2025-03-26 15:44:11', '', 2, '', 'de577325-1ded-46d9-a02c-231bcd8a461e'),
(46, 'Arandis', -22.41667000, 14.96667000, 'f17e54f0-e05d-43cd-98ef-5bedeaa554d2', 'Q438851', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:26:07', '2025-03-26 15:56:53', '', 2, '', '2c0377c7-dd30-4a67-b8b9-7ce1aff4ff9b'),
(47, 'Hentiesbaai', -22.11667000, 14.28333000, 'c293ed83-c69c-4b7f-a271-7e50eacd134b', 'Q1013389', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:26:00', '2025-03-26 15:56:53', '', 2, '', '2c0377c7-dd30-4a67-b8b9-7ce1aff4ff9b'),
(48, 'Karibib', -21.93333000, 15.83333000, '53a9d49b-a0ef-4e7e-ad67-7ea09c517981', 'Q1348181', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:25:51', '2025-03-26 15:56:53', '', 2, '', '2c0377c7-dd30-4a67-b8b9-7ce1aff4ff9b'),
(49, 'Omaruru', -21.43333000, 15.93333000, 'da8b47b0-817d-4490-87d3-4975bb540468', 'Q1896161', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:25:41', '2025-03-26 15:56:53', '', 2, '', '2c0377c7-dd30-4a67-b8b9-7ce1aff4ff9b'),
(50, 'Otjimbingwe', -22.35000000, 16.13333000, 'b59c43c0-6da9-4d06-85e8-ced33440797e', 'Q464050', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:25:32', '2025-03-26 15:56:53', '', 2, '', '2c0377c7-dd30-4a67-b8b9-7ce1aff4ff9b'),
(51, 'Swakopmund', -22.63199000, 14.60119000, '4c512316-7d59-46a6-bef9-b6095de9fd34', 'Q59698', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:25:17', '2025-03-26 15:56:53', '', 2, '', '2c0377c7-dd30-4a67-b8b9-7ce1aff4ff9b'),
(52, 'Swakopmund Constituency', -22.63199000, 14.60119000, '225d5064-17d3-4ca7-9970-3f99a4cd0d54', 'Q3711710', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:25:10', '2025-03-26 15:56:53', '', 2, '', '2c0377c7-dd30-4a67-b8b9-7ce1aff4ff9b'),
(53, 'Usakos', -22.00000000, 15.60000000, '36700f6c-cb0a-4058-a8dc-06ebf08cb778', 'Q1457265', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:25:02', '2025-03-26 15:56:53', '', 2, '', '2c0377c7-dd30-4a67-b8b9-7ce1aff4ff9b'),
(54, 'Walvis Bay', -22.95750000, 14.50528000, '88d88df9-becc-4889-92f1-1583bf5527cc', 'Q220843', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:24:55', '2025-03-26 15:56:53', '', 2, '', '2c0377c7-dd30-4a67-b8b9-7ce1aff4ff9b'),
(55, 'Aranos', -24.13333000, 19.11667000, 'd6f24f64-b251-40a6-b788-fa60bee19ad0', 'Q626040', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:24:49', '2025-03-26 20:41:21', '', 2, '', 'a6e7f963-5288-423a-b9fb-6e92b9fba241'),
(56, 'Hoachanas', -23.91667000, 18.05000000, 'd735b369-eaaa-4f51-9443-d5d3dbefa40b', 'Q1621498', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:24:41', '2025-03-26 20:41:21', '', 2, '', 'a6e7f963-5288-423a-b9fb-6e92b9fba241'),
(57, 'Maltahöhe', -24.83333000, 16.98333000, '80ca95e5-cc9b-406d-84b4-aafde00185ca', 'Q666079', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:24:34', '2025-03-26 20:41:21', '', 3, '', 'a6e7f963-5288-423a-b9fb-6e92b9fba241'),
(58, 'Mariental', -24.63333000, 17.96667000, '593d2071-0a8d-4135-876f-ac57108add56', 'Q876166', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:24:23', '2025-03-26 20:41:21', '', 2, '', 'a6e7f963-5288-423a-b9fb-6e92b9fba241'),
(59, 'Rehoboth', -23.31700000, 17.09000000, 'ef026966-e25a-4237-a5fc-fdcd3b1e8055', 'Q700050', '', '', '{\"robots\":\"\",\"author\":\"\",\"rights\":\"\"}', '', 1, '2025-03-27 06:21:06', '2025-03-26 20:41:21', '', 4, '', 'a6e7f963-5288-423a-b9fb-6e92b9fba241'),
(163, 'Johannesburg', -26.20227000, 28.04363000, '4882dea0-5ff7-4e7b-a0e8-90d5baab5c04', 'Q34647', '', '', '', '', 1, '', '2025-03-27 20:04:29', '', 1, '', '9fdce875-06ed-4498-964e-0f723631fe1f'),
(164, 'Bethanie', -26.48333000, 17.15000000, '63927a1f-531f-4a18-9013-48fc892ac07e', 'Q251677', '', '', '', '', 1, '', '2025-03-28 08:42:37', '', 1, '', 'cc07c55b-ffe4-43b3-97b7-23b5746c09f9'),
(165, 'Karasburg', -28.01667000, 18.75000000, '25d67ad8-f33c-44e2-ab11-7ad06b6c67a5', 'Q1003328', '', '', '', '', 1, '', '2025-03-28 08:42:37', '', 1, '', 'cc07c55b-ffe4-43b3-97b7-23b5746c09f9'),
(166, 'Keetmanshoop', -26.58333000, 18.13333000, '82f3fc6d-0fa5-4d1a-9a06-156ad308f930', 'Q160884', '', '', '', '', 1, '', '2025-03-28 08:42:37', '', 1, '', 'cc07c55b-ffe4-43b3-97b7-23b5746c09f9'),
(167, 'Lüderitz', -26.64807000, 15.15383000, 'd894e23f-da26-4ed1-a4f1-5234a084c5fd', 'Q159325', '', '', '', '', 1, '', '2025-03-28 08:42:37', '', 1, '', 'cc07c55b-ffe4-43b3-97b7-23b5746c09f9'),
(168, 'Oranjemund', -28.55000000, 16.43333000, 'fc9309eb-ba1a-4252-98c0-4136abec821b', 'Q1404518', '', '', '', '', 1, '', '2025-03-28 08:42:37', '', 1, '', 'cc07c55b-ffe4-43b3-97b7-23b5746c09f9'),
(169, 'Tses', -25.88333000, 18.00000000, '34917941-8bbf-4036-ba37-d9a013f2a615', 'Q1529444', '', '', '', '', 1, '', '2025-03-28 08:42:37', '', 1, '', 'cc07c55b-ffe4-43b3-97b7-23b5746c09f9'),
(170, 'Warmbad', -28.45000000, 18.73333000, 'f95496cc-6e66-43c4-a689-49e4ee7ba34f', 'Q479312', '', '', '', '', 1, '', '2025-03-28 08:42:37', '', 1, '', 'cc07c55b-ffe4-43b3-97b7-23b5746c09f9'),
(171, 'Rundu', -17.93333000, 19.76667000, '9a544557-e9d5-4bb9-85bb-dcfb106f75c1', 'Q662291', '', '', '', '', 1, '', '2025-03-28 08:45:12', '', 1, '', 'd53cf417-84bc-4a72-8acb-28367f41bfbb'),
(172, 'Cape Town', -33.92584000, 18.42322000, '661acdad-94d4-4b5a-b15f-5b6e7a1579b1', 'Q5465', '', '', '', '', 1, '', '2025-03-28 08:46:38', '', 1, '', 'a2015ded-0fed-4064-8e63-83a495e1a09b'),
(173, 'Epupa Constituency', -17.00388000, 13.24825000, 'b1563d67-cc43-430c-b1c4-f3c38d7c17fb', 'Q1026511', '', '', '', '', 1, '', '2025-03-28 08:50:40', '', 1, '', 'a55f8d5a-f41f-4b0d-b6a4-69726477fc52'),
(174, 'Khorixas', -20.36667000, 14.96667000, 'd6a38115-777b-4a34-9c1c-02b8cb575615', 'Q1740681', '', '', '', '', 1, '', '2025-03-28 08:50:40', '', 1, '', 'a55f8d5a-f41f-4b0d-b6a4-69726477fc52'),
(175, 'Khorixas Constituency', -20.36792000, 14.95996000, '95da731e-056c-4a0c-8e83-27f4ce5af61e', 'Q4122340', '', '', '', '', 1, '', '2025-03-28 08:50:40', '', 1, '', 'a55f8d5a-f41f-4b0d-b6a4-69726477fc52'),
(176, 'Opuwo', -18.06068000, 13.83998000, 'efb189f4-ec1a-4c37-87ab-ef87e8eb1cf4', 'Q1024089', '', '', '', '', 1, '', '2025-03-28 08:50:40', '', 1, '', 'a55f8d5a-f41f-4b0d-b6a4-69726477fc52'),
(177, 'Opuwo Constituency', -20.11667000, 16.15000000, '8d7c361f-e6fa-4b0c-b061-0351604ff13a', 'Q1704346', '', '', '', '', 1, '', '2025-03-28 08:51:56', '', 1, '', 'a55f8d5a-f41f-4b0d-b6a4-69726477fc52'),
(178, 'Sesfontein Constituency', -19.56106000, 13.76530000, '5458d615-f674-4714-9f0b-1e7a37bc3ea1', 'Q3711708', '', '', '', '', 1, '', '2025-03-28 08:51:56', '', 1, '', 'a55f8d5a-f41f-4b0d-b6a4-69726477fc52'),
(179, 'Ohangwena', -17.40000000, 15.88333000, 'f5527d58-5f23-41cf-9fe0-4ef9b91bcecf', 'Q2033319', '', '', '', '', 1, '', '2025-03-28 08:55:08', '', 1, '', '3ee5b10e-60d4-4eb0-a5ea-ae98db45bebe'),
(180, 'Gobabis', -22.45000000, 18.96667000, '00c5000a-3742-450c-a52b-9ba38913e945', 'Q1000609', '', '', '', '', 1, '', '2025-03-28 08:59:33', '', 1, '', 'ab88842f-0e66-47cd-9712-6d5aad3b179b'),
(181, 'Ongandjera', -17.88333000, 15.06667000, '2f13683a-9863-483c-ba88-170d5a78b9d8', 'Q3352721', '', '', '', '', 1, '', '2025-03-28 09:01:58', '', 1, '', 'dd015fe7-50b9-4a1e-be66-2e5deb6ea05e'),
(182, 'Outapi', -17.50000000, 14.98333000, 'cd22e1e9-eb6f-42e1-90d6-ea8aa07e2753', 'Q1758215', '', '', '', '', 1, '', '2025-03-28 09:01:58', '', 1, '', 'dd015fe7-50b9-4a1e-be66-2e5deb6ea05e'),
(183, 'Ondangwa', -17.91667000, 15.95000000, '589cbcbc-9dc5-4880-968d-c380fd4316ef', 'Q2023773', '', '', '', '', 1, '', '2025-03-28 09:05:53', '', 1, '', '6f114d13-ce7f-4751-8029-ff7723a932a2'),
(184, 'Ongwediva', -17.78333000, 15.76667000, '6ae4f351-55e2-4e69-a31e-29e76ac7f7c5', 'Q841557', '', '', '', '', 1, '', '2025-03-28 09:05:53', '', 1, '', '6f114d13-ce7f-4751-8029-ff7723a932a2'),
(185, 'Oshakati', -17.78833000, 15.70436000, '5ebe20b5-2468-4ef9-ab82-37e554d39d5f', 'Q985622', '', '', '', '', 1, '', '2025-03-28 09:05:53', '', 1, '', '6f114d13-ce7f-4751-8029-ff7723a932a2'),
(186, 'Omuthiya', -18.36463000, 16.58146000, 'd888b4d2-af86-4e34-8bee-4554e0b19213', 'Q1005584', '', '', '', '', 1, '', '2025-03-28 09:09:23', '', 1, '', 'b0650a6d-56d8-4765-b566-f6b93255f7f4'),
(187, 'Tsumeb', -19.23333000, 17.71667000, '96b51507-1b66-4b5c-ab37-909159d53261', 'Q639467', '', '', '', '', 1, '', '2025-03-28 09:09:23', '', 1, '', 'b0650a6d-56d8-4765-b566-f6b93255f7f4'),
(188, 'Bagani', -18.11065000, 21.61645000, 'b28199b8-c1d9-47c5-836a-fab2823a726b', 'Q799830', '', '', '', '', 1, '', '2025-03-28 09:13:31', '', 1, '', 'edc3add6-1977-443e-af40-36f700ad31c0'),
(189, 'Katima Mulilo', -17.50000000, 24.26667000, 'aa720304-b89b-4170-8539-0f476d770284', 'Q864100', '', '', '', '', 1, '', '2025-03-28 09:13:31', '', 1, '', 'edc3add6-1977-443e-af40-36f700ad31c0');', 'Cities', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"2c74c3f5-2bfc-4916-b105-4f5d5e2bea25\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2025-03-24 10:21:08', '2025-03-28 12:25:19', 30, '', 1, 251),
+(298, 1, '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 1, '', 1, '', '', '', '', '', '', 1, '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{}', '', 1, '', '', '{}', '', '75061367-79c2-4d5b-a75d-eca6d33507df', '', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Timezones', 'Timezone', '', '', '', '', '', '', '', '', '', '', '', 'W0NVU1RPTUNPREU9c2F2ZUdVSURQb3dlcl0=', '', '', '', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', '', '', 'Timezones.', 2, 'LS0NCi0tIER1bXBpbmcgZGF0YSBmb3IgdGFibGUgYCNfX2RlbW9fdGltZXpvbmVgDQotLQ0KDQpJTlNFUlQgSU5UTyBgI19fZGVtb190aW1lem9uZWAgKGBpZGAsIGB0aW1lem9uZV9uYW1lYCwgYHRpbWV6b25lX2lkZW50aWZpZXJgLCBgZ210X29mZnNldF9uYW1lYCwgYGd1aWRgLCBgZ210X29mZnNldF9zZWNgLCBgYWJicmV2aWF0aW9uYCwgYG1ldGFrZXlgLCBgbWV0YWRlc2NgLCBgbWV0YWRhdGFgLCBgb3JkZXJpbmdgLCBgcHVibGlzaGVkYCwgYG1vZGlmaWVkYCwgYGNyZWF0ZWRgLCBgaGl0c2AsIGB2ZXJzaW9uYCwgYHBhcmFtc2AsIGBjb3VudHJ5YCkgVkFMVUVTDQooMSwgJ1NvdXRoIEFmcmljYW4gU3RhbmRhcmQgVGltZScsICdBZnJpY2FcXC9Kb2hhbm5lc2J1cmcnLCAnVVRDKzAyOjAwJywgJ2RlYjdkOTM4LWEzODUtNDU0ZC1iNmM3LWZhNTlkMjNmOTc2YicsIDcyMDAsICdTQVNUJywgJycsICcnLCAne1wicm9ib3RzXCI6XCJcIixcImF1dGhvclwiOlwiXCIsXCJyaWdodHNcIjpcIlwifScsICcnLCAxLCAnMjAyNS0wMy0yNyAxMzo0OToxMScsICcyMDI1LTAzLTI2IDE0OjU4OjU0JywgJycsIDIsICcnLCAnMmZjYTllNzktYzhjOS00NTdmLWEyYTItOTNiZTc5MjA3ZWRlJyksDQooMiwgJ1dlc3QgQWZyaWNhIFN1bW1lciBUaW1lJywgJ0FmcmljYS9XaW5kaG9laycsICdVVEMrMDI6MDAnLCAnMzViYmM5MmYtNTE2MS00ZDEzLWEyMGYtNTg0YzIzMTE2YjEyJywgNzIwMCwgJ1dBU1QnLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgJycsIDEsICcyMDI1LTAzLTI3IDEzOjQ5OjAyJywgJzIwMjUtMDMtMjYgMTU6MzM6MzgnLCAnJywgMiwgJycsICc2MmI1MDM5Mi01NGUyLTQ0OTAtYWQ5NC04ZGUwNzczNWE1ODQnKTs=', 'Timezone', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"da82cdf5-15f0-45b2-b5e7-0678780a50f0\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2025-03-24 10:48:37', '2025-03-28 12:25:03', 23, '', 1, 52),
+(299, 1, '', '', 1, 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 1, '', 1, '', '', '', '', '', '', 1, '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{\"addtabs0\":{\"name\":\"Details\"},\"addtabs1\":{\"name\":\"States\"}}', '{}', '', 1, '', '', '{}', '', '6acc4069-1c33-4470-85a6-07bc9bb16d10', 'images/vdm/icon/country.png#joomlaImage://local-images/vdm/icon/country.png?width=128&height=128', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Countries', 'Country', '', '', '', '', '', '', '', '', '', '', '', 'W0NVU1RPTUNPREU9c2F2ZUdVSURQb3dlcl0=', 'W0NVU1RPTUNPREU9Zm9ybUNvbnRyb2xsZXJFZGl0XQ==', '', '', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', '', '', 'A list of countries.', 2, 'LS0NCi0tIER1bXBpbmcgZGF0YSBmb3IgdGFibGUgYCNfX2RlbW9fY291bnRyeWANCi0tDQoNCklOU0VSVCBJTlRPIGAjX19kZW1vX2NvdW50cnlgIChgaWRgLCBgbmFtZWAsIGBzdWJyZWdpb25gLCBgY2FwaXRhbGAsIGBsb25naXR1ZGVgLCBgbGF0aXR1ZGVgLCBgZW1vaml1YCwgYGVtb2ppYCwgYHRsZGAsIGBuYXRpb25hbGl0eWAsIGBuYXRpdmVgLCBgbnVtZXJpY19jb2RlYCwgYHBob25lY29kZWAsIGB3aWtpZGF0YWlkYCwgYG1ldGFrZXlgLCBgbWV0YWRlc2NgLCBgbWV0YWRhdGFgLCBgb3JkZXJpbmdgLCBgcHVibGlzaGVkYCwgYG1vZGlmaWVkYCwgYGNyZWF0ZWRgLCBgaGl0c2AsIGB2ZXJzaW9uYCwgYHBhcmFtc2AsIGBjdXJyZW5jeV9uYW1lYCwgYGNvZGV0aHJlZWAsIGBzeW1ib2xgLCBgZ3VpZGAsIGBpc28yYCwgYGlzbzNgKSBWQUxVRVMNCigxLCAnTmFtaWJpYScsICdjMWNjZTkzMC01MmFhLTQ4ZmMtYjVkNC1mZDVjOTcyOWE3MzUnLCAnYmJiMGQ1NjQtY2UwNi00NGQzLThhMWYtZDVlNTdmNTZiMTEzJywgMTcuMDAwMDAwMDAsIC0yMi4wMDAwMDAwMCwgJ1UrMUYxRjMgVSsxRjFFNicsICfwn4ez8J+HpicsICcubmEnLCAnTmFtaWJpYW4nLCAnTmFtaWJpYScsIDUxNiwgMjY0LCAnUTEwMzAnLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgMSwgMSwgJzIwMjUtMDMtMjggMDg6NTU6MTEnLCAnMjAyNS0wMy0yNSAxNjoxMDo0MycsICcnLCAyNiwgJycsICdOYW1pYmlhbiBEb2xsYXInLCAnTkFEJywgJyQnLCAnNjJiNTAzOTItNTRlMi00NDkwLWFkOTQtOGRlMDc3MzVhNTg0JywgJ05BJywgJ05BTScpLA0KKDIsICdTb3V0aCBBZnJpY2EnLCAnYzFjY2U5MzAtNTJhYS00OGZjLWI1ZDQtZmQ1Yzk3MjlhNzM1JywgJzQ4ODJkZWEwLTVmZjctNGU3Yi1hMGU4LTkwZDViYWFiNWMwNCcsIDI0LjAwMDAwMDAwLCAtMjkuMDAwMDAwMDAsICdVKzFGMUZGIFUrMUYxRTYnLCAn8J+Hv/Cfh6YnLCAnLnphJywgJ1NvdXRoIEFmcmljYW4nLCAnU291dGggQWZyaWNhJywgNzEwLCAyNywgJ1EyNTgnLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgMiwgMSwgJzIwMjUtMDMtMjggMDg6NDY6NTgnLCAnMjAyNS0wMy0yNiAxNDo1ODo1NCcsICcnLCA3LCAnJywgJ1NvdXRoIEFmcmljYW4gcmFuZCcsICdaQVInLCAnUicsICcyZmNhOWU3OS1jOGM5LTQ1N2YtYTJhMi05M2JlNzkyMDdlZGUnLCAnWkEnLCAnWkFGJyk7', 'Country', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"335866ce-b81b-4329-901d-c20254135c9c\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2025-03-24 12:36:05', '2025-03-28 12:25:09', 44, '', 1, 36),
+(301, 1, '', '', 1, 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 1, '', 1, '', '', '', '', '', '', 1, '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{}', '', '', '', '', '{}', '', '9eefa86b-6294-4512-8d62-979abf16c00d', 'images/vdm/icon/region.png#joomlaImage://local-images/vdm/icon/region.png?width=128&height=128', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Regions', 'Region', '', '', '', '', '', '', '', '', '', '', '', 'W0NVU1RPTUNPREU9c2F2ZUdVSURQb3dlcl0=', 'W0NVU1RPTUNPREU9Zm9ybUNvbnRyb2xsZXJFZGl0XQ==', '', '', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', '', '', 'Regions', 2, 'LS0NCi0tIER1bXBpbmcgZGF0YSBmb3IgdGFibGUgYCNfX2RlbW9fcmVnaW9uYA0KLS0NCg0KSU5TRVJUIElOVE8gYCNfX2RlbW9fcmVnaW9uYCAoYGlkYCwgYG5hbWVgLCBgd2lraWRhdGFpZGAsIGBtZXRha2V5YCwgYG1ldGFkZXNjYCwgYG1ldGFkYXRhYCwgYG9yZGVyaW5nYCwgYHB1Ymxpc2hlZGAsIGBtb2RpZmllZGAsIGBjcmVhdGVkYCwgYGhpdHNgLCBgdmVyc2lvbmAsIGBwYXJhbXNgLCBgZ3VpZGApIFZBTFVFUw0KKDEsICdBZnJpY2EnLCAnUTE1JywgJycsICcnLCAne1wicm9ib3RzXCI6XCJcIixcImF1dGhvclwiOlwiXCIsXCJyaWdodHNcIjpcIlwifScsIDEsIDEsICcyMDI1LTAzLTI2IDEzOjEwOjMyJywgJzIwMjUtMDMtMjUgMTU6Mzg6MTMnLCAnJywgNSwgJycsICcyZTQ4NzM0Yi05OTc4LTRmZTEtYWU5MC1iNzVlM2RlOTA1M2QnKSwNCigyLCAnQXNpYScsICdRNDgnLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgMiwgMSwgJzIwMjUtMDMtMjggMDk6NDc6NTMnLCAnMjAyNS0wMy0yNiAxMzoyMjoxOScsICcnLCAyLCAnJywgJ2ZlYTg1MDM2LTg4MjItNGQ5Ni1iOGM3LTViZjQ1MTE0YzQwYScpOw==', 'Regions', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"2c74c3f5-2bfc-4916-b105-4f5d5e2bea25\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2025-03-25 09:11:11', '2025-03-28 12:24:23', 21, '', 1, 252),
+(302, 1, '', '', 1, 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 1, '', 1, '', '', '', '', '', '', 1, '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.access\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions8\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{}', '{}', '', '', '', '', '{}', '', '2e451812-45af-4015-aa0c-f5912702c9af', 'images/vdm/icon/subregion.png#joomlaImage://local-images/vdm/icon/subregion.png?width=128&height=128', '', '', '', '', '', '', 'utf8mb4', 'utf8mb4_unicode_ci', 'InnoDB', 'DYNAMIC', 'Subregions', 'Subregion', '', '', '', '', '', '', '', '', '', '', '', 'W0NVU1RPTUNPREU9c2F2ZUdVSURQb3dlcl0=', 'W0NVU1RPTUNPREU9Zm9ybUNvbnRyb2xsZXJFZGl0XQ==', '', '', 'W0NVU1RPTUNPREU9c2V0R1VJREZvcm1Qb3dlcl0=', '', '', '', '', '', '', '', '', 'Subregions', 2, 'LS0NCi0tIER1bXBpbmcgZGF0YSBmb3IgdGFibGUgYCNfX2RlbW9fc3VicmVnaW9uYA0KLS0NCg0KSU5TRVJUIElOVE8gYCNfX2RlbW9fc3VicmVnaW9uYCAoYGlkYCwgYG5hbWVgLCBgcmVnaW9uYCwgYHdpa2lkYXRhaWRgLCBgbWV0YWtleWAsIGBtZXRhZGVzY2AsIGBtZXRhZGF0YWAsIGBvcmRlcmluZ2AsIGBwdWJsaXNoZWRgLCBgbW9kaWZpZWRgLCBgY3JlYXRlZGAsIGBoaXRzYCwgYHZlcnNpb25gLCBgcGFyYW1zYCwgYGd1aWRgKSBWQUxVRVMNCigxLCAnU291dGhlcm4gQWZyaWNhJywgJzJlNDg3MzRiLTk5NzgtNGZlMS1hZTkwLWI3NWUzZGU5MDUzZCcsICdRMjczOTQnLCAnJywgJycsICd7XCJyb2JvdHNcIjpcIlwiLFwiYXV0aG9yXCI6XCJcIixcInJpZ2h0c1wiOlwiXCJ9JywgMSwgMSwgJzIwMjUtMDMtMjcgMTQ6MTI6NTknLCAnMjAyNS0wMy0yNSAxNTo0MDoxMycsICcnLCAyNSwgJycsICdjMWNjZTkzMC01MmFhLTQ4ZmMtYjVkNC1mZDVjOTcyOWE3MzUnKSwNCigyLCAnQ2VudHJhbCBBc2lhJywgJ2ZlYTg1MDM2LTg4MjItNGQ5Ni1iOGM3LTViZjQ1MTE0YzQwYScsICdRMjcyNzUnLCAnJywgJycsICcnLCAnJywgMSwgJycsICcyMDI1LTAzLTI4IDA5OjQ3OjUzJywgJycsIDEsICcnLCAnMmNjY2IwNzgtYTIzYi00NWIyLWJmYTUtYWVmNGVmZTk1ZWM0Jyk7', 'Sub-Regions', 1, '{\"privacy\":{\"activate\":\"0\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"2c74c3f5-2bfc-4916-b105-4f5d5e2bea25\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"0\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2025-03-25 13:19:47', '2025-03-28 12:24:16', 25, '', 1, 253);
 
 --
 -- Dumping data for table `#__componentbuilder_custom_admin_view`
@@ -2205,7 +2211,8 @@ INSERT INTO `#__componentbuilder_custom_code` (`id`, `code`, `component`, `comme
 (397, 'CQkvKiogQHZhciBKb29tbGFcQ01TXFdlYkFzc2V0XFdlYkFzc2V0TWFuYWdlciAkd2EgKi8NCgkJJHdhID0gJHRoaXMtPmdldERvY3VtZW50KCktPmdldFdlYkFzc2V0TWFuYWdlcigpOw0KDQoJCS8vIHNldCB0aGUgdXJsIGFzIG5lZWRlZA0KCQkkYXBwID0gSm9vbWxhX19fMzk0MDMwNjJfODRmYl80NmUwX2JhYzRfMDAyM2Y3NjZlODI3X19fUG93ZXI6OmdldEFwcGxpY2F0aW9uKCk7DQoJCSR1cmwgPSAnJzsNCgkJaWYgKCRhcHAtPmlzQ2xpZW50KCdzaXRlJykpDQoJCXsNCgkJCSR1cmwgPSBKb29tbGFfX19lZWNjMTQzZV9iNWNmXzRjMzNfYmE0ZF85N2RhMWRmNjE0MjJfX19Qb3dlcjo6cm9vdCgpOw0KCQl9DQoNCgkJLy8gZ2V0IHRoZSBmb3JtIHRva2VuDQoJCSR0b2tlbiA9IEpvb21sYV9fXzViYTM4NTEzXzVjNGZfNGIwZF85MzVlXzQ5ZTk4NmE2YmNlOF9fX1Bvd2VyOjpnZXRGb3JtVG9rZW4oKTsNCgkJJGVudGl0eSA/Pz0gJHRoaXMtPml0ZW0tPmd1aWQgPz8gMDsNCgkJJHRhcmdldCA/Pz0gYmFzZTY0X2VuY29kZSgnW1tbdmlld11dXScpOw0KDQoJCS8vIERlZmluZSB0aGUgY29uZmlndXJhdGlvbiBmb3IgdGhlIHVwbG9hZGVyDQoJCSR1cGxvYWRlckNvbmZpZyA9IFsNCgkJCSJlbmRwb2ludF90eXBlIiA9PiAieyR1cmx9aW5kZXgucGhwP29wdGlvbj1jb21fW1tbY29tcG9uZW50XV1dJnRhc2s9YWpheC5bW1thcmcyXV1dJmZvcm1hdD1qc29uJnJhdz10cnVlJnskdG9rZW59PTEmdGFyZ2V0PXskdGFyZ2V0fSIsDQoJCQkidGFyZ2V0X2NsYXNzIiA9PiAiW1tbYXJnMF1dXSIsDQoJCQkiW1tbYXJnMV1dXSIgPT4gWw0KCQkJCSJlbmRwb2ludF91cGxvYWQiID0+ICJ7JHVybH1pbmRleC5waHA/b3B0aW9uPWNvbV9bW1tjb21wb25lbnRdXV0mdGFzaz1hamF4LltbW2FyZzNdXV0mZm9ybWF0PWpzb24mcmF3PXRydWUmeyR0b2tlbn09MSZlbnRpdHk9eyRlbnRpdHl9JnRhcmdldD17JHRhcmdldH0iLA0KCQkJCSJlbmRwb2ludF9kaXNwbGF5IiA9PiAieyR1cmx9aW5kZXgucGhwP29wdGlvbj1jb21fW1tbY29tcG9uZW50XV1dJnRhc2s9YWpheC5bW1thcmc0XV1dJmZvcm1hdD1qc29uJnJhdz10cnVlJnskdG9rZW59PTEmZW50aXR5PXskZW50aXR5fSZ0YXJnZXQ9eyR0YXJnZXR9IiwNCgkJCQkiZW5kcG9pbnRfZGVsZXRlIiA9PiAieyR1cmx9aW5kZXgucGhwP29wdGlvbj1jb21fW1tbY29tcG9uZW50XV1dJnRhc2s9YWpheC5bW1thcmc1XV1dJmZvcm1hdD1qc29uJnJhdz10cnVlJnskdG9rZW59PTEiLA0KCQkJXSwNCgkJXTsNCg0KCQkvLyBDb252ZXJ0IHRoZSBQSFAgYXJyYXkgdG8gYSBKYXZhU2NyaXB0IG9iamVjdA0KCQkkdXBsb2FkZXJDb25maWdKc29uID0ganNvbl9lbmNvZGUoJHVwbG9hZGVyQ29uZmlnKTsNCg0KCQkvLyBBZGQgdGhlIGlubGluZSBzY3JpcHQgd2l0aCB0aGUgdXBsb2FkZXIgY29uZmlndXJhdGlvbg0KCQkkd2EtPmFkZElubGluZVNjcmlwdCgiDQoJCQl3aW5kb3cuVkRNID0gd2luZG93LlZETSB8fCB7fTsNCgkJCXdpbmRvdy5WRE0udWlraXQgPSB3aW5kb3cuVkRNLnVpa2l0IHx8IHt9Ow0KCQkJd2luZG93LlZETS51aWtpdC5jb25maWcgPSAkdXBsb2FkZXJDb25maWdKc29uOw0KCQkiKTs=', '', 1, '', 'vdmUploaderConfig', '', '', '', 'vdmUploaderConfig', 2, '', '', '', 1, '2024-09-10 01:01:26', '2024-10-08 00:54:26', 12, '', 215),
 (398, 'CQlIdG1sOjpfKCdzY3JpcHQnLCAnbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS91aWtpdC12My9qcy91aWtpdC5taW4uanMnLCBbJ3ZlcnNpb24nID0+ICdhdXRvJ10pOw0KCQlIdG1sOjpfKCdzY3JpcHQnLCAnbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS91aWtpdC12My9qcy91aWtpdC1pY29ucy5taW4uanMnLCBbJ3ZlcnNpb24nID0+ICdhdXRvJ10pOw0KCQlIdG1sOjpfKCdzY3JpcHQnLCAnaHR0cHM6Ly9jZG4uanNkZWxpdnIubmV0L2doL3ZkbS1pby91aWtpdEAzLjAuMC9kaXN0L2pzL3ZkbS5taW4uanMnLCBbJ3ZlcnNpb24nID0+ICdhdXRvJ10pOw0KCQlIdG1sOjpfKCdzdHlsZXNoZWV0JywgJ21lZGlhL2NvbV9bW1tjb21wb25lbnRdXV0vdWlraXQtdjMvY3NzL3Vpa2l0Lm1pbi5jc3MnLCBbJ3ZlcnNpb24nID0+ICdhdXRvJ10pOw==', '', 1, '', 'addUikitThreeToAdminViews', '', '', '', 'addUikitThreeToAdminViews', 2, '', '', '', 1, '2024-09-10 01:03:38', '2024-09-16 18:12:10', 3, '', 216),
 (400, 'CQkJLy8gR2V0IEFwcGxpY2F0aW9uIG9iamVjdA0KCQkJJHRoaXMtPmFwcCA/Pz0gSm9vbWxhX19fMzk0MDMwNjJfODRmYl80NmUwX2JhYzRfMDAyM2Y3NjZlODI3X19fUG93ZXI6OmdldEFwcGxpY2F0aW9uKCk7DQoJCQkkdGhpcy0+YXBwLT5lbnF1ZXVlTWVzc2FnZSgnPGgzPlVubG9jayB0aGUgUG93ZXIgb2YgSm9vbWxhISBEZXZlbG9wbWVudDwvaDM+PHA+Q3VyaW91cyBhYm91dCBob3cgdGhpcyA8Yj5bW1thcmcwXV1dPC9iPiBjb21wb25lbnQgd2FzIGJ1aWx0PyBEaXNjb3ZlciB0aGUgcG93ZXJmdWwgSm9vbWxhISBDb21wb25lbnQgQnVpbGRlciAoPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFyZ2V0PSJfYmxhbmsiIHRpdGxlPSJKb29tbGEhIENvbXBvbmVudCBCdWlsZGVyIj5KQ0I8L2E+KSwgYSB0b29sIHRoYXQgc2ltcGxpZmllcyBhbmQgZW5oYW5jZXMgY29tcG9uZW50IGRldmVsb3BtZW50LiBKb2luIHVzIG9uIDxhIGhyZWY9Imh0dHBzOi8vZ2l0LnZkbS5kZXYvam9vbWxhIiB0YXJnZXQ9Il9ibGFuayIgdGl0bGU9Ikpvb21sYSEgQ29tcG9uZW50IEJ1aWxkZXIiPkdJVkVEPC9hPiB0byBleHBsb3JlIG1vcmUgYW5kIHNlZSBob3cgeW91IGNhbiBjcmVhdGUgeW91ciBvd24gY3VzdG9tIGNvbXBvbmVudHMuIFRoZSBmdXR1cmUgb2YgPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFyZ2V0PSJfYmxhbmsiIHRpdGxlPSJKb29tbGEgQ29tcG9uZW50IEJ1aWxkZXIiPkpvb21sYSEgRGV2ZWxvcG1lbnQ8L2E+IHN0YXJ0cyBoZXJlITwvcD4nLCAnSW5mbycpOw0K', '', 1, '', 'unlockThePowerOfJoomlaDevelopment', '', '', '', 'Unlock the Power of Joomla! Development', 2, '', '', '', 1, '2024-09-16 00:00:42', '2024-09-16 16:17:20', 5, '', 218),
-(411, '	/**
	 * The Spreadsheet Headers
	 *
	 * @var   array
	 * @since 5.0.2
	 */
	protected static array $SpreadsheetHeaders = [];

	/**
	 * The Item Import Fields
	 *
	 * @var   array
	 * @since 5.0.2
	 */
	protected static array $ItemImportFields = [];

	/**
	 * Get the list of headers to show in column field
	 *
	 * @return  array  The list of headers
	 * @since   5.0.2
	 */
	public static function getSpreadsheetHeaders(): array
	{
		$endColumn = 'DA';
		$column = 'A';
		$options = [];
		while ($column !== $endColumn)
		{
			$options[$column] = self::getSpreadsheetHeader($column);
			$column = ++$column;
		}
		return $options;
	}

	/**
	 * Get the header column value (name)
	 *
	 * @return  string  The header value
	 * @since   5.0.2
	 */
	protected static function getSpreadsheetHeader(string $column): string
	{
		return self::$SpreadsheetHeaders[$column] ?? $column;
	}

	/**
	 * Set the header column values
	 *
	 * @return  void
	 * @since   5.0.2
	 */
	public static function setSpreadsheetHeaders(array $headers): void
	{
		self::$SpreadsheetHeaders = $headers;
	}

	/**
	 * Retrieves a list of import fields from the item entity.
	 *
	 * @param bool  $simple The switch to return simple list (to leave out the link data)
	 *
	 * @return array Returns an associative array where the key is the table.column name and the value 
	 *                           is the label of the column (potentially including additional information).
	 * @since  5.0.2
	 */
	public static function getItemImportFields(bool $simple = false): array
	{
		if (!empty(self::$ItemImportFields))
		{
			return self::$ItemImportFields;
		}
[[[arg0]]]
		self::$ItemImportFields = self::getImportFields($parent, $tables, $simple);

		return self::$ItemImportFields;
	}

	/**
	 * Retrieves a list of target fields from the specified tables, with appropriate filtering based on
	 * rules like ignoring certain columns, linking rules, and user roles.
	 *
	 * @param string $parent The parent entity to check for upstream linking.
	 * @param array  $tables An associative array of tables and whether to add GUID for each table. 
	 *                           The keys represent table names, and the values are booleans to indicate
	 *                           whether to include the 'guid' column.
	 * @param bool  $simple The switch to return simple list (to leave out the link data)
	 *
	 * @return array Returns an associative array where the key is the table.column name and the value 
	 *                           is the label of the column (potentially including additional information).
	 * @since  5.0.2
	 */
	protected static function getImportFields(string $parent, array $tables, bool $simple = false): array
	{
		// Get the current user object.
		$user = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();

		$ignore = [];
		$target_fields = [];

		// Loop through each table provided.
		foreach ($tables as $table => $add_guid)
		{
			// Retrieve the fields for the table. If no fields, default to an empty array.
			$items = Super___ff8d5fdb_2d1f_4178_bd18_a43b8efd1068___Power::_('Table')->fields($table, false, true) ?? [];

			// Process each field if the table contains any fields.
			foreach ($items as $item)
			{
				$field_name = $item['name'];

				// Ignore downstream linking columns.
				if (isset($ignore[$table][$field_name]))
				{
					continue;
				}

				// Skip adding the 'guid' field if the table doesn't require it.
				if ($field_name === 'guid' && !$add_guid)
				{
					continue;
				}

				// Skip fields [ add more field you would like to skip in all targeted tables ]
				if ([[[arg1]]]$field_name === 'access' ||
					$field_name === 'metadata' ||
					$field_name === 'metakey' ||
					$field_name === 'metadesc' )
				{
					continue;
				}

				// Initialize additional info to be appended to the field label.
				$info = ' - ' . $table . '->' . $field_name . ':' . strtolower($item['db']['type']);

				// Handle linking information if available.
				if (!empty($item['link']['entity']) &&
					!empty($item['link']['value']) &&
					!empty($item['link']['key']))
				{
					
					// Ignore upstream linking columns.
					if (isset($ignore[$item['link']['entity']][$item['link']['key']]))
					{
						continue;
					}

					// Skip parent linkers for non-parent tables.
					if ($table !== $parent && $item['link']['entity'] === $parent)
					{
						continue;
					}

					$info .= ' >>> ' . $item['link']['entity'] . '->[' . $item['link']['value'] . ']->' . $item['link']['key'];
					$ignore[$item['link']['entity']] = $item['link']['key'];
				}

				if ($simple)
				{
					$target_fields[$table . '.' . $field_name] = Text::_($item['label']);
				}
				else
				{
					// For other users, append the additional field info.
					$target_fields[$table . '.' . $field_name] = Text::_($item['label']) . $info;
				}

				// Mark the current field as ignored for future checks.
				$ignore[$table][$field_name] = true;
			}
		}

		return $target_fields;
	}

	/**
	 * Retrieves a dynamic values of the import subform for item mapping
	 *
	 * @return array|null the values
	 * @since  5.0.2
	 */
	public static function getItemImportSubformValues(): ?array
	{
		$subform_name = 'maps';
		$values = [];
		$headers = self::getSpreadsheetHeaders();
		$target_fields = self::getItemImportFields();
		$number = 0;
		foreach ($headers as $header => $text)
		{
			$values["{$subform_name}{$number}"] = ['column' => $header, 'target' => self::getImportFieldMatch($text, $target_fields)];
			$number++;
		}
		return $values;
	}

	/**
	 * Matches a name value against the keys and values of a given array.
	 * The key must match strictly (===) and the value must start with the name (case-insensitive).
	 *
	 * @param string $name   The name to search for.
	 * @param array  $fields The array of fields to match against. The array should have keys and values.
	 *
	 * @return string|null Returns the key if a match is found, or null if no match is found.
	 * @since  5.0.2
	 */
	protected static function getImportFieldMatch(string $name, array $fields): string
	{
		foreach ($fields as $key => $value)
		{
			// Check if the name strictly matches the key
			if ($key === $name)
			{
				return $key;
			}

			// Check if the name starts with the value (case-insensitive)
			if (self::startsWithIgnoreCase($value, $name . ' '))
			{
				return $key;
			}
		}

		// Return null if no match is found
		return '';
	}

	/**
	 * Helper function to check if a string starts with another string (case-insensitive).
	 *
	 * @param string $haystack  The string to check.
	 * @param string $needle    The string to match the beginning.
	 *
	 * @return bool Returns true if $needle matches the start of $haystack, false otherwise.
	 * @since  5.0.2
	 */
	protected static function startsWithIgnoreCase(string $haystack, string $needle): bool
	{
		return stripos($haystack, $needle) === 0;
	}', '', 1, '', 'getItemImportFields', '', '', '', 'helper::getItemImportFields', 2, '', '', '', 1, '2025-02-17 10:49:13', '2025-02-21 14:30:41', 9, '', 227);
+(411, '	/**
	 * The Spreadsheet Headers
	 *
	 * @var   array
	 * @since 5.0.2
	 */
	protected static array $SpreadsheetHeaders = [];

	/**
	 * The Item Import Fields
	 *
	 * @var   array
	 * @since 5.0.2
	 */
	protected static array $ItemImportFields = [];

	/**
	 * Get the list of headers to show in column field
	 *
	 * @return  array  The list of headers
	 * @since   5.0.2
	 */
	public static function getSpreadsheetHeaders(): array
	{
		$endColumn = 'DA';
		$column = 'A';
		$options = [];
		while ($column !== $endColumn)
		{
			$options[$column] = self::getSpreadsheetHeader($column);
			$column = ++$column;
		}
		return $options;
	}

	/**
	 * Get the header column value (name)
	 *
	 * @return  string  The header value
	 * @since   5.0.2
	 */
	protected static function getSpreadsheetHeader(string $column): string
	{
		return self::$SpreadsheetHeaders[$column] ?? $column;
	}

	/**
	 * Set the header column values
	 *
	 * @return  void
	 * @since   5.0.2
	 */
	public static function setSpreadsheetHeaders(array $headers): void
	{
		self::$SpreadsheetHeaders = $headers;
	}

	/**
	 * Retrieves a list of import fields from the item entity.
	 *
	 * @param bool  $simple The switch to return simple list (to leave out the link data)
	 *
	 * @return array Returns an associative array where the key is the table.column name and the value 
	 *                           is the label of the column (potentially including additional information).
	 * @since  5.0.2
	 */
	public static function getItemImportFields(bool $simple = false): array
	{
		if (!empty(self::$ItemImportFields))
		{
			return self::$ItemImportFields;
		}
[[[arg0]]]
		self::$ItemImportFields = self::getImportFields($parent, $tables, $simple);

		return self::$ItemImportFields;
	}

	/**
	 * Retrieves a list of target fields from the specified tables, with appropriate filtering based on
	 * rules like ignoring certain columns, linking rules, and user roles.
	 *
	 * @param string $parent The parent entity to check for upstream linking.
	 * @param array  $tables An associative array of tables and whether to add GUID for each table. 
	 *                           The keys represent table names, and the values are booleans to indicate
	 *                           whether to include the 'guid' column.
	 * @param bool  $simple The switch to return simple list (to leave out the link data)
	 *
	 * @return array Returns an associative array where the key is the table.column name and the value 
	 *                           is the label of the column (potentially including additional information).
	 * @since  5.0.2
	 */
	protected static function getImportFields(string $parent, array $tables, bool $simple = false): array
	{
		// Get the current user object.
		$user = Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();

		$ignore = [];
		$target_fields = [];

		// Loop through each table provided.
		foreach ($tables as $table => $add_guid)
		{
			// Retrieve the fields for the table. If no fields, default to an empty array.
			$items = Super___ff8d5fdb_2d1f_4178_bd18_a43b8efd1068___Power::_('Table')->fields($table, false, true) ?? [];

			// Process each field if the table contains any fields.
			foreach ($items as $item)
			{
				$field_name = $item['name'];

				// Ignore downstream linking columns.
				if (isset($ignore[$table][$field_name]))
				{
					continue;
				}

				// Skip adding the 'guid' field if the table doesn't require it.
				if ($field_name === 'guid' && !$add_guid)
				{
					continue;
				}

				// Skip fields [ add more field you would like to skip in all targeted tables ]
				if ([[[arg1]]]$field_name === 'access' ||
					$field_name === 'metadata' ||
					$field_name === 'metakey' ||
					$field_name === 'metadesc' )
				{
					continue;
				}

				// Initialize additional info to be appended to the field label.
				$info = ' - ' . $table . '->' . $field_name . ':' . strtolower($item['db']['type']);

				// Handle linking information if available.
				if (!empty($item['link']['entity']) &&
					!empty($item['link']['value']) &&
					!empty($item['link']['key']))
				{
					
					// Ignore upstream linking columns.
					if (isset($ignore[$item['link']['entity']][$item['link']['key']]))
					{
						continue;
					}

					// Skip parent linkers for non-parent tables.
					if ($table !== $parent && $item['link']['entity'] === $parent)
					{
						continue;
					}

					$info .= ' >>> ' . $item['link']['entity'] . '->[' . $item['link']['value'] . ']->' . $item['link']['key'];
					$ignore[$item['link']['entity']] = $item['link']['key'];
				}

				if ($simple)
				{
					$target_fields[$table . '.' . $field_name] = Text::_($item['label']);
				}
				else
				{
					// For other users, append the additional field info.
					$target_fields[$table . '.' . $field_name] = Text::_($item['label']) . $info;
				}

				// Mark the current field as ignored for future checks.
				$ignore[$table][$field_name] = true;
			}
		}

		return $target_fields;
	}

	/**
	 * Retrieves a dynamic values of the import subform for item mapping
	 *
	 * @return array|null the values
	 * @since  5.0.2
	 */
	public static function getItemImportSubformValues(): ?array
	{
		$subform_name = 'maps';
		$values = [];
		$headers = self::getSpreadsheetHeaders();
		$target_fields = self::getItemImportFields();
		$number = 0;
		foreach ($headers as $header => $text)
		{
			$values["{$subform_name}{$number}"] = ['column' => $header, 'target' => self::getImportFieldMatch($text, $target_fields)];
			$number++;
		}
		return $values;
	}

	/**
	 * Matches a name value against the keys and values of a given array.
	 * The key must match strictly (===) and the value must start with the name (case-insensitive).
	 *
	 * @param string $name   The name to search for.
	 * @param array  $fields The array of fields to match against. The array should have keys and values.
	 *
	 * @return string|null Returns the key if a match is found, or null if no match is found.
	 * @since  5.0.2
	 */
	protected static function getImportFieldMatch(string $name, array $fields): string
	{
		foreach ($fields as $key => $value)
		{
			// Check if the name strictly matches the key
			if ($key === $name)
			{
				return $key;
			}

			// Check if the name starts with the value (case-insensitive)
			if (self::startsWithIgnoreCase($value, $name . ' '))
			{
				return $key;
			}
		}

		// Return null if no match is found
		return '';
	}

	/**
	 * Helper function to check if a string starts with another string (case-insensitive).
	 *
	 * @param string $haystack  The string to check.
	 * @param string $needle    The string to match the beginning.
	 *
	 * @return bool Returns true if $needle matches the start of $haystack, false otherwise.
	 * @since  5.0.2
	 */
	protected static function startsWithIgnoreCase(string $haystack, string $needle): bool
	{
		return stripos($haystack, $needle) === 0;
	}', '', 1, '', 'getItemImportFields', '', '', '', 'helper::getItemImportFields', 2, '', '', '', 1, '2025-02-17 10:49:13', '2025-02-21 14:30:41', 9, '', 227),
+(412, 'CS8qKg0KCSAqIE1ldGhvZCB0byBlZGl0IGFuIGV4aXN0aW5nIHJlY29yZC4NCgkgKg0KCSAqIEBwYXJhbSAgIHN0cmluZyAgJGtleSAgICAgVGhlIG5hbWUgb2YgdGhlIHByaW1hcnkga2V5IG9mIHRoZSBVUkwgdmFyaWFibGUuDQoJICogQHBhcmFtICAgc3RyaW5nICAkdXJsVmFyICBUaGUgbmFtZSBvZiB0aGUgVVJMIHZhcmlhYmxlIGlmIGRpZmZlcmVudCBmcm9tIHRoZSBwcmltYXJ5IGtleQ0KCSAqICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNvbWV0aW1lcyByZXF1aXJlZCB0byBhdm9pZCByb3V0ZXIgY29sbGlzaW9ucykuDQoJICoNCgkgKiBAcmV0dXJuICBib29sZWFuICBUcnVlIGlmIGFjY2VzcyBsZXZlbCBjaGVjayBhbmQgY2hlY2tvdXQgcGFzc2VzLCBmYWxzZSBvdGhlcndpc2UuDQoJICoNCgkgKiBAc2luY2UgICAxLjYNCgkgKi8NCglwdWJsaWMgZnVuY3Rpb24gZWRpdCgka2V5ID0gbnVsbCwgJHVybFZhciA9IG51bGwpDQoJew0KCQkvLyBmb3IgbW9kYWwgdGl0bGUga2V5IHNlbGVjdGlvbiAodW5pcXVlIGtleSB0byBkbyBtYXBwaW5nKQ0KCQkkdGl0bGVLZXkgPSAkdGhpcy0+aW5wdXQtPmdldCgndGl0bGVLZXknLCAnaWQnLCAnd29yZCcpOw0KCQkkZ3VpZCA9IG51bGw7DQoJCSR2YWx1ZSA9IG51bGw7DQoNCiAJCS8vIERldGVybWluZSB0aGUgbmFtZSBvZiB0aGUgcHJpbWFyeSBrZXkgZm9yIHRoZSBkYXRhLg0KCQlpZiAoZW1wdHkoJGtleSkpDQoJCXsNCgkJCSRtb2RlbCA9ICR0aGlzLT5nZXRNb2RlbCgpOw0KCQkJJHRhYmxlID0gJG1vZGVsLT5nZXRUYWJsZSgpOw0KCQkJJGtleSA9ICR0YWJsZS0+Z2V0S2V5TmFtZSgpOw0KCQl9DQoNCgkJaWYgKCR0aXRsZUtleSA9PT0gJ2d1aWQnKQ0KCQl7DQoJCQkkZ3VpZCA9ICR0aGlzLT5pbnB1dC0+Z2V0KCdndWlkJywgbnVsbCwgJ3N0cmluZycpOw0KCQl9DQoNCgkJaWYgKCRndWlkICE9PSBudWxsICYmIFN1cGVyX19fOWM1MTNiYWZfYjI3OV80M2ZkX2FlMjlfYTU4NWM4Y2JjNGYwX19fUG93ZXI6OnZhbGlkKCRndWlkKSkNCgkJew0KCQkJJHZhbHVlID0gU3VwZXJfX185YzUxM2JhZl9iMjc5XzQzZmRfYWUyOV9hNTg1YzhjYmM0ZjBfX19Qb3dlcjo6aXRlbSgkZ3VpZCwgJyMjI3ZpZXcjIyMnLCAnYS4nIC4gJGtleSwgJyMjI2NvbXBvbmVudCMjIycpOw0KCQl9DQoNCgkJaWYgKCR2YWx1ZSAhPT0gbnVsbCkNCgkJew0KCQkJJHRoaXMtPmlucHV0LT5zZXQoJGtleSwgJHZhbHVlKTsNCgkJfQ0KDQoJCXJldHVybiBwYXJlbnQ6OmVkaXQoJGtleSwgJHVybFZhcik7DQoJfQ==', '', 1, '', 'formControllerEdit', '', '', '', 'FormController Edit Method', 2, '', '', '', 1, '2025-03-26 18:02:02', '2025-03-26 19:31:58', 5, '', 228);
 
 --
 -- Dumping data for table `#__componentbuilder_class_property`
@@ -2588,10 +2595,15 @@ INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`,
 (100, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Email (required)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"email\\\"\\n\\tlabel=\\\"Email\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdescription=\\\"Enter Email\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tvalidate=\\\"email\\\"\\n\\tmessage=\\\"Error! Please add email address here.\\\"\\n\\thint=\\\"demo@example.com\\\"\\n\\/>\"', 1, '2015-05-05 23:44:32', '2024-09-15 22:24:59', 5, '', 285, '10c1eccb-b3c3-4325-a056-45a72d116fd8', '', '', '', '', ''),
 (158, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Image', 'NOT NULL', '', '69957007-e3d4-4976-a32b-611d02dbad71', '\"<field\\n\\ttype=\\\"media\\\"\\n\\tname=\\\"image\\\"\\n\\tlabel=\\\"Image\\\"\\n\\/>\"', 1, '2015-04-29 14:00:56', '2020-06-07 02:17:46', 2, '', 45, '0d6970af-b361-4f65-84f6-0eb0c5f09bad', '', '', '', '', ''),
 (196, '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', '', '', '', 'Mobile Phone (required)', 'NOT NULL', '', '1c6c519c-3bc8-4914-8940-3e9591b0bce6', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"mobile_phone\\\"\\n\\tlabel=\\\"Mobile Phone\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdescription=\\\"Enter Mobile Phone Number\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tvalidated=\\\"tel\\\"\\n\\tmessage=\\\"Error! Please add mobile phone number here.\\\"\\n\\thint=\\\"Mobile Phone Here\\\"\\n\\/>\"', 1, '2015-04-07 22:12:58', '2024-09-16 23:27:41', 5, '', 7, '65933a19-243a-48b2-aae9-34e2da710051', '', '', '', '', ''),
-(199, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Name (Key - Required)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"name\\\"\\n\\tlabel=\\\"Name\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter Name Here\\\"\\n\\tclass=\\\"text_area\\\"\\n\\treadonly=\\\"false\\\"\\n\\tdisabled=\\\"false\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add name here.\\\"\\n\\thint=\\\"Name Here\\\"\\n\\/>\"', 1, '2015-03-19 17:30:59', '2024-10-10 22:13:01', 11, '', 4, '5d3d34dd-4876-4c6a-86ab-b4e162f22c08', '', '', '', '', ''),
+(199, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Name (Key - Required)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"name\\\"\\n\\tlabel=\\\"Name\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter Name Here\\\"\\n\\tclass=\\\"text_area\\\"\\n\\treadonly=\\\"false\\\"\\n\\tdisabled=\\\"false\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add name here.\\\"\\n\\thint=\\\"Name Here\\\"\\n\\/>\"', 1, '2015-03-19 17:30:59', '2025-03-26 11:23:23', 12, '', 4, '5d3d34dd-4876-4c6a-86ab-b4e162f22c08', '', '', '', '', ''),
 (203, '', '', '', '', '', '', '', '', 1, '', 'INT', '', '', '', 'Not Required', 'NOT NULL', '', '82f1b5ca-bb9b-44d7-9a7a-9a03fb2a31dd', '\"<field\\n\\ttype=\\\"hidden\\\"\\n\\tname=\\\"not_required\\\"\\n\\tdefault=\\\"\\u4e00_\\u4e00\\\"\\n\\/>\"', 1, '2015-05-08 16:19:16', '2023-09-27 07:57:19', 16, '', 19, 'da5e6901-6958-40e5-a4f5-6822d6fe57ac', '', '', '', '', ''),
 (280, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Website (no required)', 'NOT NULL', '', '8df6e07e-2b16-43ed-a18d-2059fa44cdf1', '\"<field\\n\\ttype=\\\"url\\\"\\n\\tname=\\\"website\\\"\\n\\tlabel=\\\"Website\\\"\\n\\tsize=\\\"60\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter website address\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"url\\\"\\n\\tvalidated=\\\"url\\\"\\n\\tscheme=\\\"http,https\\\"\\n\\tmessage=\\\"Error! Please add website here.\\\"\\n\\thint=\\\"http:\\/\\/www.example.com\\\"\\n\\/>\"', 1, '2015-04-08 00:36:16', '2024-09-16 23:30:59', 3, '', 105, '6c3a6983-d1bf-4e5e-9e99-deea00b0cefd', '', '', '', '', ''),
 (324, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'URL', 'NOT NULL', '', '8df6e07e-2b16-43ed-a18d-2059fa44cdf1', '\"<field\\n\\ttype=\\\"url\\\"\\n\\tname=\\\"url\\\"\\n\\tlabel=\\\"URL\\\"\\n\\tsize=\\\"60\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter url\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"url\\\"\\n\\tvalidated=\\\"url\\\"\\n\\tscheme=\\\"http,https\\\"\\n\\tmessage=\\\"Error! Please add url here.\\\"\\n\\thint=\\\"http:\\/\\/www.example.com\\\"\\n\\/>\"', 1, '2015-05-19 16:08:22', '2022-06-18 10:23:24', 4, '', 378, 'd29d6854-bb4a-4fa2-83a1-5a1b9c9a0eaf', '', '', '', '', ''),
+(583, '', '', '', '', '', '', '', '', 7, '', 'CHAR', 2, '', '', 'ISO Three (country)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"iso3\\\"\\n\\tlabel=\\\"ISO 3\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"3\\\"\\n\\tdescription=\\\"ISO 3166-1 alpha-3 codes are three-letter codes used to represent countries and territories.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"WORD\\\"\\n\\tmessage=\\\"Error! Please add three-letter country code here.\\\"\\n\\thint=\\\"NAM\\\"\\n\\/>\"', 1, '2015-07-09 14:03:26', '2025-03-26 20:35:45', 12, '', 561, '95f46f99-0909-4a47-879b-ede06ef35fb8', '', '', '', '', ''),
+(584, '', '', '', '', '', '', '', '', 7, '', 'CHAR', 2, '', '', 'ISO Two (country)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"iso2\\\"\\n\\tlabel=\\\"ISO 2\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"2\\\"\\n\\tdescription=\\\"ISO 3166-1 alpha-2 codes are two-letter codes used to represent countries and territories.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"WORD\\\"\\n\\tmessage=\\\"Error! Please add two-letter country code here.\\\"\\n\\thint=\\\"NA\\\"\\n\\/>\"', 1, '2015-07-09 14:05:40', '2025-03-27 13:10:32', 13, '', 560, '2039d1c3-162c-401c-96fe-f127683ee3fe', '', '', '', '', ''),
+(586, '', '', '', '', '', '', '', '', 7, '', 'CHAR', 1, '', '', 'Code Three (currency)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"codethree\\\"\\n\\tlabel=\\\"Code Three\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"3\\\"\\n\\tdefault=\\\"\\\"\\n\\tdescription=\\\"The following is a list of active codes of official ISO 4217 currency names.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"WORD\\\"\\n\\tmessage=\\\"Error! Please add three-letter currency code here.\\\"\\n\\thint=\\\"NAD\\\"\\n\\/>\"', 1, '2015-07-09 14:33:44', '2025-03-27 13:14:31', 3, '', 558, '59f0d051-768e-41de-87a0-f47551f7d0d1', '', '', '', '', ''),
+(587, '', '', '', '', '', '', '', '', 10, '', 'INT', 2, '', '', 'Numeric Code (currency)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"numeric_code\\\"\\n\\tlabel=\\\"Numeric Code\\\"\\n\\tdescription=\\\"There is also a three-digit code number assigned to each currency, in the same manner as there is also a three-digit code number assigned to each country as part of ISO 3166. This numeric code is usually the same as the ISO 3166-1 numeric code. For example, USD (United States dollar) has code 840 which is also the numeric code for the US (United States).\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"INT\\\"\\n\\tmessage=\\\"Error! Please add numeric code here.\\\"\\n\\thint=\\\"516\\\"\\n\\/>\"', 1, '2015-07-09 14:40:52', '2025-03-27 13:15:41', 7, '', 557, '40da896f-5054-4bb2-aa58-1cdfb391f544', '', '', '', '', ''),
+(588, '', '', '', '', '', '', '', '', 11, '', 'CHAR', '', '', '', 'Symbol (currency)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"symbol\\\"\\n\\tlabel=\\\"Symbol\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"7\\\"\\n\\tdefault=\\\"\\\"\\n\\tdescription=\\\"A currency symbol is a graphic symbol used as a shorthand for a currency\'s name, especially in reference to amounts of money.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add currency symbol here.\\\"\\n\\thint=\\\"N$\\\"\\n\\/>\"', 1, '2015-07-09 14:44:24', '2024-10-10 22:11:16', 2, '', 556, 'c9a4c765-a0f9-42da-8fa9-df41ab70c448', '', '', '', '', ''),
 (599, '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Groups (multi)', 'NULL', 1, 'e2f31181-fbb3-4c3a-859d-72b6b0cff308', '\"<field\\n\\ttype=\\\"usergrouplist\\\"\\n\\tname=\\\"groups\\\"\\n\\tlabel=\\\"Group\\/s\\\"\\n\\tdescription=\\\"Select a group\\/s\\\"\\n\\tlayout=\\\"joomla.form.field.list-fancy-select\\\"\\n\\trequired=\\\"true\\\"\\n\\tmultiple=\\\"true\\\"\\n\\/>\"', 1, '2015-07-13 23:10:19', '2025-01-15 13:11:22', 10, '', 50, '59a0cad6-26cc-43b6-8af8-2242eb595d76', '', '', '', '', ''),
 (682, '', '', '', '', '', '', '', '', 1, '', 'TINYINT', 2, '', '', 'Add More', 'NULL', '', 'b868ed59-4208-4206-8504-95a35a74a11c', '\"<field\\n\\ttype=\\\"radio\\\"\\n\\tname=\\\"add\\\"\\n\\tlabel=\\\"Add More\\\"\\n\\tdescription=\\\"\\\"\\n\\tclass=\\\"btn-group btn-group-yesno\\\"\\n\\toption=\\\"1|Yes,0|No\\\"\\n\\tdefault=\\\"0\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2015-08-05 01:18:20', '2024-09-07 02:20:13', 8, '', 196, 'a66389aa-2323-4f44-8c23-ff44969639be', '', '', '', '', ''),
 (691, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Email (not required)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"email\\\"\\n\\tlabel=\\\"Email\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdescription=\\\"Enter Email (not required)\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"false\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add email address here.\\\"\\n\\thint=\\\"demo@example.com\\\"\\n\\/>\"', 1, '2015-08-16 17:21:15', '2025-02-21 11:20:53', 5, '', 285, '976f7e2d-68e3-497e-b4d1-6326d5b95078', '', '', '', '', ''),
@@ -2636,7 +2648,7 @@ INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`,
 (3401, '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', 2, '', '', 'File Extension', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"extension\\\"\\n\\tlabel=\\\"Extension\\\"\\n\\tdescription=\\\"The file extension is set here. No dot!\\\"\\n\\trequired=\\\"true\\\"\\n\\tmessage=\\\"Error! Please add the file extension here.\\\"\\n\\thint=\\\"jpg\\\"\\n\\/>\"', 1, '2020-09-07 22:21:14', '2024-09-15 23:37:40', 6, '', 1063, '080b92dc-a4b4-46b2-83d4-3430284f5e06', '', '', '', '', ''),
 (3402, '', '', '', '', '', '', '', '', 1024, '', 'VARCHAR', 2, '', '', 'File Path', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"file_path\\\"\\n\\tlabel=\\\"File path\\\"\\n\\tdescription=\\\"The file path is set here.\\\"\\n\\trequired=\\\"true\\\"\\n\\tmessage=\\\"Error! Please add some file path here.\\\"\\n\\thint=\\\"\\/home\\/user\\/location\\/filename.doc\\\"\\n\\/>\"', 1, '2020-09-07 22:29:12', '2024-09-15 23:36:05', 12, '', 1063, 'ed28e30c-30c3-4830-afdc-5a61bf25cd49', '', '', '', '', ''),
 (3403, '', '', '', '', '', '', '', '', 'Other', 36, 'VARCHAR', 2, '', '', 'GUID ENTITY', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"entity\\\"\\n\\tlabel=\\\"Entity GUID\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"40\\\"\\n\\tdescription=\\\"Globally Unique Identifier of entity\\\"\\n\\tclass=\\\"text_area\\\"\\n\\treadonly=\\\"true\\\"\\n\\trequired=\\\"false\\\"\\n\\tfilter=\\\"CMD\\\"\\n\\tvalidate=\\\"guid\\\"\\n\\thint=\\\"Auto Linked Entity\\\"\\n\\/>\"', 1, '2020-09-07 22:32:35', '2024-09-17 02:03:47', 5, '', 1064, '3f1fedeb-b943-42a7-88e7-c4f1eb1fd8a4', '', '', '', '', ''),
-(3404, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Entity Type (demo)', 'NULL', '', 'a51dfc06-1b9b-4d0a-86ba-f705bcd40d4d', '\"<field\\n\\ttype=\\\"list\\\"\\n\\tname=\\\"entity_type\\\"\\n\\tlabel=\\\"Entity Type\\\"\\n\\tdescription=\\\"The entity type the field belongs to.\\\"\\n\\tmessage=\\\"Error! Please select some entity type here.\\\"\\n\\trequired=\\\"true\\\"\\n\\toption=\\\"|Select an option,look|Look\\\"\\n\\/>\"', 1, '2020-09-07 22:37:18', '2024-09-17 02:04:20', 8, '', 1065, '2e24a9fe-5793-46be-b071-631c0b18d8f4', '', '', '', '', ''),
+(3404, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Entity Type (demo)', 'NULL', '', 'a51dfc06-1b9b-4d0a-86ba-f705bcd40d4d', '\"<field\\n\\ttype=\\\"list\\\"\\n\\tname=\\\"entity_type\\\"\\n\\tlabel=\\\"Entity Type\\\"\\n\\tdescription=\\\"The entity type the field belongs to.\\\"\\n\\tmessage=\\\"Error! Please select some entity type here.\\\"\\n\\trequired=\\\"true\\\"\\n\\toption=\\\"|Select an option,look|Look,country|Country,state|State,importer|Importer\\\"\\n\\/>\"', 1, '2020-09-07 22:37:18', '2025-03-28 10:18:55', 11, '', 1065, '2e24a9fe-5793-46be-b071-631c0b18d8f4', '', '', '', '', ''),
 (3405, '', '', '', '', '', '', '', '', 11, '', 'INT', 2, '', '', 'User ID', 'NULL', '', 'b0641980-5e78-42f6-972f-86aa607db23e', '\"<field\\n\\ttype=\\\"user\\\"\\n\\tname=\\\"user_id\\\"\\n\\tlabel=\\\"User\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2020-09-07 22:46:31', '2024-09-16 23:34:12', 4, '', 1066, '3dfab308-41de-4d11-9c94-4ba330a202ac', '', '', '', '', ''),
 (3406, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Username (User Map)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"username\\\"\\n\\tlabel=\\\"Login Name (Username)\\\"\\n\\tdescription=\\\"The username is set here.\\\"\\n\\trequired=\\\"true\\\"\\n\\tmessage=\\\"Error! Add the username here.\\\"\\n\\thint=\\\"Login Name Here\\\"\\n\\/>\"', -2, '2024-09-06 22:58:59', '0000-00-00 00:00:00', 1, '', 1067, '78a39c78-2432-4c95-bbac-e482a0f4aed9', '', '', '', '', ''),
 (3407, '', '', '', '', '', '', '', '', 11, '', 'INT', 2, '', '', 'User ID (Hidden)', 'NULL', '', '82f1b5ca-bb9b-44d7-9a7a-9a03fb2a31dd', '\"<field\\n\\ttype=\\\"hidden\\\"\\n\\tname=\\\"user_id\\\"\\n\\tdefault=\\\"0\\\"\\n\\/>\"', 1, '2020-09-07 23:11:49', '2024-09-07 02:29:24', 2, '', 1068, 'a0d7c091-1781-45fb-a71f-1447bad69614', '', '', '', '', ''),
@@ -2668,7 +2680,34 @@ INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`,
 (3433, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Column', 'NULL', '', 'dd2e1f4b-f5db-45e8-85fa-efd27bae7b6a', '\"<field\\n\\ttype=\\\"importcolumns\\\"\\n\\tname=\\\"column\\\"\\n\\tlabel=\\\"Column\\\"\\n\\tdescription=\\\"The spreadsheet columns.\\\"\\n\\tclass=\\\"list_class\\\"\\n\\tlayout=\\\"joomla.form.field.list-fancy-select\\\"\\n\\trequired=\\\"true\\\"\\n\\textends=\\\"list\\\"\\n\\tprime_php=\\\"1\\\"\\n\\ttype_php_1=\\\"__.o0=base64=Oo.__CQkkY29sdW1ucyA9IEpvb21sYV9fX2FlYmZlYjlmX2Y4YTNfNDJiZV9hMjFkXzVkYjU2YWUzMGMxY19fX1Bvd2VyOjpnZXRTcHJlYWRzaGVldEhlYWRlcnMoKTsNCgkJJHNwZWNpYWwgPSBmYWxzZTsNCgkJZm9yZWFjaCAoJGNvbHVtbnMgYXMgJGhlYWRlciA9PiAkY29sdW1uKQ0KCQl7DQoJCQlpZiAoJGhlYWRlciAhPT0gJGNvbHVtbikNCgkJCXsNCgkJCQkkc3BlY2lhbCA9IHRydWU7DQoJCQl9DQoNCgkJCS8vIGRvbid0IGFkZCB0aGUgZXh0cmEgY29sdW1ucyBpZiBzcGVjaWFsIGNhc2UNCgkJCWlmICgkc3BlY2lhbCAmJiAkaGVhZGVyID09PSAkY29sdW1uKQ0KCQkJew0KCQkJCWNvbnRpbnVlOw0KCQkJfQ0KDQoJCQkkb3B0aW9uc1tdID0gSHRtbDo6Xygnc2VsZWN0Lm9wdGlvbicsICRoZWFkZXIsICRjb2x1bW4pOw0KCQl9DQoNCgkJcmV0dXJuICRvcHRpb25zOw==\\\"\\n\\/>\"', 1, '2025-02-16 18:41:54', '2025-02-16 18:47:04', 2, '', 1084, '6a17f5e4-d21e-47f1-9b92-493ab725d55f', '', '', '', '', ''),
 (3434, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Target Field', 'NULL', '', 'dd2e1f4b-f5db-45e8-85fa-efd27bae7b6a', '\"<field\\n\\ttype=\\\"targetfields\\\"\\n\\tname=\\\"target\\\"\\n\\tlabel=\\\"System Target Fields\\\"\\n\\tdescription=\\\"The system target database fields.\\\"\\n\\tmessage=\\\"Input Required\\\"\\n\\tclass=\\\"list_class\\\"\\n\\tlayout=\\\"joomla.form.field.list-fancy-select\\\"\\n\\tmultiple=\\\"false\\\"\\n\\trequired=\\\"false\\\"\\n\\textends=\\\"list\\\"\\n\\tprime_php=\\\"1\\\"\\n\\ttype_php_1=\\\"__.o0=base64=Oo.__CQkkZmllbGRzID0gSm9vbWxhX19fYWViZmViOWZfZjhhM180MmJlX2EyMWRfNWRiNTZhZTMwYzFjX19fUG93ZXI6OmdldEl0ZW1JbXBvcnRGaWVsZHMoKTsNCgkJJG9wdGlvbnMgPSBbXTsNCg0KCQlpZiAoIWVtcHR5KCRmaWVsZHMpKQ0KCQl7DQoJCQkkb3B0aW9uc1tdID0gSHRtbDo6Xygnc2VsZWN0Lm9wdGlvbicsICcnLCBUZXh0OjpfKCdTZWxlY3QgdGhlIHRhcmdldCBmaWVsZCcpKTsNCgkJCWZvcmVhY2ggKCRmaWVsZHMgYXMgJGtleSA9PiAkdmFsdWUpDQoJCQl7DQoJCQkJJG9wdGlvbnNbXSA9IEh0bWw6Ol8oJ3NlbGVjdC5vcHRpb24nLCAka2V5LCAkdmFsdWUpOw0KCQkJfQ0KCQl9DQoJCWVsc2UNCgkJew0KCQkJJG9wdGlvbnNbXSA9IEh0bWw6Ol8oJ3NlbGVjdC5vcHRpb24nLCAnJywgVGV4dDo6XygnVGhlcmUgd2FzIGFuIGVycm9yIScpKTsNCgkJfQ0KDQoJCXJldHVybiAkb3B0aW9uczs=\\\"\\n\\/>\"', 1, '2025-02-16 18:50:25', '2025-02-21 14:26:33', 2, '', 1085, '7d613846-8f1e-43f4-8bb9-1fcdbb473fa5', '', '', '', '', ''),
 (3435, '', '', '', '', '', '', '', '', 'Other', 36, 'VARCHAR', 2, '', '', 'File (Importer)', 'NULL', '', 'dd2e1f4b-f5db-45e8-85fa-efd27bae7b6a', '\"<field\\n\\ttype=\\\"files\\\"\\n\\tname=\\\"file\\\"\\n\\tlabel=\\\"File\\\"\\n\\tdescription=\\\"Select relevant file option and upload file.\\\"\\n\\tclass=\\\"list_class\\\"\\n\\tlayout=\\\"joomla.form.field.list-fancy-select\\\"\\n\\treadonly=\\\"true\\\"\\n\\textends=\\\"list\\\"\\n\\ttable=\\\"#__###component###_file\\\"\\n\\tcomponent=\\\"com_###component###\\\"\\n\\tentity=\\\"###view###\\\"\\n\\tview=\\\"file\\\"\\n\\tviews=\\\"files\\\"\\n\\tvalue_field=\\\"name\\\"\\n\\tkey_field=\\\"guid\\\"\\n\\tprime_php=\\\"1\\\"\\n\\ttype_php_1=\\\"__.o0=base64=Oo.__Ly8gR2V0IHRoZSB1c2VyIG9iamVjdC4NCgkJJHVzZXIgPSBGYWN0b3J5OjpnZXRVc2VyKCk7DQoJCS8vIEdldCB0aGUgZGF0YWJzZSBvYmplY3QuDQoJCSRkYiA9IEZhY3Rvcnk6OmdldERCTygpOw0KCQkkcXVlcnkgPSAkZGItPmdldFF1ZXJ5KHRydWUpOw0KCQkkcXVlcnktPnNlbGVjdCgkZGItPnF1b3RlTmFtZShhcnJheSgnYS4jIyNJRCMjIycsJ2EuIyMjVEVYVCMjIycpLGFycmF5KCcjIyNJRCMjIycsJyMjI0NPREVfVEVYVCMjIycpKSk7DQoJCSRxdWVyeS0+ZnJvbSgkZGItPnF1b3RlTmFtZSgnIyMjVEFCTEUjIyMnLCAnYScpKTsNCgkJJHF1ZXJ5LT5vcmRlcignYS4jIyNURVhUIyMjIEFTQycpOw0KCQkkZGItPnNldFF1ZXJ5KChzdHJpbmcpJHF1ZXJ5KTsNCgkJJGl0ZW1zID0gJGRiLT5sb2FkT2JqZWN0TGlzdCgpOw0KCQkkb3B0aW9ucyA9IGFycmF5KCk7DQoJCWlmICgkaXRlbXMpDQoJCXsNCgkJCWZvcmVhY2goJGl0ZW1zIGFzICRpdGVtKQ0KCQkJew0KCQkJCSRvcHRpb25zW10gPSBIdG1sOjpfKCdzZWxlY3Qub3B0aW9uJywgJGl0ZW0tPiMjI0lEIyMjLCAkaXRlbS0+IyMjQ09ERV9URVhUIyMjKTsNCgkJCX0NCgkJfQ0KCQlyZXR1cm4gJG9wdGlvbnM7\\\"\\n\\/>\"', 1, '2025-02-16 18:54:56', '2025-02-16 19:17:19', 3, '', 1086, '91939b1a-c4d6-4531-8356-63bc4ca243fb', '', '', '', '', ''),
-(3436, '', '', '', '', '', '', '', '', 11, '', 'INT', 2, '', '', 'Import Status', 'NULL', '', 'a51dfc06-1b9b-4d0a-86ba-f705bcd40d4d', '\"<field\\n\\ttype=\\\"list\\\"\\n\\tname=\\\"import_status\\\"\\n\\tlabel=\\\"Import Status\\\"\\n\\tclass=\\\"list_class\\\"\\n\\tlayout=\\\"joomla.form.field.list-fancy-select\\\"\\n\\tmultiple=\\\"false\\\"\\n\\toption=\\\"0|set import status,1|Awaiting,2|Processing,3|Completed,4|Completed with Errors,5|Cancelled\\\"\\n\\tdefault=\\\"1\\\"\\n\\/>\"', 1, '2025-02-16 19:00:55', '2025-02-16 19:01:01', 2, '', 1087, '11698dc6-8ff6-4662-b3b7-e47494463a08', '', '', '', '', '');
+(3436, '', '', '', '', '', '', '', '', 11, '', 'INT', 2, '', '', 'Import Status', 'NULL', '', 'a51dfc06-1b9b-4d0a-86ba-f705bcd40d4d', '\"<field\\n\\ttype=\\\"list\\\"\\n\\tname=\\\"import_status\\\"\\n\\tlabel=\\\"Import Status\\\"\\n\\tclass=\\\"list_class\\\"\\n\\tlayout=\\\"joomla.form.field.list-fancy-select\\\"\\n\\tmultiple=\\\"false\\\"\\n\\toption=\\\"0|set import status,1|Awaiting,2|Processing,3|Completed,4|Completed with Errors,5|Cancelled\\\"\\n\\tdefault=\\\"1\\\"\\n\\/>\"', 1, '2025-02-16 19:00:55', '2025-02-16 19:01:01', 2, '', 1087, '11698dc6-8ff6-4662-b3b7-e47494463a08', '', '', '', '', ''),
+(3438, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Country (modal)', 'NULL', '', 'a1cdb0a5-517c-425c-998a-333e92af3e32', '\"<field\\n\\ttype=\\\"ModalSelect\\\"\\n\\tname=\\\"country\\\"\\n\\tlabel=\\\"Country\\\"\\n\\tsql_title_table=\\\"#__###component###_country\\\"\\n\\tsql_title_column=\\\"name\\\"\\n\\tsql_title_key=\\\"guid\\\"\\n\\turlSelect=\\\"index.php?option=com_###component###&amp;view=countries&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid\\\"\\n\\turlEdit=\\\"index.php?option=com_###component###&amp;task=country.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid\\\"\\n\\ttitleSelect=\\\"Select A Country\\\"\\n\\ttitleEdit=\\\"Edit the Country\\\"\\n\\ticonSelect=\\\"icon-copy\\\"\\n\\tselect=\\\"true\\\"\\n\\tedit=\\\"false\\\"\\n\\tclear=\\\"true\\\"\\n\\trequired=\\\"true\\\"\\n\\tclass=\\\"input-large\\\"\\n\\tdescription=\\\"Select the country.\\\"\\n\\thint=\\\"Select a Country\\\"\\n\\/>\"', 1, '2025-03-24 09:02:54', '2025-03-26 21:20:35', 11, '', 242, '8d1b9d7e-77c1-43d9-bc97-0dd021bfe779', '', '', '', '', ''),
+(3439, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Region (modal)', 'NULL', '', 'a1cdb0a5-517c-425c-998a-333e92af3e32', '\"<field\\n\\ttype=\\\"ModalSelect\\\"\\n\\tname=\\\"region\\\"\\n\\tlabel=\\\"Region\\\"\\n\\tsql_title_table=\\\"#__###component###_region\\\"\\n\\tsql_title_column=\\\"name\\\"\\n\\tsql_title_key=\\\"guid\\\"\\n\\turlSelect=\\\"index.php?option=com_###component###&amp;view=regions&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid\\\"\\n\\turlEdit=\\\"index.php?option=com_###component###&amp;task=region.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid\\\"\\n\\ttitleSelect=\\\"Select A Region\\\"\\n\\ttitleEdit=\\\"Edit the Region\\\"\\n\\ticonSelect=\\\"icon-copy\\\"\\n\\tselect=\\\"true\\\"\\n\\tedit=\\\"false\\\"\\n\\tclear=\\\"true\\\"\\n\\trequired=\\\"true\\\"\\n\\tclass=\\\"input-large\\\"\\n\\tdescription=\\\"Please select the region this ###view### belongs to.\\\"\\n\\thint=\\\"Select a Region\\\"\\n\\/>\"', 1, '2025-03-24 10:06:43', '2025-03-26 21:20:41', 13, '', 667, '7f3ccb20-7c57-433a-987b-b53d801004f3', '', '', '', '', ''),
+(3441, '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Countries (multisubform)', 'NULL', 6, '7139f2c8-a70a-46a6-bbe3-4eefe54ca515', '\"<field\\n\\ttype=\\\"subform\\\"\\n\\tname=\\\"countries\\\"\\n\\tlabel=\\\"Countries\\\"\\n\\tlayout=\\\"joomla.form.field.subform.repeatable\\\"\\n\\tmultiple=\\\"true\\\"\\n\\tbuttons=\\\"add,remove\\\"\\n\\tfields=\\\"3408,199,583,584,3449,3452,3453,3467,586,588,587,3448,3450,3455,3456,3443,3444,3464\\\"\\n\\ticon=\\\"list\\\"\\n\\tmin=\\\"0\\\"\\n\\/>\"', 1, '2025-03-24 12:57:22', '2025-03-27 13:44:53', 8, '', 1088, '4d96ceea-7dd1-45c3-86fd-0d73d66332a8', 'JGdldE1hcCA9ICBbDQoJCSdfY29yZScgPT4gWw0KCQkJJ3RhYmxlJyA9Pidjb3VudHJ5JywNCgkJCSdsaW5rVmFsdWUnID0+ICRpdGVtLT5ndWlkID8/ICcnLA0KCQkJJ2xpbmtLZXknID0+ICdzdWJyZWdpb24nLA0KCQkJJ2ZpZWxkJyA9PiAnY291bnRyeScsDQoJCQknZ2V0JyA9PiBbJ2d1aWQnLCduYW1lJywnaXNvMycsJ2lzbzInLCdjYXBpdGFsJywnbmF0aXZlJywnbmF0aW9uYWxpdHknLCdjdXJyZW5jeV9uYW1lJywnY29kZXRocmVlJywnc3ltYm9sJywnbnVtZXJpY19jb2RlJywncGhvbmVjb2RlJywndGxkJywnZW1vamknLCdlbW9qaXUnLCdsYXRpdHVkZScsJ2xvbmdpdHVkZScsJ3dpa2lkYXRhaWQnXQ0KCQldLA0KCQkndGltZXpvbmVzJyA9PiBbDQoJCQkndGFibGUnID0+J3RpbWV6b25lJywNCgkJCSdsaW5rVmFsdWUnID0+ICdjb3VudHJ5Omd1aWQnLCAvLyBjb3JldGFibGU6ZmllbGRuYW1lDQoJCQknbGlua0tleScgPT4gJ2NvdW50cnknLA0KCQkJJ2dldCcgPT4gWydndWlkJywndGltZXpvbmVfbmFtZScsJ3RpbWV6b25lX2lkZW50aWZpZXInLCdnbXRfb2Zmc2V0X25hbWUnLCdnbXRfb2Zmc2V0X3NlYycsJ2FiYnJldmlhdGlvbiddDQoJCV0NCgldOw0KW1tbZmllbGRdXV0gPSBTdXBlcl9fXzlkNzZiOGRjXzM4ODNfNDc1NV9iMTFjXzEzMWQxOWNhOGE1M19fX1Bvd2VyOjpfKCdEYXRhLk11bHRpU3ViZm9ybScpLT5nZXQoJGdldE1hcCk7', 'JHNldE1hcCA9ICBbDQoJJ19jb3JlJyA9PiBbDQoJCSd0YWJsZScgPT4nY291bnRyeScsDQoJCSdpbmRleEtleScgPT4gJ2d1aWQnLA0KCQknbGlua0tleScgPT4gJ3N1YnJlZ2lvbicsDQoJCSdsaW5rVmFsdWUnID0+ICRkYXRhWydndWlkJ10gPz8gJycNCgldLA0KCSd0aW1lem9uZXMnID0+IFsNCgkJJ3RhYmxlJyA9Pid0aW1lem9uZScsDQoJCSdpbmRleEtleScgPT4gJ2d1aWQnLA0KCQknbGlua0tleScgPT4gJ2NvdW50cnknLA0KCQknbGlua1ZhbHVlJyA9PiAnY291bnRyeTpndWlkJyAvLyBjb3JldGFibGU6ZmllbGRuYW1lDQoJXQ0KXTsNClN1cGVyX19fOWQ3NmI4ZGNfMzg4M180NzU1X2IxMWNfMTMxZDE5Y2E4YTUzX19fUG93ZXI6Ol8oJ0RhdGEuTXVsdGlTdWJmb3JtJyktPnNldChbW1tmaWVsZF1dXSA/PyBbXSwgICRzZXRNYXApOw==', '', '', ''),
+(3442, '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'State/cities (multisubform)', 'NULL', 6, '7139f2c8-a70a-46a6-bbe3-4eefe54ca515', '\"<field\\n\\ttype=\\\"subform\\\"\\n\\tname=\\\"states\\\"\\n\\tlabel=\\\"States\\\"\\n\\tlayout=\\\"joomla.form.field.subform.repeatable\\\"\\n\\tmultiple=\\\"true\\\"\\n\\tbuttons=\\\"add,remove\\\"\\n\\tfields=\\\"3408,199,3454,3443,3444,584,3451,3446,3468\\\"\\n\\tdescription=\\\"Add the States and all their Cities\\\"\\n\\ticon=\\\"list\\\"\\n\\tmin=\\\"0\\\"\\n\\/>\"', 1, '2025-03-24 14:27:41', '2025-03-27 08:28:49', 8, '', 1088, '9a21f28b-b818-4cc5-b18a-c3fa33a5876d', 'JGdldE1hcCA9ICBbDQoJCSdfY29yZScgPT4gWw0KCQkJJ3RhYmxlJyA9PidzdGF0ZScsDQoJCQknbGlua1ZhbHVlJyA9PiAkaXRlbS0+Z3VpZCA/PyAnJywNCgkJCSdsaW5rS2V5JyA9PiAnY291bnRyeScsDQoJCQknZmllbGQnID0+ICdzdGF0ZScsDQoJCQknZ2V0JyA9PiBbJ2d1aWQnLCduYW1lJywndHlwZScsJ2xhdGl0dWRlJywnbG9uZ2l0dWRlJywnaXNvMicsJ2ZpcHNfY29kZScsJ3dpa2lkYXRhaWQnXQ0KCQldLA0KCQknY2l0aWVzJyA9PiBbDQoJCQkndGFibGUnID0+J2NpdHknLA0KCQkJJ2xpbmtWYWx1ZScgPT4gJ3N0YXRlOmd1aWQnLCAvLyBjb3JldGFibGU6ZmllbGRuYW1lDQoJCQknbGlua0tleScgPT4gJ3N0YXRlJywNCgkJCSdnZXQnID0+IFsnZ3VpZCcsJ25hbWUnLCdsYXRpdHVkZScsJ2xvbmdpdHVkZScsJ3dpa2lkYXRhaWQnXQ0KCQldDQoJXTsNCltbW2ZpZWxkXV1dID0gU3VwZXJfX185ZDc2YjhkY18zODgzXzQ3NTVfYjExY18xMzFkMTljYThhNTNfX19Qb3dlcjo6XygnRGF0YS5NdWx0aVN1YmZvcm0nKS0+Z2V0KCRnZXRNYXApOw==', 'JHNldE1hcCA9ICBbDQoJJ19jb3JlJyA9PiBbDQoJCSd0YWJsZScgPT4nc3RhdGUnLA0KCQknaW5kZXhLZXknID0+ICdndWlkJywNCgkJJ2xpbmtLZXknID0+ICdjb3VudHJ5JywNCgkJJ2xpbmtWYWx1ZScgPT4gJGRhdGFbJ2d1aWQnXSA/PyAnJw0KCV0sDQoJJ2NpdGllcycgPT4gWw0KCQkndGFibGUnID0+J2NpdHknLA0KCQknaW5kZXhLZXknID0+ICdndWlkJywNCgkJJ2xpbmtLZXknID0+ICdzdGF0ZScsDQoJCSdsaW5rVmFsdWUnID0+ICdzdGF0ZTpndWlkJyAvLyBjb3JldGFibGU6ZmllbGRuYW1lDQoJXQ0KXTsNClN1cGVyX19fOWQ3NmI4ZGNfMzg4M180NzU1X2IxMWNfMTMxZDE5Y2E4YTUzX19fUG93ZXI6Ol8oJ0RhdGEuTXVsdGlTdWJmb3JtJyktPnNldChbW1tmaWVsZF1dXSA/PyBbXSwgICRzZXRNYXApOw==', '', '', ''),
+(3443, '', '', '', '', '', '', '', '', 'Other', '10,8', 'DECIMAL', 2, '', '', 'Latitude (decimal)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"latitude\\\"\\n\\tlabel=\\\"Latitude\\\"\\n\\tdescription=\\\"Enter the Latitude\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tmessage=\\\"Error! Please add the latitude here.\\\"\\n\\thint=\\\"The Latitude Here\\\"\\n\\/>\"', 1, '2025-03-25 09:14:48', '2025-03-26 10:09:50', 4, '', 1089, 'f7d3d78e-2d35-4884-a997-d073f853d095', '', '', '', '', ''),
+(3444, '', '', '', '', '', '', '', '', 'Other', '11,8', 'DECIMAL', 2, '', '', 'Longitude (decimal)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"longitude\\\"\\n\\tlabel=\\\"Longitude\\\"\\n\\tdescription=\\\"Enter the Longitude\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tmessage=\\\"Error! Please add the longitude here.\\\"\\n\\thint=\\\"The Longitude Here\\\"\\n\\/>\"', 1, '2025-03-25 09:18:39', '2025-03-26 10:10:13', 4, '', 1089, '09c22738-6c6f-48ca-a24d-d439757e8619', '', '', '', '', ''),
+(3446, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'WikiDataId', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"wikidataid\\\"\\n\\tlabel=\\\"Wiki-Data-Id\\\"\\n\\tdescription=\\\"Enter the Wiki-Data-Id\\\"\\n\\thint=\\\"The Wiki-Data-Id Here\\\"\\n\\/>\"', 1, '2025-03-25 09:40:33', '2025-03-25 09:41:37', 2, '', 1090, 'af59b3ac-6a00-42c0-bbe2-edf90dec6081', '', '', '', '', ''),
+(3447, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'State (modal)', 'NULL', '', 'a1cdb0a5-517c-425c-998a-333e92af3e32', '\"<field\\n\\ttype=\\\"ModalSelect\\\"\\n\\tname=\\\"state\\\"\\n\\tlabel=\\\"State\\\"\\n\\tsql_title_table=\\\"#__###component###_state\\\"\\n\\tsql_title_column=\\\"name\\\"\\n\\tsql_title_key=\\\"guid\\\"\\n\\turlSelect=\\\"index.php?option=com_###component###&amp;view=states&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid\\\"\\n\\turlEdit=\\\"index.php?option=com_###component###&amp;task=state.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid\\\"\\n\\ttitleSelect=\\\"Select A State\\\"\\n\\ttitleEdit=\\\"Edit State\\\"\\n\\ticonSelect=\\\"icon-copy\\\"\\n\\tselect=\\\"true\\\"\\n\\tedit=\\\"false\\\"\\n\\tclear=\\\"true\\\"\\n\\trequired=\\\"true\\\"\\n\\tclass=\\\"input-large\\\"\\n\\tdescription=\\\"Please select the state this ###view### belongs to.\\\"\\n\\thint=\\\"Select a State\\\"\\n\\/>\"', 1, '2025-03-25 10:19:19', '2025-03-27 16:06:51', 10, '', 667, '1e666136-800a-486d-a8e8-13a054b7acde', '', '', '', '', ''),
+(3448, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Phone Code (country)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"phonecode\\\"\\n\\tlabel=\\\"Phone Code\\\"\\n\\tdescription=\\\"Each country is assigned a unique three-digit code, which serves as the international dialing prefix added to all phone numbers within that country.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tmessage=\\\"Error! Please add phone code here.\\\"\\n\\thint=\\\"+264\\\"\\n\\/>\"', 1, '2025-03-25 10:30:37', '2025-03-25 15:00:22', 4, '', 557, '149140a8-d0a6-4b62-a880-bb796e2145d8', '', '', '', '', ''),
+(3449, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Capital (citites-modal)', 'NULL', '', 'a1cdb0a5-517c-425c-998a-333e92af3e32', '\"<field\\n\\ttype=\\\"ModalSelect\\\"\\n\\tname=\\\"capital\\\"\\n\\tlabel=\\\"Capital\\\"\\n\\tsql_title_table=\\\"#__###component###_city\\\"\\n\\tsql_title_column=\\\"name\\\"\\n\\tsql_title_key=\\\"guid\\\"\\n\\turlSelect=\\\"index.php?option=com_###component###&amp;view=cities&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid\\\"\\n\\turlEdit=\\\"index.php?option=com_###component###&amp;task=city.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid\\\"\\n\\ttitleSelect=\\\"Select A Capital City\\\"\\n\\ttitleEdit=\\\"Edit Capital City\\\"\\n\\ticonSelect=\\\"icon-copy\\\"\\n\\tselect=\\\"true\\\"\\n\\tedit=\\\"false\\\"\\n\\tclear=\\\"true\\\"\\n\\tclass=\\\"input-large\\\"\\n\\tdescription=\\\"Please select the Capital of this ###view###.\\\"\\n\\thint=\\\"Select a Capital\\\"\\n\\/>\"', 1, '2025-03-25 10:43:17', '2025-03-27 13:10:58', 13, '', 667, 'baeaf484-f61b-4688-8b8a-e3ace669b7a7', '', '', '', '', ''),
+(3450, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'TLD (country)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"tld\\\"\\n\\tlabel=\\\"TLD\\\"\\n\\tdescription=\\\"Each country is assigned a unique top-level domain (TLD), which is the last segment of a web address and indicates the country\'s online presence.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tmessage=\\\"Error! Please add a TLD here.\\\"\\n\\thint=\\\".na\\\"\\n\\/>\"', 1, '2025-03-25 10:44:32', '2025-03-27 13:17:00', 4, '', 557, 'c4c23fad-fd03-41cc-b5db-25f60b8ee11f', '', '', '', '', ''),
+(3451, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'FIPS code', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"fips_code\\\"\\n\\tlabel=\\\"FIPS code\\\"\\n\\tdescription=\\\"Enter the FIPS code\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tmessage=\\\"Error! Please add the FIPS code here.\\\"\\n\\thint=\\\"The FIPS code\\\"\\n\\/>\"', 1, '2025-03-25 10:50:46', '2025-03-25 13:40:03', 5, '', 1089, 'fa0ead84-06c8-4f18-89ae-4cdf646fd961', '', '', '', '', ''),
+(3452, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Native (country)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"native\\\"\\n\\tlabel=\\\"Native\\\"\\n\\tdescription=\\\"Indicate the name of the country as it is written or spoken in its own official or local language(s), reflecting the native script and linguistic identity of that country.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"false\\\"\\n\\tmessage=\\\"Error! Please add the Native name here.\\\"\\n\\thint=\\\"Name of Country in native language.\\\"\\n\\/>\"', 1, '2025-03-25 10:51:13', '2025-03-25 10:51:17', 2, '', 557, '2aad92a4-895d-46cb-b0df-751da1bdd703', '', '', '', '', ''),
+(3453, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Nationality (country)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"nationality\\\"\\n\\tlabel=\\\"Nationality\\\"\\n\\tdescription=\\\"Specifies the term used to describe the people or citizens of a country, often used in legal documents, travel records, and demographic data.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"false\\\"\\n\\tmessage=\\\"Error! Please add the country\'s Nationality here.\\\"\\n\\/>\"', 1, '2025-03-25 12:36:37', '2025-03-27 13:13:40', 3, '', 557, '8ba72283-32fa-4a34-8c0d-d52adfed1aa5', '', '', '', '', ''),
+(3454, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Type (of state)', 'NULL', '', 'a51dfc06-1b9b-4d0a-86ba-f705bcd40d4d', '\"<field\\n\\ttype=\\\"list\\\"\\n\\tname=\\\"type\\\"\\n\\tlabel=\\\"Type\\\"\\n\\tdescription=\\\"Select the Type\\\"\\n\\tmessage=\\\"Error! Please add the Type here.\\\"\\n\\tclass=\\\"list_class\\\"\\n\\tlayout=\\\"joomla.form.field.list-fancy-select\\\"\\n\\tmultiple=\\\"false\\\"\\n\\toption=\\\"department|Department,district|District,region|Region,province|Province,municipality|Municipality,geographical region|Geographical Region,popularate|Popularate,oblast|Oblast,city|City,land|Land,county|County,governorate|Governorate,administered area|Administered Area,federal capital territory|Federal Capital Territory,emirate|Emirate,special municipality|Special Municipality,state|State,metropolitan administration|Metropolitan Administration,parish|Parish,metropolitan city|Metropolitan City,special self-governing province|Special Self-Governing Province,special self-governing city|Special Self-Governing City,dependency|Dependency,territory|Territory,division|Division,island council|Island Council,special city|Special City,union territory|Union Territory,autonomous territorial unit|Autonomous Territorial Unit,overseas collectivity|Overseas Collectivity,metropolitan region|Metropolitan Region,metropolitan collectivity with special status|Metropolitan Collectivity with Special Status,overseas region|Overseas Region,autonomous region|Autonomous Region,administrative region|Administrative Region,capital district|Capital District,prefecture|Prefecture,canton|Canton,metropolitan department|Metropolitan Department,overseas territory|Overseas Territory,island|Island,autonomous community|Autonomous Community,autonomous city|Autonomous City,village|Village,sheadings|Sheadings,capital city|Capital City,district municipality|District Municipality\\r\\n\\\"\\n\\/>\"', 1, '2025-03-25 12:36:39', '2025-03-26 12:35:37', 4, '', 1089, '4321fa80-702d-4ff5-ab3c-05507d3007a9', '', '', '', '', ''),
+(3455, '', '', '', '', '', '', '', '', 'Other', 191, 'VARCHAR', 2, '', '', 'Flag emoji (country flag)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"emoji\\\"\\n\\tlabel=\\\"National Flag\\\"\\n\\tdescription=\\\"The country\'s national flag.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"false\\\"\\n\\tmessage=\\\"Error! Please add the country\'s national flag here.\\\"\\n\\/>\"', 1, '2025-03-25 12:45:10', '2025-03-25 12:38:41', 1, '', 557, '962ec39f-78d4-42ee-9626-7b778d2eea25', '', '', '', '', ''),
+(3456, '', '', '', '', '', '', '', '', 'Other', 191, 'VARCHAR', 2, '', '', 'Flag emojiU (unicode for flag)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"emojiu\\\"\\n\\tlabel=\\\"Flag Unicode\\\"\\n\\tdescription=\\\"Stores the Unicode code points for the regional indicator symbols that combine to form the country flag emoji, allowing programmatic conversion or rendering of the flag.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"false\\\"\\n\\tmessage=\\\"Error! Please add the flag\'s unicode data here.\\\"\\n\\/>\"', 1, '2025-03-25 12:48:26', '2025-03-27 13:21:02', 4, '', 557, 'b71ee1ab-78ea-4cc7-aa2e-490a4d01a03f', '', '', '', '', ''),
+(3457, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Sub-Region (modal)', 'NULL', '', 'a1cdb0a5-517c-425c-998a-333e92af3e32', '\"<field\\n\\ttype=\\\"ModalSelect\\\"\\n\\tname=\\\"subregion\\\"\\n\\tlabel=\\\"Subregion\\\"\\n\\tsql_title_table=\\\"#__###component###_subregion\\\"\\n\\tsql_title_column=\\\"name\\\"\\n\\tsql_title_key=\\\"guid\\\"\\n\\turlSelect=\\\"index.php?option=com_###component###&amp;view=subregions&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid\\\"\\n\\turlEdit=\\\"index.php?option=com_###component###&amp;task=subregion.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid\\\"\\n\\ttitleSelect=\\\"Select A Subregion\\\"\\n\\ticonSelect=\\\"icon-copy\\\"\\n\\tselect=\\\"true\\\"\\n\\tedit=\\\"false\\\"\\n\\tclear=\\\"true\\\"\\n\\trequired=\\\"true\\\"\\n\\tclass=\\\"input-large\\\"\\n\\tdescription=\\\"Please select the Subregion this ###view### belongs to.\\\"\\n\\thint=\\\"Select a Subregion\\\"\\n\\/>\"', 1, '2025-03-25 13:03:40', '2025-03-26 21:21:09', 12, '', 667, '19b4a840-cf4e-4012-8fae-b1439af74f5a', '', '', '', '', ''),
+(3458, '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Subregions (subform)', 'NULL', 6, '7139f2c8-a70a-46a6-bbe3-4eefe54ca515', '\"<field\\n\\ttype=\\\"subform\\\"\\n\\tname=\\\"subregions\\\"\\n\\tlabel=\\\"Subregions\\\"\\n\\tlayout=\\\"joomla.form.field.subform.repeatable\\\"\\n\\tmultiple=\\\"true\\\"\\n\\tbuttons=\\\"add,remove\\\"\\n\\tfields=\\\"3408,199,3446\\\"\\n\\ticon=\\\"list\\\"\\n\\tmin=\\\"0\\\"\\n\\/>\"', 1, '2025-03-25 13:54:46', '2025-03-27 14:00:17', 10, '', 1091, 'cb04e362-61c0-4a07-8d80-d13b6939a72c', 'W1tbZmllbGRdXV0gPSBTdXBlcl9fXzlkNzZiOGRjXzM4ODNfNDc1NV9iMTFjXzEzMWQxOWNhOGE1M19fX1Bvd2VyOjpfKCdEYXRhLlN1YmZvcm0nKS0+dGFibGUoJ3N1YnJlZ2lvbicpLT5nZXQoJGl0ZW0tPmd1aWQgPz8gJycgLCdyZWdpb24nLCAnc3VicmVnaW9ucycsIFsnZ3VpZCcsJ25hbWUnLCd3aWtpZGF0YWlkJ10pOw==', 'U3VwZXJfX185ZDc2YjhkY18zODgzXzQ3NTVfYjExY18xMzFkMTljYThhNTNfX19Qb3dlcjo6XygnRGF0YS5TdWJmb3JtJyktPnRhYmxlKCdzdWJyZWdpb24nKS0+c2V0KFtbW2ZpZWxkXV1dID8/IFtdLCAnZ3VpZCcsICdyZWdpb24nLCAkZGF0YVsnZ3VpZCddID8/ICcnKTs=', '', '', ''),
+(3459, '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', 2, '', '', 'Abbreviation (demo)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"abbreviation\\\"\\n\\tlabel=\\\"Abbreviation\\\"\\n\\tdescription=\\\"Enter the abbreviation\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tmessage=\\\"Error! Please add some abbreviation here.\\\"\\n\\thint=\\\"en\\\"\\n\\/>\"', 1, '2025-03-25 13:59:37', '2025-03-26 11:09:19', 8, '', 1035, 'c35e18fa-cade-48b8-b067-6289cc7a0f60', '', '', '', '', ''),
+(3460, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Timezone Identifier (timezone)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"timezone_identifier\\\"\\n\\tlabel=\\\"Timezone Identifier\\\"\\n\\tdescription=\\\"Specifies the IANA timezone name representing the geographic region or city.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tmessage=\\\"Error! Please add the Timezone Identifier here.\\\"\\n\\thint=\\\"Africa\\/Windhoek\\\"\\n\\/>\"', 1, '2025-03-25 14:18:16', '2025-03-26 11:07:44', 4, '', 1092, 'c20d4692-6e97-4441-83bd-561b73730407', '', '', '', '', ''),
+(3461, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'GMT Offset Seconds (timezone)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"gmt_offset_sec\\\"\\n\\tlabel=\\\"GMT Offset (seconds)\\\"\\n\\tdescription=\\\"Indicates the time difference from GMT\\/UTC in seconds. Negative means behind UTC.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tmessage=\\\"Error! Please add the GMT Offset in seconds here.\\\"\\n\\thint=\\\"7200\\\"\\n\\/>\"', 1, '2025-03-25 14:19:12', '2025-03-26 11:08:45', 3, '', 1092, '17788601-b3f8-439e-8ad7-11c7f8109e22', '', '', '', '', ''),
+(3462, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'GMT Offset Name (timezone)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"gmt_offset_name\\\"\\n\\tlabel=\\\"GMT Offset Name\\\"\\n\\tdescription=\\\"A human-readable label showing the GMT\\/UTC offset in hours and minutes.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tmessage=\\\"Error! Please add the GMT Offset name here.\\\"\\n\\thint=\\\"UTC+02:00\\\"\\n\\/>\"', 1, '2025-03-25 14:22:17', '2025-03-26 11:08:16', 4, '', 1092, '480c9734-2820-4a61-afea-75b1db3fadc9', '', '', '', '', ''),
+(3463, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Timezone Name (timezone)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"timezone_name\\\"\\n\\tlabel=\\\"Timezone Name\\\"\\n\\tdescription=\\\"The full, descriptive name of the timezone.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tmessage=\\\"Error! Please add the Timezone Full Name here.\\\"\\n\\thint=\\\"West Africa Summer Time\\\"\\n\\/>\"', 1, '2025-03-25 14:25:31', '2025-03-26 11:07:00', 4, '', 1092, 'f921d762-f5f1-4811-b1f5-71840c003a4e', '', '', '', '', ''),
+(3464, '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Timezones (country)', 'NULL', 6, '7139f2c8-a70a-46a6-bbe3-4eefe54ca515', '\"<field\\n\\ttype=\\\"subform\\\"\\n\\tname=\\\"timezones\\\"\\n\\tlabel=\\\"Timezones\\\"\\n\\tlayout=\\\"joomla.form.field.subform.repeatable\\\"\\n\\tmultiple=\\\"true\\\"\\n\\tbuttons=\\\"add,remove\\\"\\n\\tfields=\\\"3408,3463,3460,3462,3461,3459\\\"\\n\\tdescription=\\\"The ###view### timezones.\\\"\\n\\ticon=\\\"list\\\"\\n\\tmax=\\\"50\\\"\\n\\tmin=\\\"0\\\"\\n\\/>\"', 1, '2025-03-25 14:28:44', '2025-03-27 13:41:44', 10, '', 1091, 'c803e176-923f-43a8-a542-12e27619a5f2', 'W1tbZmllbGRdXV0gPSBTdXBlcl9fXzlkNzZiOGRjXzM4ODNfNDc1NV9iMTFjXzEzMWQxOWNhOGE1M19fX1Bvd2VyOjpfKCdEYXRhLlN1YmZvcm0nKS0+dGFibGUoJ3RpbWV6b25lJyktPmdldCgkaXRlbS0+Z3VpZCA/PyAnJyAsJ2NvdW50cnknLCAndGltZXpvbmVzJywgWydndWlkJywndGltZXpvbmVfbmFtZScsJ3RpbWV6b25lX2lkZW50aWZpZXInLCdnbXRfb2Zmc2V0X25hbWUnLCdnbXRfb2Zmc2V0X3NlYycsJ2FiYnJldmlhdGlvbiddKTs=', 'U3VwZXJfX185ZDc2YjhkY18zODgzXzQ3NTVfYjExY18xMzFkMTljYThhNTNfX19Qb3dlcjo6XygnRGF0YS5TdWJmb3JtJyktPnRhYmxlKCd0aW1lem9uZScpLT5zZXQoW1tbZmllbGRdXV0gPz8gW10sICdndWlkJywgJ2NvdW50cnknLCAkZGF0YVsnZ3VpZCddID8/ICcnKTs=', '', '', ''),
+(3467, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Currency Name (country)', 'NULL', '', '201327fe-3067-4316-a155-3fe2a52e05c0', '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"currency_name\\\"\\n\\tlabel=\\\"Currency Name\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter Currency Name Here\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add name here.\\\"\\n\\thint=\\\"Currency Name\\\"\\n\\/>\"', 1, '2025-03-26 08:24:47', '2025-03-27 13:14:04', 3, '', 4, '4b964b88-36b4-4f26-a828-0e798ce9af38', '', '', '', '', ''),
+(3468, '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Cities (state)', 'NULL', 6, '7139f2c8-a70a-46a6-bbe3-4eefe54ca515', '\"<field\\n\\ttype=\\\"subform\\\"\\n\\tname=\\\"cities\\\"\\n\\tlabel=\\\"Cities\\\"\\n\\tlayout=\\\"joomla.form.field.subform.repeatable\\\"\\n\\tmultiple=\\\"true\\\"\\n\\tbuttons=\\\"add,remove\\\"\\n\\tfields=\\\"3408,199,3443,3444,3446\\\"\\n\\ticon=\\\"list\\\"\\n\\tmax=\\\"50\\\"\\n\\tmin=\\\"0\\\"\\n\\/>\"', 1, '2025-03-26 11:14:54', '2025-03-27 06:12:57', 7, '', 1091, '6630c034-f87f-4c5c-ab72-e5ae0e4c0e5b', 'W1tbZmllbGRdXV0gPSBTdXBlcl9fXzlkNzZiOGRjXzM4ODNfNDc1NV9iMTFjXzEzMWQxOWNhOGE1M19fX1Bvd2VyOjpfKCdEYXRhLlN1YmZvcm0nKS0+dGFibGUoJ2NpdHknKS0+Z2V0KCRpdGVtLT5ndWlkID8/ICcnICwnc3RhdGUnLCAnY2l0aWVzJywgWydndWlkJywnbmFtZScsJ2xhdGl0dWRlJywnbG9uZ2l0dWRlJywnd2lraWRhdGFpZCddKTs=', 'U3VwZXJfX185ZDc2YjhkY18zODgzXzQ3NTVfYjExY18xMzFkMTljYThhNTNfX19Qb3dlcjo6XygnRGF0YS5TdWJmb3JtJyktPnRhYmxlKCdjaXR5JyktPnNldChbW1tmaWVsZF1dXSA/PyBbXSwgJ2d1aWQnLCAnc3RhdGUnLCAkZGF0YVsnZ3VpZCddID8/ICcnKTs=', '', '', '');
 
 --
 -- Dumping data for table `#__componentbuilder_fieldtype`
@@ -2680,7 +2719,7 @@ INSERT INTO `#__componentbuilder_fieldtype` (`id`, `description`, `name`, `prope
 (3, 'The checkbox form field type provides a single checkbox. If the parameter has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'Checkbox', '{\"properties0\":{\"name\":\"type\",\"example\":\"checkbox\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be checkbox\"},\"properties1\":{\"name\":\"name\",\"example\":\"show_title\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Show title\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"value\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"(optional) is the value of the parameter if this checkbox is set (usually 1).\"},\"properties4\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default value (usually 0 or 1).\"},\"properties5\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties6\":{\"name\":\"description\",\"example\":\"Show the title of the item\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties7\":{\"name\":\"class\",\"example\":\"inputbox\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties8\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties9\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (JavaScript use)\"}}', 'provides a single checkbox to be checked or unchecked', '', 1, 7, '', '', '10066262-b6e3-4f82-941e-cbe4f61ddd6c'),
 (4, 'The checkboxes form field type provides a set of checkboxes. Note: unlike most standard form field types, such as textfield or checkbox, this field is not an \"out of the box\" solution. It will create checkboxes for you, and submit their values in form of ', 'Checkboxes', '{\"properties0\":{\"name\":\"type\",\"example\":\"checkboxes\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be checkboxs\"},\"properties1\":{\"name\":\"name\",\"example\":\"toppings\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select Toppings\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"option\",\"example\":\"anch|Anchovies,chor|Chorizo,on|Onions,mush|Mushrooms\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) set the options of this radio. Separate options with commas and use the pipe symbol to separate value from text.\"},\"properties4\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default value.\"},\"properties5\":{\"name\":\"description\",\"example\":\"Select the topping of your choice\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties6\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties7\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties8\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides unlimited checkboxes that can be used for multi-select.', '', 1, 4, '', '', 'ac10859b-58da-4584-9682-36a6c2c8d04d'),
 (5, 'Provides a color picker. Enter the color as #ff00ff or pick it from the palet.', 'Color', '{\"properties0\":{\"name\":\"type\",\"example\":\"color\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be color.\"},\"properties1\":{\"name\":\"name\",\"example\":\"backgroundcolor\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"default\",\"example\":\"#FFFFFF\",\"adjustable\":\"1\",\"description\":\"(optional) provides a color when not set.\"},\"properties3\":{\"name\":\"label\",\"example\":\"Background\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties4\":{\"name\":\"description\",\"example\":\"Select the background color here.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) tooltip for the form field.\"},\"properties5\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties6\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides a color picker when clicking the input box.', '', 1, 5, '', '', '7f60f198-53e7-4fe9-813f-d1b6c553680e'),
-(6, 'The list form field type provides a drop down list or a list box of other current component table entries. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'Custom', '{\"properties0\":{\"name\":\"type\",\"example\":\"subjects\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type. You can also not use the \\\"_\\\" (underscore) or \\\"-\\\" (hyphen) in the type name, and no spaces.\"},\"properties1\":{\"name\":\"name\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a Subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties5\":{\"name\":\"class\",\"example\":\"list_class\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties6\":{\"name\":\"layout\",\"example\":\"joomla.form.field.list-fancy-select\",\"adjustable\":\"1\",\"description\":\"(optional) New layout field added in Joomla 4\"},\"properties7\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties8\":{\"name\":\"default\",\"example\":\"0\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties9\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties10\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties11\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties12\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties13\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties14\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"},\"properties15\":{\"name\":\"extends\",\"example\":\"list\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The JFormField sub class that should be extended. The options are (\'list\',\'radio\',\'checkboxes\')\"},\"properties16\":{\"name\":\"button\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) to add new button next to field in edit view\"},\"properties17\":{\"name\":\"table\",\"example\":\"#__###component###_subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The table being linked to. The ###TABLE### placeholder holds the table in the php.\"},\"properties18\":{\"name\":\"component\",\"example\":\"com_###component###\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the component where this table is found. Must be com_users\"},\"properties25\":{\"name\":\"entity\",\"example\":\"fieldtype\",\"adjustable\":\"1\",\"description\":\"(optional) The area\\/entity this custom field is loaded. This value can be used in the field custom code.\"},\"properties19\":{\"name\":\"view\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The single view name if the place this field is added.\"},\"properties20\":{\"name\":\"views\",\"example\":\"subjects\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The list view name if the place this field is added.\"},\"properties21\":{\"name\":\"value_field\",\"example\":\"name\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the text field in table linked to. The ###TEXT### placeholder holds the value_field in the php.\"},\"properties22\":{\"name\":\"key_field\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The field from the linked table to save in this table as the unique key. The ###ID### placeholder holds the key_field in the php.\"},\"properties23\":{\"name\":\"prime_php\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"This field makes sure that the PHP used here is used to build the field type, and other are custom fields with the same field type are ignored. So to avoid that they over write the PHP added here. You should only have one prime per\\/type. To disable remove the field or set to 0\"},\"properties24\":{\"name\":\"type_php_1\",\"example\":\"\\/\\/ Get the user object.\\r\\n\\t\\t$user = Factory::getUser();\\r\\n\\t\\t\\/\\/ Get the databse object.\\r\\n\\t\\t$db = Factory::getDBO();\\r\\n\\t\\t$query = $db->getQuery(true);\\r\\n\\t\\t$query->select($db->quoteName(array(\'a.###ID###\',\'a.###TEXT###\'),array(\'###ID###\',\'###CODE_TEXT###\')));\\r\\n\\t\\t$query->from($db->quoteName(\'###TABLE###\', \'a\'));\\r\\n\\t\\t$query->where($db->quoteName(\'a.published\') . \' = 1\');\\r\\n\\t\\t$query->order(\'a.###TEXT### ASC\');\\r\\n\\t\\t\\/\\/ Implement View Level Access (if set in table)\\r\\n\\t\\tif (!$user->authorise(\'core.options\', \'[[[com_component]]]\'))\\r\\n\\t\\t{\\r\\n\\t\\t\\t$columns = $db->getTableColumns(\'###TABLE###\');\\r\\n\\t\\t\\tif(isset($columns[\'access\']))\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$groups = implode(\',\', $user->getAuthorisedViewLevels());\\r\\n\\t\\t\\t\\t$query->where(\'a.access IN (\' . $groups . \')\');\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\t$db->setQuery((string)$query);\\r\\n\\t\\t$items = $db->loadObjectList();\\r\\n\\t\\t$options = [];\\r\\n\\t\\tif ($items)\\r\\n\\t\\t{\\r\\n\\t\\t\\tif ($this->multiple === false)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$options[] = Html::_(\'select.option\', \'\', Text::_(\'Select an option\'));\\r\\n\\t\\t\\t}\\r\\n\\t\\t\\tforeach($items as $item)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$options[] = Html::_(\'select.option\', $item->###ID###, $item->###CODE_TEXT###);\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\treturn $options;\",\"adjustable\":\"1\",\"description\":\"The php for the getOptions method.\"}}', 'provides a drop down list of items entries.', '', 1, 31, '', '', 'dd2e1f4b-f5db-45e8-85fa-efd27bae7b6a'),
+(6, 'The list form field type provides a drop down list or a list box of other current component table entries. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'Custom', '{\"properties0\":{\"name\":\"type\",\"example\":\"subjects\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type. You can also not use the \\\"_\\\" (underscore) or \\\"-\\\" (hyphen) in the type name, and no spaces.\"},\"properties1\":{\"name\":\"name\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a Subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties5\":{\"name\":\"class\",\"example\":\"list_class\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties6\":{\"name\":\"layout\",\"example\":\"joomla.form.field.list-fancy-select\",\"adjustable\":\"1\",\"description\":\"(optional) New layout field added in Joomla 4\"},\"properties7\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties8\":{\"name\":\"default\",\"example\":\"0\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties9\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties10\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties11\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties12\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties13\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties14\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"},\"properties15\":{\"name\":\"extends\",\"example\":\"list\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The JFormField sub class that should be extended. The options are (\'list\',\'radio\',\'checkboxes\')\"},\"properties16\":{\"name\":\"button\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) to add new button next to field in edit view\"},\"properties17\":{\"name\":\"table\",\"example\":\"#__###component###_subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The table being linked to. The ###TABLE### placeholder holds the table in the php.\"},\"properties18\":{\"name\":\"component\",\"example\":\"com_###component###\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the component where this table is found. Must be com_users\"},\"properties19\":{\"name\":\"entity\",\"example\":\"###view###\",\"adjustable\":\"1\",\"description\":\"(optional) The area\\/entity this custom field is loaded. This value can be used in the field custom code.\"},\"properties20\":{\"name\":\"view\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The single view name if the place this field is added.\"},\"properties21\":{\"name\":\"views\",\"example\":\"subjects\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The list view name if the place this field is added.\"},\"properties22\":{\"name\":\"value_field\",\"example\":\"name\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the text field in table linked to. The ###TEXT### placeholder holds the value_field in the php.\"},\"properties23\":{\"name\":\"key_field\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The field from the linked table to save in this table as the unique key. The ###ID### placeholder holds the key_field in the php.\"},\"properties24\":{\"name\":\"prime_php\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"This field makes sure that the PHP used here is used to build the field type, and other are custom fields with the same field type are ignored. So to avoid that they over write the PHP added here. You should only have one prime per\\/type. To disable remove the field or set to 0\"},\"properties25\":{\"name\":\"type_php_1\",\"example\":\"\\/\\/ Get the user object.\\r\\n\\t\\t$user = Factory::getUser();\\r\\n\\t\\t\\/\\/ Get the databse object.\\r\\n\\t\\t$db = Factory::getDBO();\\r\\n\\t\\t$query = $db->getQuery(true);\\r\\n\\t\\t$query->select($db->quoteName(array(\'a.###ID###\',\'a.###TEXT###\'),array(\'###ID###\',\'###CODE_TEXT###\')));\\r\\n\\t\\t$query->from($db->quoteName(\'###TABLE###\', \'a\'));\\r\\n\\t\\t$query->where($db->quoteName(\'a.published\') . \' = 1\');\\r\\n\\t\\t$query->order(\'a.###TEXT### ASC\');\\r\\n\\t\\t\\/\\/ Implement View Level Access (if set in table)\\r\\n\\t\\tif (!$user->authorise(\'core.options\', \'[[[com_component]]]\'))\\r\\n\\t\\t{\\r\\n\\t\\t\\t$columns = $db->getTableColumns(\'###TABLE###\');\\r\\n\\t\\t\\tif(isset($columns[\'access\']))\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$groups = implode(\',\', $user->getAuthorisedViewLevels());\\r\\n\\t\\t\\t\\t$query->where(\'a.access IN (\' . $groups . \')\');\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\t$db->setQuery((string)$query);\\r\\n\\t\\t$items = $db->loadObjectList();\\r\\n\\t\\t$options = [];\\r\\n\\t\\tif ($items)\\r\\n\\t\\t{\\r\\n\\t\\t\\tif ($this->multiple === false)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$options[] = Html::_(\'select.option\', \'\', Text::_(\'Select an option\'));\\r\\n\\t\\t\\t}\\r\\n\\t\\t\\tforeach($items as $item)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$options[] = Html::_(\'select.option\', $item->###ID###, $item->###CODE_TEXT###);\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\treturn $options;\",\"adjustable\":\"1\",\"description\":\"The php for the getOptions method.\"}}', 'provides a drop down list of items entries.', '', 1, 32, '', '', 'dd2e1f4b-f5db-45e8-85fa-efd27bae7b6a'),
 (7, 'The a list of users that can be targeting one or more groups and excluded users that already belongs to an item in a view.', 'CustomUser', '{\"properties0\":{\"name\":\"type\",\"example\":\"staffusers\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type.\"},\"properties1\":{\"name\":\"name\",\"example\":\"staff\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Staff\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties5\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties6\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties7\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties8\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties9\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"\"},\"properties10\":{\"name\":\"hint\",\"example\":\"select a user\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"\"},\"properties11\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties12\":{\"name\":\"extends\",\"example\":\"user\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The JFormField sub class that should be extended. The options are (\'list\',\'radio\',\'checkboxes\')\"},\"properties13\":{\"name\":\"table\",\"example\":\"#__users\",\"mandatory\":\"1\",\"description\":\"(mandatory) The table being linked to. Must be #__users\"},\"properties14\":{\"name\":\"component\",\"example\":\"com_users\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the component where this table is found. Must be com_users\"},\"properties15\":{\"name\":\"view\",\"example\":\"###view###\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The single view name if the place this field is added.\"},\"properties16\":{\"name\":\"views\",\"example\":\"###views###\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The list view name if the place this field is added.\"},\"properties17\":{\"name\":\"value_field\",\"example\":\"name\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the text field in table linked to.\"},\"properties18\":{\"name\":\"key_field\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The field from the linked table to save in this table as the unique key.\"},\"properties19\":{\"name\":\"type_php_1\",\"example\":\"\\t\\t\\/\\/ set the groups array\\r\\n\\t\\treturn ComponentHelper::getParams(\'com_###component###\')->get(\'###type###\');\",\"adjustable\":\"1\",\"description\":\"The php for the getGroups method.\"},\"properties22\":{\"name\":\"type_phpx_1\",\"example\":\"\\t\\t\\/\\/ To ensure that there is only one record per user\\r\\n\\t\\t\\/\\/ Get a db connection.\\r\\n\\t\\t$db = Factory::getDbo();\\r\\n\\t\\t\\/\\/ Create a new query object.\\r\\n\\t\\t$query = $db->getQuery(true);\\r\\n\\t\\t\\/\\/ Select all records from the #__###component###_###view### table from ###CODE### column\\\".\\r\\n\\t\\t$query->select($db->quoteName(\'###CODE###\'));\\r\\n\\t\\t$query->from($db->quoteName(\'#__###component###_###view###\'));\\r\\n\\t\\t$db->setQuery($query);\\r\\n\\t\\t$db->execute();\\r\\n\\t\\t$found = $db->getNumRows();\\r\\n\\t\\tif ($found)\\r\\n\\t\\t{\\r\\n\\t\\t\\t\\/\\/ return all users already used\\r\\n\\t\\t\\treturn array_unique($db->loadColumn());\\r\\n\\t\\t}\\r\\n\\t\\treturn null;\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"}}', 'Provides list of users.', '', 1, 6, '', '', 'a4a39f70-070f-459c-be4b-0ac103a29b9a'),
 (8, 'The Editor field type provides a WYSIWYG editor.', 'Editor', '{\"properties0\":{\"name\":\"type\",\"example\":\"editor\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be editor.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mytextblock\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Test Field\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"Some text\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties5\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties6\":{\"name\":\"width\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width (in pixels) of the wysiwyg editor and defaults to 100%.\"},\"properties7\":{\"name\":\"height\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height (in pixels) of the wysiwyg editor and defaults to 250px.\"},\"properties8\":{\"name\":\"cols\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width of the editor (in columns).\"},\"properties9\":{\"name\":\"rows\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height of the editor (in rows).\"},\"properties10\":{\"name\":\"buttons\",\"example\":\"no\",\"adjustable\":\"1\",\"description\":\"(optional) can be an array of plugin buttons to be excluded or set to false. The default editors-xtd are: article, image, pagebreak and readmore.\"},\"properties11\":{\"name\":\"syntax\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) can be used to set the code syntax matching for this field.\"},\"properties12\":{\"name\":\"hide\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) array of plugin buttons to be hidden. eg... set buttons=\\\"true\\\" hide=\\\"readmore,pagebreak\\\"\"},\"properties13\":{\"name\":\"editor\",\"example\":\"codemirror|none\",\"adjustable\":\"1\",\"description\":\"specifies the editor to be used and can include two options (editor=\\\"desired|alternative\\\")\"},\"properties14\":{\"name\":\"filter\",\"example\":\"safehtml\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties15\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties16\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties17\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides an editor area field.', '', 1, 12, '', '', '51f288d2-6eaa-42bc-a182-a6f69b3032b8'),
 (9, 'The hidden form field type provides a hidden field for saving a field whose value cannot be altered directly by a user in the Administrator (it can be altered in code or by editing the params.ini file). If the parameter has a saved value this is entered i', 'Hidden', '{\"properties0\":{\"name\":\"type\",\"example\":\"hidden\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be hidden.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mysecretvariable\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"default\",\"example\":\"1\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the data which needs to be collected.\"},\"properties5\":{\"name\":\"filter\",\"example\":\"STRING\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties4\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"}}', 'provides a hidden field for saving a form field whose value cannot be altered directly by a user.', '', 1, 2, '', '', '82f1b5ca-bb9b-44d7-9a7a-9a03fb2a31dd'),
@@ -2707,7 +2746,7 @@ INSERT INTO `#__componentbuilder_fieldtype` (`id`, `description`, `name`, `prope
 (30, 'The filelist form field type provides a drop down list of files from a specified directory. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.\r\n\r\nBy default, the first item on the', 'Filelist', '{\"properties0\":{\"name\":\"type\",\"example\":\"filelist\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be filelist.\"},\"properties1\":{\"name\":\"name\",\"example\":\"myfile\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a file\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"directory\",\"example\":\"images\\/stories\",\"adjustable\":\"1\",\"description\":\"(optional) is the filesystem path to the directory containing the files to be listed. If omitted the directory given by JPATH_ROOT is assumed.\"},\"properties4\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default file name.\"},\"properties5\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties6\":{\"name\":\"filter\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a regular expression string which is used to filter the list of files selected for inclusion in the drop-down list. If omitted, all files in the directory are included. The filter argument expression is applied before the exclude argument expression. For information on constructing regular expressions see Regular expressions in parameter arguments.\"},\"properties7\":{\"name\":\"exclude\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a regular expression string which is used to exclude files from the list. The exclude argument expression is applied after the filter argument expression. For information on constructing regular expressions see Regular expressions in parameter arguments.\"},\"properties8\":{\"name\":\"stripext\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a Boolean argument. If true then file name extensions will be stripped from the file names listed. Also note that the file name will be saved without the extension too.\"},\"properties9\":{\"name\":\"hide_none\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a Boolean argument. If true, the \'- Do not use -\' item is omitted from the drop-down list.\"},\"properties10\":{\"name\":\"hide_default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a Boolean argument. If true, the \'- Use default -\' item is omitted from the drop-down list.\"},\"properties11\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'Provides a drop down list of files from a specified directory.', '', 1, 4, '', 1, '0c80df15-52c6-4647-983b-4bb4888a2edf'),
 (31, 'The folderlist form field type provides a drop down list of folders from a specfied directory. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.\r\n\r\nBy default, the first item on ', 'Folderlist', '{\"properties0\":{\"name\":\"type\",\"example\":\"folderlist\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be folderlist.\"},\"properties1\":{\"name\":\"name\",\"example\":\"myfolder\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a folder\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"directory\",\"example\":\"images\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the filesystem path to the directory containing the folders to be listed.\"},\"properties4\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default folder name.\"},\"properties5\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties6\":{\"name\":\"filter\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a regular expression string which is used to filter the list of folders selected for inclusion in the drop-down list. If omitted, all folders in the directory are included. The filter argument expression is applied before the exclude argument expression. For information on constructing regular expressions see Regular expressions in parameter arguments.\"},\"properties7\":{\"name\":\"exclude\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a regular expression string which is used to exclude folders from the list. The exclude argument expression is applied after the filter argument expression. For information on constructing regular expressions see Regular expressions in parameter arguments.\"},\"properties8\":{\"name\":\"hide_none\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a Boolean argument. If true, the \'- Do not use -\' item is omitted from the drop-down list.\"},\"properties9\":{\"name\":\"hide_default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a Boolean argument. If true, the \'- Use default -\' item is omitted from the drop-down list.\"},\"properties10\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'Provides a drop down list of folders from a specified directory.', '', 1, 4, '', 2, 'd3ab2ae4-9370-4497-ae6d-dee2e0b74b7a'),
 (32, 'Note: When using the file input type you should always add the attribute enctype=\"multipart/form-data\" to your form tag. Otherwise, the uploaded files will not be attached correctly.\r\n\r\nNote 2: You can put a soft limit file size by adding a hidden field with name=\"MAX_FILE_SIZE\" and value the maximum allowed bytes which is handled by php, but you must also handle it in your code with or without it.', 'File', '{\"properties0\":{\"name\":\"type\",\"example\":\"file\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be file.\"},\"properties1\":{\"name\":\"name\",\"example\":\"myfilevalue\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Enter some text\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"Choose an image from your computer with maximum 100KB\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value, but doesn\'t mean much for a file.\"},\"properties5\":{\"name\":\"size\",\"example\":\"10\",\"adjustable\":\"1\",\"description\":\"(optional) is the width of the file box in characters.\"},\"properties6\":{\"name\":\"accept\",\"example\":\"image\\/*\",\"adjustable\":\"1\",\"description\":\"(optional) Tells the browser what MIME types your form will allow to be uploaded.\"},\"properties7\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field.\"},\"properties8\":{\"name\":\"labelclass\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) adds a CSS class for form field\'s label; for Joomla 2.5.4+\"},\"properties9\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute\"},\"properties10\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"},\"properties11\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) For Joomla form validating it to be filled in\"},\"properties12\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Whether to Joomla validate the field according to rules\"},\"properties13\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+ https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'Provides an input field for files', '', 1, 9, '', 3, '6da71c1e-119c-4e0d-a309-f3e52ecfa1d1'),
-(33, 'The menuitem form field type provides a drop down grouped list of the available menu items from your Joomla site.', 'menuitem', '{\"properties0\":{\"name\":\"type\",\"example\":\"menuitem\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be menuitem.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mymenuitem\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a menu item\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default menu item. Note that this is the ItemID number of the menu item.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties5\":{\"name\":\"published\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) determines whether all menu items are listed or only published menu items. If state is \'0\' then all menu items will be listed. If state is \'1\' then only published menu items will be listed.\"},\"properties6\":{\"name\":\"filter\",\"example\":\"int\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+ https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides a drop down list of the available menu items from your Joomla site.', '', 1, 5, '', 4, 'f183b0e2-017f-48bd-8dba-d332ce1b8d9e'),
+(33, 'The menuitem form field type provides a drop down grouped list of the available menu items from your Joomla site.', 'Menuitem', '{\"properties0\":{\"name\":\"type\",\"example\":\"menuitem\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be menuitem.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mymenuitem\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a menu item\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default menu item. Note that this is the ItemID number of the menu item.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties5\":{\"name\":\"published\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) determines whether all menu items are listed or only published menu items. If state is \'0\' then all menu items will be listed. If state is \'1\' then only published menu items will be listed.\"},\"properties6\":{\"name\":\"filter\",\"example\":\"int\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+ https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides a drop down list of the available menu items from your Joomla site.', '', 1, 6, '', 4, 'f183b0e2-017f-48bd-8dba-d332ce1b8d9e'),
 (34, 'Remember all views already have [accesslevel] added by default, only add this if you need more custom access selection! Provides a dropdown list of accesslevel options with the current option selected.', 'Accesslevel', '{\"properties0\":{\"name\":\"type\",\"example\":\"accesslevel\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be accesslevel\"},\"properties1\":{\"name\":\"name\",\"example\":\"accesstwo\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field. This must match the name of the query results column that contains the values that will be shown to the user in the drop-down list, unless a different name is specified in the value_field attribute. \"},\"properties2\":{\"name\":\"label\",\"example\":\"Access Two\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"Select an access level to this concept.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field.\"},\"properties5\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the field required true if yes.\"},\"properties6\":{\"name\":\"multiple\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) If set to multiple then allows more than one usergroup to be selected.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'List of accesslevels', '', 1, 4, '', 5, '913ed2ce-836c-48e8-97af-e482441f47df'),
 (35, 'Provides a form with rows of fields that you specify. As many options can be added as desired. Note this form field has a jQuery based javascript file as a dependency.', 'Subform', '{\"properties0\":{\"name\":\"type\",\"example\":\"subform\",\"description\":\"(mandatory) must be subform.\"},\"properties1\":{\"name\":\"name\",\"example\":\"options\",\"adjustable\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter\"},\"properties2\":{\"name\":\"label\",\"example\":\"The Option List\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"layout\",\"example\":\"joomla.form.field.subform.repeatable-table\",\"adjustable\":\"1\",\"description\":\"(mandatory) The layout for the repeatable table.\"},\"properties4\":{\"name\":\"component\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) To change the component where it should search for layout\"},\"properties5\":{\"name\":\"client\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Function to initialise the application clientFrontend: site or 0Backend: admin or 1\"},\"properties6\":{\"name\":\"multiple\",\"example\":\"true\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The rows to be multiple.\"},\"properties7\":{\"name\":\"buttons\",\"example\":\"add,remove,move\",\"adjustable\":\"1\",\"description\":\"(optional) Which buttons to show if multiple mode is true.Options: add,remove,move\"},\"properties8\":{\"name\":\"fields\",\"example\":\"1,2,3\",\"adjustable\":\"1\",\"description\":\"(mandatory) The fields to add to the modal. All fields must first be created in component builder as a field before you can add them here, since you must use the id of the field. Separate the field ids with commas. Do not add custom fields that are not also used in this component.\"},\"properties9\":{\"name\":\"formsource\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) you can add a path to a xml file containing the fields.\"},\"properties10\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) description text for the form field. Displays at the top of the modal with the name as well as in the usual position in the form\"},\"properties11\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The default value for the form field if the field is left empty. Note this has to be a json string compatible with the contents of the form field.\"},\"properties12\":{\"name\":\"icon\",\"example\":\"list\",\"adjustable\":\"1\",\"description\":\"(optional) The icon to show on the select button (is prefixed with \\\"icon-\\\").\"},\"properties13\":{\"name\":\"max\",\"example\":\"50\",\"adjustable\":\"1\",\"description\":\"(optional) The maximum number of rows of fields allowed (by default 999 to be effectively infinite)\"},\"properties14\":{\"name\":\"min\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The minimum number of rows of fields required\"},\"properties15\":{\"name\":\"filter\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Use only if you would like to save raw data, since the default is best.\"},\"properties16\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'Allows form fields which can have as many options as the user desires.', '', 1, 14, '', 6, '7139f2c8-a70a-46a6-bbe3-4eefe54ca515'),
 (36, 'Provides an input field for an email address.', 'Email', '{\"properties0\":{\"name\":\"type\",\"example\":\"email\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be email.\"},\"properties1\":{\"name\":\"name\",\"example\":\"email\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Email Address\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"size\",\"example\":\"10\",\"adjustable\":\"1\",\"description\":\"(optional) is the width of the text box in characters. If omitted the width is determined by the browser. The value of size does not limit the number of characters that may be entered.\"},\"properties4\":{\"name\":\"maxlength\",\"example\":\"50\",\"adjustable\":\"1\",\"description\":\"(optional) limits the number of characters that may be entered.\"},\"properties5\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties6\":{\"name\":\"description\",\"example\":\"Enter some description\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties7\":{\"name\":\"class\",\"example\":\"inputbox\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\"},\"properties8\":{\"name\":\"readonly\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties9\":{\"name\":\"disabled\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties10\":{\"name\":\"required\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties11\":{\"name\":\"filter\",\"example\":\"STRING\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties12\":{\"name\":\"validate\",\"example\":\"email\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties13\":{\"name\":\"unique\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) Used in validation, to check if we should test for uniqueness, to insure that this email does not already belong to another user. Check line 99 in \\/libraries\\/src\\/Form\\/Rule\\/EmailRule.php\"},\"properties14\":{\"name\":\"field\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) used in validation of \\\"equals\\\" to link the field to match.\"},\"properties15\":{\"name\":\"message\",\"example\":\"Error! Please add some text here.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) The error message that will be displayed instead of the default message.\"},\"properties16\":{\"name\":\"hint\",\"example\":\"your@email.com\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) The placeholder to display inside the text box.\"},\"properties17\":{\"name\":\"autocomplete\",\"example\":\"on\",\"adjustable\":\"1\",\"description\":\"(optional) The autocomplete state for the form field.  If \'off\' element will not be automatically completed by browser.\"},\"properties18\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+ https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties19\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"}}', 'Email form field type', '', 1, 7, '', 7, '35948af5-9e79-4454-8dfa-682ee4fdf650'),
@@ -2721,7 +2760,8 @@ INSERT INTO `#__componentbuilder_fieldtype` (`id`, `description`, `name`, `prope
 (44, 'The imagelist form field type provides a drop down list of image files in a specified directory. Only files with .png, .gif, .jpg, .bmp, .ico extensions are listed. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.\r\n\r\nBy default, the first item on the list is \'- Do not use -\' (which is translatable) and is given the value \'-1\' and this is followed by \'- Use default -\' (also translatable) given the value \'0\'.', 'Imagelist', '{\"properties0\":{\"name\":\"type\",\"example\":\"imagelist\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be imagelist.\"},\"properties1\":{\"name\":\"name\",\"example\":\"myimagelist\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select an image\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"directory\",\"example\":\"images\\/stories\",\"adjustable\":\"1\",\"description\":\"(optional) is the filesystem path to the directory containing the image files to be listed. If omitted the directory given by JPATH_ROOT is assumed.\"},\"properties4\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default image file name.\"},\"properties5\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties6\":{\"name\":\"filter\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a regular expression string which is used to filter the list of image files selected for inclusion in the drop-down list. If omitted, all image files in the directory are included. The filter argument expression is applied before the exclude argument expression. For information on constructing regular expressions see Regular expressions in parameter arguments.\"},\"properties7\":{\"name\":\"exclude\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a regular expression string which is used to exclude image files from the list. The exclude argument expression is applied after the filter argument expression. For information on constructing regular expressions see Regular expressions in parameter arguments.\"},\"properties8\":{\"name\":\"stripext\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a Boolean argument. If true then file name extensions will be stripped from the image file names listed. Also note that the file name will be saved without the extension too.\"},\"properties9\":{\"name\":\"hide_none\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a Boolean argument. If true, the \'- Do not use -\' item is omitted from the drop-down list.\"},\"properties10\":{\"name\":\"hide_default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a Boolean argument. If true, the \'- Use default -\' item is omitted from the drop-down list.\"},\"properties11\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'Provides a drop down list of image files from a specified directory.', '', 1, 3, '', 14, '72680e92-2859-49c6-ad92-c2329c52f9f8'),
 (45, '', 'Modal Menu', '{\"properties0\":{\"name\":\"type\",\"example\":\"modal_menu\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be modal_menu.\"},\"properties1\":{\"name\":\"name\",\"example\":\"base\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Base Item\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"option\",\"example\":\"Current\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) set the options of this radio. Separate options with commas and use the pipe symbol to separate value from text.\"},\"properties4\":{\"name\":\"select\",\"example\":\"true\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) show select options\"},\"properties5\":{\"name\":\"new\",\"example\":\"true\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory)\"},\"properties6\":{\"name\":\"edit\",\"example\":\"true\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory)\"},\"properties7\":{\"name\":\"description\",\"example\":\"Select a menu item to always be used as the base for the menu display. You must set the Start Level to the same level or higher than the level of the base item. This will cause the module to be displayed on all assigned pages. If Current is selected the active item is used as the base. This causes the module to only display when the parent menu item is active.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties8\":{\"name\":\"clear\",\"example\":\"true\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory)\"},\"properties9\":{\"name\":\"disable\",\"example\":\"separator,alias,heading,url\",\"adjustable\":\"1\",\"description\":\"(optional)\"},\"properties10\":{\"name\":\"filter\",\"example\":\"integer\",\"adjustable\":\"1\",\"description\":\"(optional) is a regular expression string which is used to filter the list of image files selected for inclusion in the drop-down list. If omitted, all image files in the directory are included. The filter argument expression is applied before the exclude argument expression. For information on constructing regular expressions see Regular expressions in parameter arguments.\"},\"properties11\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\\r\\n\"}}', 'Modal Menu', '', 1, 7, '', 15, '715256a4-8cc2-4d66-9d08-31e58ca5b036'),
 (46, 'The menu form field type provides a drop down list of the available menus from your Joomla! site. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected. ', 'Menu', '{\"properties0\":{\"name\":\"type\",\"example\":\"menu\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be menu.\"},\"properties1\":{\"name\":\"name\",\"example\":\"menutype\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the filed.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Menu to Show\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"Choose which menu should be rendered with this instance of module.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) tooltip for the form field.\"},\"properties4\":{\"name\":\"clientid\",\"example\":\"0\",\"adjustable\":\"1\",\"description\":\"\"},\"properties5\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default menu. Note that this is the name of the menu shown in the Type column on the Menu Manager screen and not the menu ID number.\"},\"properties6\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+ https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties7\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"}}', 'Menu Type', '', 1, 4, '', 16, '6349f152-8ef5-43bd-a89b-ce18f33ac5e5'),
-(47, 'Dynamic Checkboxes', 'DynamicCheckboxes@', '{\"properties0\":{\"name\":\"type\",\"example\":\"change_this\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type. You can also not use the \\\"_\\\" (underscore) or \\\"-\\\" (hyphen) in the type name, and no spaces.\"},\"properties1\":{\"name\":\"name\",\"example\":\"dynamic_checkboxes\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Dynamic Checkboxes\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"The checkbox linked to global subform of the same name\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"option\",\"example\":\"1|Default\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) set the options of this checkboxes. Separate options with commas and use the pipe symbol to separate value from text.\"},\"properties5\":{\"name\":\"default\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties6\":{\"name\":\"required\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties8\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"},\"properties9\":{\"name\":\"extends\",\"example\":\"checkboxes\",\"mandatory\":\"1\",\"description\":\"Must be checkboxes\"},\"properties10\":{\"name\":\"type_phpHEADER_1\",\"example\":\"\\\\JFormHelper::loadFieldClass(\'checkboxes\');\\r\\nuse VDM\\\\Joomla\\\\Utilities\\\\Component\\\\Helper;\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The Header USE options\"},\"properties11\":{\"name\":\"type_php_1\",\"example\":\"\\t\\/**\\r\\n\\t * Method to get the data to be passed to the layout for rendering.\\r\\n\\t *\\r\\n\\t * @return  array\\r\\n\\t *\\r\\n\\t * @since   3.5\\r\\n\\t *\\/\\r\\n\\tprotected function getLayoutData()\\r\\n\\t{\\r\\n\\t\\t$data = parent::getLayoutData();\\r\\n\\r\\n\\t\\t\\/\\/ True if the field has \'value\' set. In other words, it has been stored, don\'t use the default values.\\r\\n\\t\\t$hasValue = (isset($this->value) && !empty($this->value));\\r\\n\\r\\n\\t\\t\\/\\/ If a value has been stored, use it. Otherwise, use the defaults.\\r\\n\\t\\t$checkedOptions = $hasValue ? $this->value : $this->checkedOptions;\\r\\n\\r\\n\\t\\t\\/\\/ get the form options\\r\\n\\t\\t$options = $this->getOptions();\\r\\n\\r\\n\\t\\t\\/\\/ get the component params\\r\\n\\t\\t$params = Helper::getParams();\\r\\n\\t\\t$subform  = $params->get($this->fieldname);\\r\\n\\r\\n\\t\\t\\/\\/ add the paths found in global settings\\r\\n\\t\\tif (is_array($subform) && $subform !== [])\\r\\n\\t\\t{\\r\\n\\t\\t\\tforeach ($subform as $value)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\tif (isset($value->path) && strlen($value->path) > 3)\\r\\n\\t\\t\\t\\t{\\r\\n\\t\\t\\t\\t\\t$tmp = new \\\\stdClass;\\r\\n\\t\\t\\t\\t\\t$tmp->value = $value->set_me;\\r\\n\\t\\t\\t\\t\\t$tmp->text = $value->set_me;\\r\\n\\t\\t\\t\\t\\t$tmp->checked = false;\\r\\n\\r\\n\\t\\t\\t\\t\\t$options[] = $tmp;\\r\\n\\t\\t\\t\\t}\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\r\\n\\t\\t$extraData = array(\\r\\n\\t\\t\\t\'checkedOptions\' => is_array($checkedOptions) ? $checkedOptions : explode(\',\', (string) $checkedOptions),\\r\\n\\t\\t\\t\'hasValue\'       => $hasValue,\\r\\n\\t\\t\\t\'options\'        => $options\\r\\n\\t\\t);\\r\\n\\r\\n\\t\\treturn array_merge($data, $extraData);\\r\\n\\t}\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The php for the getLayoutData method.\"}}', 'Super Power Repository Paths', '', 1, 14, '', 12, '7ed21e79-cbc5-48e3-9ed0-ca72b0f2f1a1');
+(47, 'Dynamic Checkboxes', 'DynamicCheckboxes@', '{\"properties0\":{\"name\":\"type\",\"example\":\"change_this\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type. You can also not use the \\\"_\\\" (underscore) or \\\"-\\\" (hyphen) in the type name, and no spaces.\"},\"properties1\":{\"name\":\"name\",\"example\":\"dynamic_checkboxes\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Dynamic Checkboxes\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"The checkbox linked to global subform of the same name\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"option\",\"example\":\"1|Default\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) set the options of this checkboxes. Separate options with commas and use the pipe symbol to separate value from text.\"},\"properties5\":{\"name\":\"default\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties6\":{\"name\":\"required\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties8\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"},\"properties9\":{\"name\":\"extends\",\"example\":\"checkboxes\",\"mandatory\":\"1\",\"description\":\"Must be checkboxes\"},\"properties10\":{\"name\":\"type_phpHEADER_1\",\"example\":\"\\\\JFormHelper::loadFieldClass(\'checkboxes\');\\r\\nuse VDM\\\\Joomla\\\\Utilities\\\\Component\\\\Helper;\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The Header USE options\"},\"properties11\":{\"name\":\"type_php_1\",\"example\":\"\\t\\/**\\r\\n\\t * Method to get the data to be passed to the layout for rendering.\\r\\n\\t *\\r\\n\\t * @return  array\\r\\n\\t *\\r\\n\\t * @since   3.5\\r\\n\\t *\\/\\r\\n\\tprotected function getLayoutData()\\r\\n\\t{\\r\\n\\t\\t$data = parent::getLayoutData();\\r\\n\\r\\n\\t\\t\\/\\/ True if the field has \'value\' set. In other words, it has been stored, don\'t use the default values.\\r\\n\\t\\t$hasValue = (isset($this->value) && !empty($this->value));\\r\\n\\r\\n\\t\\t\\/\\/ If a value has been stored, use it. Otherwise, use the defaults.\\r\\n\\t\\t$checkedOptions = $hasValue ? $this->value : $this->checkedOptions;\\r\\n\\r\\n\\t\\t\\/\\/ get the form options\\r\\n\\t\\t$options = $this->getOptions();\\r\\n\\r\\n\\t\\t\\/\\/ get the component params\\r\\n\\t\\t$params = Helper::getParams();\\r\\n\\t\\t$subform  = $params->get($this->fieldname);\\r\\n\\r\\n\\t\\t\\/\\/ add the paths found in global settings\\r\\n\\t\\tif (is_array($subform) && $subform !== [])\\r\\n\\t\\t{\\r\\n\\t\\t\\tforeach ($subform as $value)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\tif (isset($value->path) && strlen($value->path) > 3)\\r\\n\\t\\t\\t\\t{\\r\\n\\t\\t\\t\\t\\t$tmp = new \\\\stdClass;\\r\\n\\t\\t\\t\\t\\t$tmp->value = $value->set_me;\\r\\n\\t\\t\\t\\t\\t$tmp->text = $value->set_me;\\r\\n\\t\\t\\t\\t\\t$tmp->checked = false;\\r\\n\\r\\n\\t\\t\\t\\t\\t$options[] = $tmp;\\r\\n\\t\\t\\t\\t}\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\r\\n\\t\\t$extraData = array(\\r\\n\\t\\t\\t\'checkedOptions\' => is_array($checkedOptions) ? $checkedOptions : explode(\',\', (string) $checkedOptions),\\r\\n\\t\\t\\t\'hasValue\'       => $hasValue,\\r\\n\\t\\t\\t\'options\'        => $options\\r\\n\\t\\t);\\r\\n\\r\\n\\t\\treturn array_merge($data, $extraData);\\r\\n\\t}\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The php for the getLayoutData method.\"}}', 'Super Power Repository Paths', '', 1, 14, '', 12, '7ed21e79-cbc5-48e3-9ed0-ca72b0f2f1a1'),
+(48, 'The ModalSelectField offers an intuitive, user-friendly modal popup interface within Joomla\'s administrator forms. It enables users to select existing records, create new records, edit existing records, or clear selected records directly from within the form. The field retrieves and displays the selected record\'s title dynamically, based on configurable database parameters. It simplifies relational data handling, enhancing the user experience by minimizing page transitions and streamlining record management tasks in Joomla administration interfaces.', 'ModalSelect', '{\"properties0\":{\"name\":\"type\",\"example\":\"ModalSelect\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be ModalSelect.\"},\"properties1\":{\"name\":\"name\",\"example\":\"targetview\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Enter some text\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"sql_title_table\",\"example\":\"#__###component###_targetview\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"Database table (with prefix) used for retrieving title.\"},\"properties4\":{\"name\":\"sql_title_column\",\"example\":\"title\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"Column used for the title display in the modal input field.\"},\"properties5\":{\"name\":\"sql_title_key\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"Primary key column name of the selected item (usually id).\"},\"properties6\":{\"name\":\"urlSelect\",\"example\":\"index.php?option=com_###component###&amp;view=targetviews&amp;layout=modal&amp;tmpl=component&amp;titleKey=id\",\"adjustable\":\"1\",\"description\":\"URL for opening modal to select an existing record. Important note, the [titleKey] in the url must be equal to [sql_title_key]\"},\"properties7\":{\"name\":\"urlNew\",\"example\":\"index.php?option=com_###component###&amp;task=targetview.add&amp;layout=modal&amp;tmpl=component\",\"adjustable\":\"1\",\"description\":\"URL for opening modal to create a new record.\"},\"properties8\":{\"name\":\"urlEdit\",\"example\":\"index.php?option=com_###component###&amp;task=targetview.edit&amp;id={id}&amp;layout=modal&amp;tmpl=component\",\"adjustable\":\"1\",\"description\":\"URL for editing selected record. {id} dynamically replaced with the [sql_title_key] valiue.\"},\"properties9\":{\"name\":\"titleSelect\",\"example\":\"Select Targetview\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"Modal title for the record selection window.\"},\"properties10\":{\"name\":\"titleNew\",\"example\":\"New Targetview\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"Modal title displayed when creating a new record.\"},\"properties11\":{\"name\":\"titleEdit\",\"example\":\"Edit Targetview\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"Modal title displayed when editing existing record.\"},\"properties12\":{\"name\":\"iconSelect\",\"example\":\"icon-copy\",\"adjustable\":\"1\",\"description\":\"CSS icon class from Icomoon or FontAwesome for select button.\"},\"properties13\":{\"name\":\"select\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"Allow users to select a record (true\\/false). Default: true.\"},\"properties14\":{\"name\":\"new\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"Allow users to create a new record (true\\/false). Default: false.\"},\"properties15\":{\"name\":\"edit\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"Allow editing of selected record (true\\/false). Default: false.\"},\"properties16\":{\"name\":\"clear\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"Allow clearing of the current selection (true\\/false). Default: true.\"},\"properties17\":{\"name\":\"required\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties18\":{\"name\":\"class\",\"example\":\"input-large\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'input-large\'.\"},\"properties19\":{\"name\":\"description\",\"example\":\"Enter some description\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties20\":{\"name\":\"hint\",\"example\":\"Select a Targetview\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) The placeholder to display inside the text box.\"},\"properties21\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value of the field (item ID).\"},\"properties22\":{\"name\":\"readonly\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties23\":{\"name\":\"disabled\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties24\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+ https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'Provides a modal popup to select, create, edit, or clear a database record.  (J5+ only)', '', 1, 28, '', 17, 'a1cdb0a5-517c-425c-998a-333e92af3e32');
 
 --
 -- Dumping data for table `#__componentbuilder_language`
@@ -2847,14 +2887,21 @@ INSERT INTO `#__componentbuilder_admin_fields` (`id`, `addfields`, `admin_view`,
 (284, '{\"0\":{\"field\":\"725e856a-b8cc-4590-90e3-3eed6fd0873c\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"1\"},\"1\":{\"field\":\"77a1711b-ad1f-4379-921b-5e4ef5c31a42\",\"list\":\"1\",\"order_list\":\"3\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"2\"},\"2\":{\"field\":\"68c1e141-fb2e-49a6-bf56-1da6d8a058e8\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"3\"},\"3\":{\"field\":\"c2f884f9-31a0-4bb9-8310-64b5d9132d32\",\"list\":\"1\",\"order_list\":\"2\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"1\"},\"4\":{\"field\":\"080b92dc-a4b4-46b2-83d4-3430284f5e06\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"2\"},\"5\":{\"field\":\"ed28e30c-30c3-4830-afdc-5a61bf25cd49\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"3\"},\"6\":{\"field\":\"2e24a9fe-5793-46be-b071-631c0b18d8f4\",\"list\":\"1\",\"order_list\":\"4\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"1\"},\"7\":{\"field\":\"3f1fedeb-b943-42a7-88e7-c4f1eb1fd8a4\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"2\"},\"8\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\"}}', '224eb9c7-8b40-48cf-bf77-2afa291fd54a', 1, '2024-09-06 22:48:18', '2024-09-17 22:00:38', 9, '', 45, ''),
 (285, '{\"0\":{\"field\":\"3dfab308-41de-4d11-9c94-4ba330a202ac\",\"list\":\"1\",\"order_list\":\"2\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"1\"},\"1\":{\"field\":\"2e24a9fe-5793-46be-b071-631c0b18d8f4\",\"list\":\"\",\"order_list\":\"0\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"1\"},\"2\":{\"field\":\"3f1fedeb-b943-42a7-88e7-c4f1eb1fd8a4\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"2\"},\"3\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\"}}', '60b7b30d-9229-4ce2-b055-9efbb7ac4cea', 1, '2024-09-06 22:53:19', '0000-00-00 00:00:00', 1, '', 46, ''),
 (288, '{\"0\":{\"field\":\"c6e1e451-99b8-4e1b-aa19-c48c3513bf4f\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":3,\"order_edit\":\"0\",\"permission\":[\"1\",\"2\",\"3\"]},\"1\":{\"field\":\"2e24a9fe-5793-46be-b071-631c0b18d8f4\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"2\":{\"field\":\"3f1fedeb-b943-42a7-88e7-c4f1eb1fd8a4\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"2\",\"permission\":[\"3\"]},\"3\":{\"field\":\"0f4fa86e-25a8-4bbf-91a3-7ea9790b4df8\",\"list\":\"1\",\"order_list\":\"2\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"3\",\"permission\":[\"1\",\"2\",\"3\"]},\"4\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\",\"permission\":[\"3\"]}}', 'ab2bbdfc-c0a0-4ffc-9556-67d5af8bec64', 1, '2025-02-16 17:37:08', '', 1, '', 48, ''),
-(289, '{\"0\":{\"field\":\"2d0566ab-cfbe-4ca2-8d05-8e2c70eda191\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":3,\"order_edit\":\"2\",\"permission\":[\"1\",\"2\",\"3\"]},\"1\":{\"field\":\"91939b1a-c4d6-4531-8356-63bc4ca243fb\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"2\":{\"field\":\"11698dc6-8ff6-4662-b3b7-e47494463a08\",\"list\":\"1\",\"order_list\":\"2\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"2\",\"permission\":[\"1\",\"2\",\"3\"]},\"3\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\",\"permission\":[\"3\"]}}', 'a9f19a16-fadb-44ea-a9b6-41130aad05ec', 1, '2025-02-16 19:16:27', '2025-02-16 19:16:59', 2, '', 49, '');
+(289, '{\"0\":{\"field\":\"2d0566ab-cfbe-4ca2-8d05-8e2c70eda191\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":3,\"order_edit\":\"2\",\"permission\":[\"1\",\"2\",\"3\"]},\"1\":{\"field\":\"91939b1a-c4d6-4531-8356-63bc4ca243fb\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"2\":{\"field\":\"11698dc6-8ff6-4662-b3b7-e47494463a08\",\"list\":\"1\",\"order_list\":\"2\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"2\",\"permission\":[\"1\",\"2\",\"3\"]},\"3\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\",\"permission\":[\"3\"]}}', 'a9f19a16-fadb-44ea-a9b6-41130aad05ec', 1, '2025-02-16 19:16:27', '2025-02-16 19:16:59', 2, '', 49, ''),
+(291, '{\"0\":{\"field\":\"8d1b9d7e-77c1-43d9-bc97-0dd021bfe779\",\"list\":\"1\",\"order_list\":\"2\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"2\",\"permission\":[\"1\"]},\"1\":{\"field\":\"4321fa80-702d-4ff5-ab3c-05507d3007a9\",\"list\":\"1\",\"order_list\":\"2\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"2\",\"permission\":[\"1\"]},\"2\":{\"field\":\"f7d3d78e-2d35-4884-a997-d073f853d095\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"3\",\"permission\":[\"1\"]},\"3\":{\"field\":\"09c22738-6c6f-48ca-a24d-d439757e8619\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"4\",\"permission\":[\"1\"]},\"4\":{\"field\":\"2039d1c3-162c-401c-96fe-f127683ee3fe\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"1\",\"permission\":[\"1\"]},\"5\":{\"field\":\"fa0ead84-06c8-4f18-89ae-4cdf646fd961\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"2\",\"permission\":[\"1\"]},\"6\":{\"field\":\"5d3d34dd-4876-4c6a-86ab-b4e162f22c08\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"7\":{\"field\":\"af59b3ac-6a00-42c0-bbe2-edf90dec6081\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"2\",\"permission\":[\"1\"]},\"8\":{\"field\":\"6630c034-f87f-4c5c-ab72-e5ae0e4c0e5b\",\"list\":\"2\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"2\",\"alignment\":3,\"order_edit\":\"0\",\"permission\":[\"1\"]},\"9\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\"}}', '6c6345a1-e3e4-4840-8918-831034e95b19', 1, '2025-03-24 08:26:24', '2025-03-27 06:14:35', 20, '', 51, ''),
+(292, '{\"0\":{\"field\":\"5d3d34dd-4876-4c6a-86ab-b4e162f22c08\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"1\":{\"field\":\"1e666136-800a-486d-a8e8-13a054b7acde\",\"list\":\"1\",\"order_list\":\"2\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"2\",\"permission\":[\"1\",\"2\",\"3\"]},\"2\":{\"field\":\"f7d3d78e-2d35-4884-a997-d073f853d095\",\"list\":\"1\",\"order_list\":\"3\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"3\":{\"field\":\"09c22738-6c6f-48ca-a24d-d439757e8619\",\"list\":\"1\",\"order_list\":\"5\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"2\",\"permission\":[\"1\",\"2\",\"3\"]},\"4\":{\"field\":\"af59b3ac-6a00-42c0-bbe2-edf90dec6081\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"3\",\"permission\":[\"1\"]},\"5\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\"}}', '3dbb581b-619a-4fb0-a6f6-e4a136ea31e2', 1, '2025-03-24 10:26:17', '2025-03-27 06:13:54', 10, '', 52, ''),
+(293, '{\"0\":{\"field\":\"f921d762-f5f1-4811-b1f5-71840c003a4e\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"1\":{\"field\":\"c20d4692-6e97-4441-83bd-561b73730407\",\"list\":\"1\",\"order_list\":\"2\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"2\",\"permission\":[\"1\"]},\"2\":{\"field\":\"c35e18fa-cade-48b8-b067-6289cc7a0f60\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"3\",\"permission\":[\"1\"]},\"3\":{\"field\":\"480c9734-2820-4a61-afea-75b1db3fadc9\",\"list\":\"1\",\"order_list\":\"3\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"1\",\"permission\":[\"1\"]},\"4\":{\"field\":\"17788601-b3f8-439e-8ad7-11c7f8109e22\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"2\",\"permission\":[\"1\"]},\"5\":{\"field\":\"8d1b9d7e-77c1-43d9-bc97-0dd021bfe779\",\"list\":\"1\",\"order_list\":\"4\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":3,\"order_edit\":\"1\",\"permission\":[\"1\"]},\"6\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\",\"permission\":[\"1\"]}}', '75061367-79c2-4d5b-a75d-eca6d33507df', 1, '2025-03-24 10:48:37', '2025-03-27 13:40:19', 9, '', 53, ''),
+(294, '{\"0\":{\"field\":\"95f46f99-0909-4a47-879b-ede06ef35fb8\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"1\",\"permission\":[\"1\"]},\"1\":{\"field\":\"2039d1c3-162c-401c-96fe-f127683ee3fe\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"2\",\"permission\":[\"1\"]},\"2\":{\"field\":\"19b4a840-cf4e-4012-8fae-b1439af74f5a\",\"list\":\"1\",\"order_list\":\"3\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"3\",\"permission\":[\"1\"]},\"3\":{\"field\":\"baeaf484-f61b-4688-8b8a-e3ace669b7a7\",\"list\":\"1\",\"order_list\":\"4\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"4\",\"permission\":[\"1\"]},\"4\":{\"field\":\"2aad92a4-895d-46cb-b0df-751da1bdd703\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"5\",\"permission\":[\"1\"]},\"5\":{\"field\":\"8ba72283-32fa-4a34-8c0d-d52adfed1aa5\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"6\",\"permission\":[\"1\"]},\"6\":{\"field\":\"4b964b88-36b4-4f26-a828-0e798ce9af38\",\"list\":\"1\",\"order_list\":\"5\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"7\",\"permission\":[\"1\"]},\"7\":{\"field\":\"59f0d051-768e-41de-87a0-f47551f7d0d1\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"8\",\"permission\":[\"1\"]},\"8\":{\"field\":\"c9a4c765-a0f9-42da-8fa9-df41ab70c448\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"9\",\"permission\":[\"1\"]},\"9\":{\"field\":\"40da896f-5054-4bb2-aa58-1cdfb391f544\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"1\",\"permission\":[\"1\"]},\"10\":{\"field\":\"149140a8-d0a6-4b62-a880-bb796e2145d8\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"2\",\"permission\":[\"1\"]},\"11\":{\"field\":\"c4c23fad-fd03-41cc-b5db-25f60b8ee11f\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"3\",\"permission\":[\"1\"]},\"12\":{\"field\":\"962ec39f-78d4-42ee-9626-7b778d2eea25\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"4\",\"permission\":[\"1\"]},\"13\":{\"field\":\"b71ee1ab-78ea-4cc7-aa2e-490a4d01a03f\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"5\",\"permission\":[\"1\"]},\"14\":{\"field\":\"f7d3d78e-2d35-4884-a997-d073f853d095\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"6\",\"permission\":[\"1\"]},\"15\":{\"field\":\"09c22738-6c6f-48ca-a24d-d439757e8619\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"7\",\"permission\":[\"1\"]},\"16\":{\"field\":\"c803e176-923f-43a8-a542-12e27619a5f2\",\"list\":\"2\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"8\",\"permission\":[\"1\"]},\"17\":{\"field\":\"5d3d34dd-4876-4c6a-86ab-b4e162f22c08\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"18\":{\"field\":\"af59b3ac-6a00-42c0-bbe2-edf90dec6081\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"2\",\"permission\":[\"1\"]},\"19\":{\"field\":\"9a21f28b-b818-4cc5-b18a-c3fa33a5876d\",\"list\":\"2\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"2\",\"alignment\":3,\"order_edit\":\"0\",\"permission\":[\"1\"]},\"20\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\"}}', '6acc4069-1c33-4470-85a6-07bc9bb16d10', 1, '2025-03-24 12:36:05', '2025-03-27 08:09:05', 24, '', 54, ''),
+(295, '{\"0\":{\"field\":\"8d1b9d7e-77c1-43d9-bc97-0dd021bfe779\",\"list\":\"1\",\"order_list\":\"2\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"1\":{\"field\":\"7f3ccb20-7c57-433a-987b-b53d801004f3\",\"list\":\"1\",\"order_list\":\"3\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"2\":{\"field\":\"5d3d34dd-4876-4c6a-86ab-b4e162f22c08\",\"list\":\"1\",\"order_list\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"3\":{\"field\":\"335866ce-b81b-4329-901d-c20254135c9c\",\"list\":\"\",\"order_list\":\"0\",\"alias\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"2\"},\"4\":{\"field\":\"3f1fedeb-b943-42a7-88e7-c4f1eb1fd8a4\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":4,\"order_edit\":\"3\"},\"5\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\"}}', 'dfcee97f-e5c6-43a0-bd18-3f2c50830b37', -2, '2025-03-25 07:24:00', '2025-03-24 14:08:29', 1, '', 52, ''),
+(296, '{\"0\":{\"field\":\"5d3d34dd-4876-4c6a-86ab-b4e162f22c08\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"1\":{\"field\":\"af59b3ac-6a00-42c0-bbe2-edf90dec6081\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"1\",\"permission\":[\"1\"]},\"2\":{\"field\":\"cb04e362-61c0-4a07-8d80-d13b6939a72c\",\"list\":\"2\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":3,\"order_edit\":\"1\",\"permission\":[\"1\"]},\"3\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\"}}', '9eefa86b-6294-4512-8d62-979abf16c00d', 1, '2025-03-25 09:14:22', '2025-03-27 13:56:42', 9, '', 55, ''),
+(297, '{\"0\":{\"field\":\"5d3d34dd-4876-4c6a-86ab-b4e162f22c08\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":1,\"order_edit\":\"1\",\"permission\":[\"1\",\"2\",\"3\"]},\"1\":{\"field\":\"af59b3ac-6a00-42c0-bbe2-edf90dec6081\",\"list\":\"\",\"order_list\":\"0\",\"search\":\"1\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":2,\"order_edit\":\"1\",\"permission\":[\"1\"]},\"2\":{\"field\":\"7f3ccb20-7c57-433a-987b-b53d801004f3\",\"list\":\"1\",\"order_list\":\"2\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":3,\"order_edit\":\"1\",\"permission\":[\"1\"]},\"3\":{\"field\":\"4d96ceea-7dd1-45c3-86fd-0d73d66332a8\",\"list\":\"2\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"1\",\"alignment\":3,\"order_edit\":\"2\",\"permission\":[\"1\"]},\"4\":{\"field\":\"5aa57bbe-7b19-4db9-915c-561863458d2b\",\"list\":\"\",\"order_list\":\"0\",\"filter\":\"\",\"tab\":\"15\",\"alignment\":1,\"order_edit\":\"0\"}}', '2e451812-45af-4015-aa0c-f5912702c9af', 1, '2025-03-25 13:22:01', '2025-03-27 14:57:31', 7, '', 56, '');
 
 --
 -- Dumping data for table `#__componentbuilder_component_admin_views`
 --
 
 INSERT INTO `#__componentbuilder_component_admin_views` (`id`, `addadmin_views`, `joomla_component`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `params`) VALUES
-(27, '{\"addadmin_views0\":{\"adminview\":\"c1053952-8a84-4398-aef1-41726f7c0043\",\"icomoon\":\"eye-open\",\"mainmenu\":\"1\",\"dashboard_add\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"joomla_fields\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"2\",\"filter\":\"2\",\"edit_create_site_view\":\"1\",\"order\":\"1\"},\"addadmin_views1\":{\"adminview\":\"595ba2c9-21fa-43a4-9af7-93c9cfb21b82\",\"icomoon\":\"plus\",\"mainmenu\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"2\"},\"addadmin_views2\":{\"adminview\":\"224eb9c7-8b40-48cf-bf77-2afa291fd54a\",\"icomoon\":\"file\",\"mainmenu\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"3\"},\"addadmin_views3\":{\"adminview\":\"19a973ea-cdfa-4c79-bbbd-1b8a37286b27\",\"icomoon\":\"file-check\",\"mainmenu\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"4\"},\"addadmin_views4\":{\"adminview\":\"60b7b30d-9229-4ce2-b055-9efbb7ac4cea\",\"icomoon\":\"users\",\"mainmenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"5\"},\"addadmin_views5\":{\"adminview\":\"a9f19a16-fadb-44ea-a9b6-41130aad05ec\",\"icomoon\":\"upload\",\"mainmenu\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"6\"},\"addadmin_views6\":{\"adminview\":\"ab2bbdfc-c0a0-4ffc-9556-67d5af8bec64\",\"icomoon\":\"envelope\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"7\"}}', 'efde995e-60aa-4b39-b644-44349dfb660d', 1, '2017-10-28 03:56:26', '2025-02-19 09:21:34', 13, '', '', '');
+(27, '{\"addadmin_views0\":{\"adminview\":\"c1053952-8a84-4398-aef1-41726f7c0043\",\"icomoon\":\"eye-open\",\"mainmenu\":\"1\",\"dashboard_add\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"joomla_fields\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"2\",\"filter\":\"2\",\"edit_create_site_view\":\"1\",\"order\":\"1\"},\"addadmin_views1\":{\"adminview\":\"595ba2c9-21fa-43a4-9af7-93c9cfb21b82\",\"icomoon\":\"plus\",\"mainmenu\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"2\"},\"addadmin_views2\":{\"adminview\":\"9eefa86b-6294-4512-8d62-979abf16c00d\",\"icomoon\":\"shield\",\"mainmenu\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"3\"},\"addadmin_views3\":{\"adminview\":\"2e451812-45af-4015-aa0c-f5912702c9af\",\"icomoon\":\"pie\",\"mainmenu\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"4\"},\"addadmin_views4\":{\"adminview\":\"6acc4069-1c33-4470-85a6-07bc9bb16d10\",\"icomoon\":\"camera\",\"mainmenu\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"5\"},\"addadmin_views5\":{\"adminview\":\"6c6345a1-e3e4-4840-8918-831034e95b19\",\"icomoon\":\"pin\",\"mainmenu\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"6\"},\"addadmin_views6\":{\"adminview\":\"3dbb581b-619a-4fb0-a6f6-e4a136ea31e2\",\"icomoon\":\"cart\",\"mainmenu\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"7\"},\"addadmin_views7\":{\"adminview\":\"224eb9c7-8b40-48cf-bf77-2afa291fd54a\",\"icomoon\":\"file\",\"mainmenu\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"8\"},\"addadmin_views12\":{\"adminview\":\"75061367-79c2-4d5b-a75d-eca6d33507df\",\"icomoon\":\"clock\",\"mainmenu\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"9\"},\"addadmin_views8\":{\"adminview\":\"19a973ea-cdfa-4c79-bbbd-1b8a37286b27\",\"icomoon\":\"file-check\",\"mainmenu\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"10\"},\"addadmin_views9\":{\"adminview\":\"60b7b30d-9229-4ce2-b055-9efbb7ac4cea\",\"icomoon\":\"users\",\"mainmenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"11\"},\"addadmin_views10\":{\"adminview\":\"a9f19a16-fadb-44ea-a9b6-41130aad05ec\",\"icomoon\":\"upload\",\"mainmenu\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"12\"},\"addadmin_views11\":{\"adminview\":\"ab2bbdfc-c0a0-4ffc-9556-67d5af8bec64\",\"icomoon\":\"envelope\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"access\":\"1\",\"add_api\":\"0\",\"filter\":\"2\",\"edit_create_site_view\":\"\",\"order\":\"13\"}}', 'efde995e-60aa-4b39-b644-44349dfb660d', 1, '2017-10-28 03:56:26', '2025-03-26 12:21:46', 20, '', '', '');
 
 --
 -- Dumping data for table `#__componentbuilder_component_site_views`
@@ -2875,14 +2922,14 @@ INSERT INTO `#__componentbuilder_component_custom_admin_views` (`id`, `addcustom
 --
 
 INSERT INTO `#__componentbuilder_component_updates` (`id`, `joomla_component`, `version_update`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `params`) VALUES
-(27, 'efde995e-60aa-4b39-b644-44349dfb660d', '{\"version_update0\":{\"version\":\"5.0.1\",\"mysql\":\"\",\"url\":\"https:\\/\\/git.vdm.dev\\/joomla\\/Demo-Component\\/archive\\/v5.0.1.zip\",\"update_server_adv\":\"0\",\"update_server_type\":\"component\",\"update_element\":\"\",\"update_state\":\"stable\",\"update_target_version\":\"5\\\\.[012]\",\"change_log\":\"\",\"update_client\":\"site\"}}', 1, '2017-10-28 03:56:26', '2025-02-19 09:06:07', 14, '', '', '');
+(27, 'efde995e-60aa-4b39-b644-44349dfb660d', '{\"version_update0\":{\"version\":\"5.0.1\",\"mysql\":\"\",\"url\":\"https:\\/\\/git.vdm.dev\\/joomla\\/Demo-Component\\/archive\\/v5.0.1.zip\",\"update_server_adv\":\"0\",\"update_server_type\":\"component\",\"update_element\":\"\",\"update_state\":\"stable\",\"update_target_version\":\"5\\\\.[012]\",\"change_log\":\"\",\"update_client\":\"site\"}}', 1, '2017-10-28 03:56:26', '2025-03-27 13:48:22', 25, '', '', '');
 
 --
 -- Dumping data for table `#__componentbuilder_component_mysql_tweaks`
 --
 
 INSERT INTO `#__componentbuilder_component_mysql_tweaks` (`id`, `joomla_component`, `sql_tweak`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `params`) VALUES
-(27, 'efde995e-60aa-4b39-b644-44349dfb660d', '{}', 1, '2017-10-28 03:56:26', '2024-09-07 03:00:20', 3, '', '', '');
+(27, 'efde995e-60aa-4b39-b644-44349dfb660d', '{}', 1, '2017-10-28 03:56:26', '2025-03-28 12:19:32', 9, '', '', '');
 
 --
 -- Dumping data for table `#__componentbuilder_component_custom_admin_menus`
diff --git a/admin/sql/updates/mysql/3.2.5.sql b/admin/sql/updates/mysql/3_2_5.sql
similarity index 100%
rename from admin/sql/updates/mysql/3.2.5.sql
rename to admin/sql/updates/mysql/3_2_5.sql
diff --git a/admin/sql/updates/mysql/4.1.0.sql b/admin/sql/updates/mysql/4_1_0.sql
similarity index 100%
rename from admin/sql/updates/mysql/4.1.0.sql
rename to admin/sql/updates/mysql/4_1_0.sql
diff --git a/admin/sql/updates/mysql/5.0.0.sql b/admin/sql/updates/mysql/5_0_0.sql
similarity index 100%
rename from admin/sql/updates/mysql/5.0.0.sql
rename to admin/sql/updates/mysql/5_0_0.sql
diff --git a/admin/sql/updates/mysql/5.0.1.sql b/admin/sql/updates/mysql/5_0_1.sql
similarity index 100%
rename from admin/sql/updates/mysql/5.0.1.sql
rename to admin/sql/updates/mysql/5_0_1.sql
diff --git a/admin/sql/updates/mysql/5.0.2.sql b/admin/sql/updates/mysql/5_0_2.sql
similarity index 100%
rename from admin/sql/updates/mysql/5.0.2.sql
rename to admin/sql/updates/mysql/5_0_2.sql
diff --git a/admin/sql/updates/mysql/5.0.3.sql b/admin/sql/updates/mysql/5_0_3.sql
similarity index 100%
rename from admin/sql/updates/mysql/5.0.3.sql
rename to admin/sql/updates/mysql/5_0_3.sql
diff --git a/admin/sql/updates/mysql/5.1.0.sql b/admin/sql/updates/mysql/5_1_0.sql
similarity index 100%
rename from admin/sql/updates/mysql/5.1.0.sql
rename to admin/sql/updates/mysql/5_1_0.sql
diff --git a/admin/sql/updates/mysql/5_1_1-alpha.sql b/admin/sql/updates/mysql/5_1_1-alpha.sql
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/admin/sql/updates/mysql/5_1_1-alpha.sql
@@ -0,0 +1 @@
+
diff --git a/admin/src/Controller/Admin_custom_tabsController.php b/admin/src/Controller/Admin_custom_tabsController.php
index 7de7d87c7..b5f3899ae 100644
--- a/admin/src/Controller/Admin_custom_tabsController.php
+++ b/admin/src/Controller/Admin_custom_tabsController.php
@@ -217,7 +217,7 @@ class Admin_custom_tabsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Admin_custom_tabs', '', []);
diff --git a/admin/src/Controller/Admin_fieldsController.php b/admin/src/Controller/Admin_fieldsController.php
index b560a05da..76a6198a7 100644
--- a/admin/src/Controller/Admin_fieldsController.php
+++ b/admin/src/Controller/Admin_fieldsController.php
@@ -217,7 +217,7 @@ class Admin_fieldsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Admin_fields', '', []);
diff --git a/admin/src/Controller/Admin_fields_conditionsController.php b/admin/src/Controller/Admin_fields_conditionsController.php
index b64fad2a4..1d2fad1cc 100644
--- a/admin/src/Controller/Admin_fields_conditionsController.php
+++ b/admin/src/Controller/Admin_fields_conditionsController.php
@@ -217,7 +217,7 @@ class Admin_fields_conditionsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Admin_fields_conditions', '', []);
diff --git a/admin/src/Controller/Admin_fields_relationsController.php b/admin/src/Controller/Admin_fields_relationsController.php
index cd2947d51..866fbb591 100644
--- a/admin/src/Controller/Admin_fields_relationsController.php
+++ b/admin/src/Controller/Admin_fields_relationsController.php
@@ -217,7 +217,7 @@ class Admin_fields_relationsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Admin_fields_relations', '', []);
diff --git a/admin/src/Controller/Admin_viewController.php b/admin/src/Controller/Admin_viewController.php
index bce92de1d..9ce1f5235 100644
--- a/admin/src/Controller/Admin_viewController.php
+++ b/admin/src/Controller/Admin_viewController.php
@@ -219,7 +219,7 @@ class Admin_viewController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Admin_view', '', []);
diff --git a/admin/src/Controller/Class_extendsController.php b/admin/src/Controller/Class_extendsController.php
index d02753f63..550a8c6e4 100644
--- a/admin/src/Controller/Class_extendsController.php
+++ b/admin/src/Controller/Class_extendsController.php
@@ -217,7 +217,7 @@ class Class_extendsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Class_extends', '', []);
diff --git a/admin/src/Controller/Class_methodController.php b/admin/src/Controller/Class_methodController.php
index 884091bd9..d7bafe77e 100644
--- a/admin/src/Controller/Class_methodController.php
+++ b/admin/src/Controller/Class_methodController.php
@@ -217,7 +217,7 @@ class Class_methodController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Class_method', '', []);
diff --git a/admin/src/Controller/Class_propertyController.php b/admin/src/Controller/Class_propertyController.php
index 75164ff4d..d7827677c 100644
--- a/admin/src/Controller/Class_propertyController.php
+++ b/admin/src/Controller/Class_propertyController.php
@@ -217,7 +217,7 @@ class Class_propertyController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Class_property', '', []);
diff --git a/admin/src/Controller/Component_admin_viewsController.php b/admin/src/Controller/Component_admin_viewsController.php
index eaae33ba3..e526e3149 100644
--- a/admin/src/Controller/Component_admin_viewsController.php
+++ b/admin/src/Controller/Component_admin_viewsController.php
@@ -217,7 +217,7 @@ class Component_admin_viewsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_admin_views', '', []);
diff --git a/admin/src/Controller/Component_configController.php b/admin/src/Controller/Component_configController.php
index e2fa146c8..5ec9d88b2 100644
--- a/admin/src/Controller/Component_configController.php
+++ b/admin/src/Controller/Component_configController.php
@@ -217,7 +217,7 @@ class Component_configController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_config', '', []);
diff --git a/admin/src/Controller/Component_custom_admin_menusController.php b/admin/src/Controller/Component_custom_admin_menusController.php
index 94563c494..c429cd1fe 100644
--- a/admin/src/Controller/Component_custom_admin_menusController.php
+++ b/admin/src/Controller/Component_custom_admin_menusController.php
@@ -217,7 +217,7 @@ class Component_custom_admin_menusController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_custom_admin_menus', '', []);
diff --git a/admin/src/Controller/Component_custom_admin_viewsController.php b/admin/src/Controller/Component_custom_admin_viewsController.php
index 07db19a02..360d25594 100644
--- a/admin/src/Controller/Component_custom_admin_viewsController.php
+++ b/admin/src/Controller/Component_custom_admin_viewsController.php
@@ -217,7 +217,7 @@ class Component_custom_admin_viewsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_custom_admin_views', '', []);
diff --git a/admin/src/Controller/Component_dashboardController.php b/admin/src/Controller/Component_dashboardController.php
index 312720827..4377d23ab 100644
--- a/admin/src/Controller/Component_dashboardController.php
+++ b/admin/src/Controller/Component_dashboardController.php
@@ -217,7 +217,7 @@ class Component_dashboardController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_dashboard', '', []);
diff --git a/admin/src/Controller/Component_files_foldersController.php b/admin/src/Controller/Component_files_foldersController.php
index 5f100fde1..2e47946c0 100644
--- a/admin/src/Controller/Component_files_foldersController.php
+++ b/admin/src/Controller/Component_files_foldersController.php
@@ -217,7 +217,7 @@ class Component_files_foldersController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_files_folders', '', []);
diff --git a/admin/src/Controller/Component_modulesController.php b/admin/src/Controller/Component_modulesController.php
index 6de33ee47..d87cce7a7 100644
--- a/admin/src/Controller/Component_modulesController.php
+++ b/admin/src/Controller/Component_modulesController.php
@@ -217,7 +217,7 @@ class Component_modulesController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_modules', '', []);
diff --git a/admin/src/Controller/Component_mysql_tweaksController.php b/admin/src/Controller/Component_mysql_tweaksController.php
index bb4730173..1743b0165 100644
--- a/admin/src/Controller/Component_mysql_tweaksController.php
+++ b/admin/src/Controller/Component_mysql_tweaksController.php
@@ -217,7 +217,7 @@ class Component_mysql_tweaksController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_mysql_tweaks', '', []);
diff --git a/admin/src/Controller/Component_placeholdersController.php b/admin/src/Controller/Component_placeholdersController.php
index 2a1d4ce0e..240190eba 100644
--- a/admin/src/Controller/Component_placeholdersController.php
+++ b/admin/src/Controller/Component_placeholdersController.php
@@ -217,7 +217,7 @@ class Component_placeholdersController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_placeholders', '', []);
diff --git a/admin/src/Controller/Component_pluginsController.php b/admin/src/Controller/Component_pluginsController.php
index 176e1fc69..1a213eb7d 100644
--- a/admin/src/Controller/Component_pluginsController.php
+++ b/admin/src/Controller/Component_pluginsController.php
@@ -217,7 +217,7 @@ class Component_pluginsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_plugins', '', []);
diff --git a/admin/src/Controller/Component_routerController.php b/admin/src/Controller/Component_routerController.php
index b8c479edf..a373323f7 100644
--- a/admin/src/Controller/Component_routerController.php
+++ b/admin/src/Controller/Component_routerController.php
@@ -217,7 +217,7 @@ class Component_routerController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_router', '', []);
diff --git a/admin/src/Controller/Component_site_viewsController.php b/admin/src/Controller/Component_site_viewsController.php
index 9a8889671..d0440411e 100644
--- a/admin/src/Controller/Component_site_viewsController.php
+++ b/admin/src/Controller/Component_site_viewsController.php
@@ -217,7 +217,7 @@ class Component_site_viewsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_site_views', '', []);
diff --git a/admin/src/Controller/Component_updatesController.php b/admin/src/Controller/Component_updatesController.php
index 62b4415cc..88d66337e 100644
--- a/admin/src/Controller/Component_updatesController.php
+++ b/admin/src/Controller/Component_updatesController.php
@@ -221,7 +221,7 @@ class Component_updatesController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Component_updates', '', []);
diff --git a/admin/src/Controller/Custom_admin_viewController.php b/admin/src/Controller/Custom_admin_viewController.php
index ad4ac2da7..73056e45c 100644
--- a/admin/src/Controller/Custom_admin_viewController.php
+++ b/admin/src/Controller/Custom_admin_viewController.php
@@ -217,7 +217,7 @@ class Custom_admin_viewController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Custom_admin_view', '', []);
diff --git a/admin/src/Controller/Custom_codeController.php b/admin/src/Controller/Custom_codeController.php
index c4f0bd5cf..26d1f71bb 100644
--- a/admin/src/Controller/Custom_codeController.php
+++ b/admin/src/Controller/Custom_codeController.php
@@ -217,7 +217,7 @@ class Custom_codeController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Custom_code', '', []);
diff --git a/admin/src/Controller/Dynamic_getController.php b/admin/src/Controller/Dynamic_getController.php
index 11eca111e..35bb54693 100644
--- a/admin/src/Controller/Dynamic_getController.php
+++ b/admin/src/Controller/Dynamic_getController.php
@@ -217,7 +217,7 @@ class Dynamic_getController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Dynamic_get', '', []);
diff --git a/admin/src/Controller/FieldController.php b/admin/src/Controller/FieldController.php
index acbfae439..b2f41d87e 100644
--- a/admin/src/Controller/FieldController.php
+++ b/admin/src/Controller/FieldController.php
@@ -216,7 +216,7 @@ class FieldController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Field', '', []);
diff --git a/admin/src/Controller/FieldtypeController.php b/admin/src/Controller/FieldtypeController.php
index df9596c02..f9d96f9cd 100644
--- a/admin/src/Controller/FieldtypeController.php
+++ b/admin/src/Controller/FieldtypeController.php
@@ -368,7 +368,7 @@ class FieldtypeController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Fieldtype', '', []);
diff --git a/admin/src/Controller/Help_documentController.php b/admin/src/Controller/Help_documentController.php
index 1df9b54b9..051db2abe 100644
--- a/admin/src/Controller/Help_documentController.php
+++ b/admin/src/Controller/Help_documentController.php
@@ -217,7 +217,7 @@ class Help_documentController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Help_document', '', []);
diff --git a/admin/src/Controller/Joomla_componentController.php b/admin/src/Controller/Joomla_componentController.php
index fc1669e70..715d42621 100644
--- a/admin/src/Controller/Joomla_componentController.php
+++ b/admin/src/Controller/Joomla_componentController.php
@@ -219,7 +219,7 @@ class Joomla_componentController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Joomla_component', '', []);
diff --git a/admin/src/Controller/Joomla_moduleController.php b/admin/src/Controller/Joomla_moduleController.php
index 9ddb03860..9cbbe0674 100644
--- a/admin/src/Controller/Joomla_moduleController.php
+++ b/admin/src/Controller/Joomla_moduleController.php
@@ -219,7 +219,7 @@ class Joomla_moduleController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Joomla_module', '', []);
diff --git a/admin/src/Controller/Joomla_module_files_folders_urlsController.php b/admin/src/Controller/Joomla_module_files_folders_urlsController.php
index 3f9653eb8..51730ade8 100644
--- a/admin/src/Controller/Joomla_module_files_folders_urlsController.php
+++ b/admin/src/Controller/Joomla_module_files_folders_urlsController.php
@@ -217,7 +217,7 @@ class Joomla_module_files_folders_urlsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Joomla_module_files_folders_urls', '', []);
diff --git a/admin/src/Controller/Joomla_module_updatesController.php b/admin/src/Controller/Joomla_module_updatesController.php
index 13861ccf4..7c0a9cca8 100644
--- a/admin/src/Controller/Joomla_module_updatesController.php
+++ b/admin/src/Controller/Joomla_module_updatesController.php
@@ -220,7 +220,7 @@ class Joomla_module_updatesController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Joomla_module_updates', '', []);
diff --git a/admin/src/Controller/Joomla_pluginController.php b/admin/src/Controller/Joomla_pluginController.php
index 4b5aaee95..e466decb9 100644
--- a/admin/src/Controller/Joomla_pluginController.php
+++ b/admin/src/Controller/Joomla_pluginController.php
@@ -219,7 +219,7 @@ class Joomla_pluginController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Joomla_plugin', '', []);
diff --git a/admin/src/Controller/Joomla_plugin_files_folders_urlsController.php b/admin/src/Controller/Joomla_plugin_files_folders_urlsController.php
index f68428065..9c901aa35 100644
--- a/admin/src/Controller/Joomla_plugin_files_folders_urlsController.php
+++ b/admin/src/Controller/Joomla_plugin_files_folders_urlsController.php
@@ -217,7 +217,7 @@ class Joomla_plugin_files_folders_urlsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Joomla_plugin_files_folders_urls', '', []);
diff --git a/admin/src/Controller/Joomla_plugin_groupController.php b/admin/src/Controller/Joomla_plugin_groupController.php
index 10e337ec7..e3c99a29e 100644
--- a/admin/src/Controller/Joomla_plugin_groupController.php
+++ b/admin/src/Controller/Joomla_plugin_groupController.php
@@ -210,7 +210,7 @@ class Joomla_plugin_groupController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Joomla_plugin_group', '', []);
diff --git a/admin/src/Controller/Joomla_plugin_updatesController.php b/admin/src/Controller/Joomla_plugin_updatesController.php
index c6cc0165a..512cf6043 100644
--- a/admin/src/Controller/Joomla_plugin_updatesController.php
+++ b/admin/src/Controller/Joomla_plugin_updatesController.php
@@ -219,7 +219,7 @@ class Joomla_plugin_updatesController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Joomla_plugin_updates', '', []);
diff --git a/admin/src/Controller/Joomla_powerController.php b/admin/src/Controller/Joomla_powerController.php
index 27acd0a48..24360152f 100644
--- a/admin/src/Controller/Joomla_powerController.php
+++ b/admin/src/Controller/Joomla_powerController.php
@@ -369,7 +369,7 @@ class Joomla_powerController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Joomla_power', '', []);
diff --git a/admin/src/Controller/LanguageController.php b/admin/src/Controller/LanguageController.php
index 48f337e5a..71a1d938d 100644
--- a/admin/src/Controller/LanguageController.php
+++ b/admin/src/Controller/LanguageController.php
@@ -217,7 +217,7 @@ class LanguageController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Language', '', []);
diff --git a/admin/src/Controller/Language_translationController.php b/admin/src/Controller/Language_translationController.php
index 18bd4d593..9c84dea70 100644
--- a/admin/src/Controller/Language_translationController.php
+++ b/admin/src/Controller/Language_translationController.php
@@ -217,7 +217,7 @@ class Language_translationController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Language_translation', '', []);
diff --git a/admin/src/Controller/LayoutController.php b/admin/src/Controller/LayoutController.php
index 3a4c9adb5..e4797a4ef 100644
--- a/admin/src/Controller/LayoutController.php
+++ b/admin/src/Controller/LayoutController.php
@@ -217,7 +217,7 @@ class LayoutController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Layout', '', []);
diff --git a/admin/src/Controller/LibraryController.php b/admin/src/Controller/LibraryController.php
index 66318fc50..a456a26e8 100644
--- a/admin/src/Controller/LibraryController.php
+++ b/admin/src/Controller/LibraryController.php
@@ -219,7 +219,7 @@ class LibraryController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Library', '', []);
diff --git a/admin/src/Controller/Library_configController.php b/admin/src/Controller/Library_configController.php
index 0d463e9b3..711da70cc 100644
--- a/admin/src/Controller/Library_configController.php
+++ b/admin/src/Controller/Library_configController.php
@@ -217,7 +217,7 @@ class Library_configController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Library_config', '', []);
diff --git a/admin/src/Controller/Library_files_folders_urlsController.php b/admin/src/Controller/Library_files_folders_urlsController.php
index 3cc9ca66b..dcf8bb9c4 100644
--- a/admin/src/Controller/Library_files_folders_urlsController.php
+++ b/admin/src/Controller/Library_files_folders_urlsController.php
@@ -217,7 +217,7 @@ class Library_files_folders_urlsController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Library_files_folders_urls', '', []);
diff --git a/admin/src/Controller/PlaceholderController.php b/admin/src/Controller/PlaceholderController.php
index 636b69ab3..b23ed8ae5 100644
--- a/admin/src/Controller/PlaceholderController.php
+++ b/admin/src/Controller/PlaceholderController.php
@@ -217,7 +217,7 @@ class PlaceholderController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Placeholder', '', []);
diff --git a/admin/src/Controller/PowerController.php b/admin/src/Controller/PowerController.php
index d7c7c8bae..4b7e5c96c 100644
--- a/admin/src/Controller/PowerController.php
+++ b/admin/src/Controller/PowerController.php
@@ -24,6 +24,7 @@ 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
@@ -80,6 +81,50 @@ 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.
 	 *
@@ -369,7 +414,7 @@ class PowerController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Power', '', []);
diff --git a/admin/src/Controller/RepositoryController.php b/admin/src/Controller/RepositoryController.php
index 812a4e5c8..2f01e58fa 100644
--- a/admin/src/Controller/RepositoryController.php
+++ b/admin/src/Controller/RepositoryController.php
@@ -217,7 +217,7 @@ class RepositoryController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Repository', '', []);
diff --git a/admin/src/Controller/ServerController.php b/admin/src/Controller/ServerController.php
index 36e368f4d..3cc781e4d 100644
--- a/admin/src/Controller/ServerController.php
+++ b/admin/src/Controller/ServerController.php
@@ -217,7 +217,7 @@ class ServerController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Server', '', []);
diff --git a/admin/src/Controller/Site_viewController.php b/admin/src/Controller/Site_viewController.php
index a23946ac2..3279008c9 100644
--- a/admin/src/Controller/Site_viewController.php
+++ b/admin/src/Controller/Site_viewController.php
@@ -217,7 +217,7 @@ class Site_viewController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Site_view', '', []);
diff --git a/admin/src/Controller/SnippetController.php b/admin/src/Controller/SnippetController.php
index 9179d2bdd..e6db90ae5 100644
--- a/admin/src/Controller/SnippetController.php
+++ b/admin/src/Controller/SnippetController.php
@@ -217,7 +217,7 @@ class SnippetController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Snippet', '', []);
diff --git a/admin/src/Controller/Snippet_typeController.php b/admin/src/Controller/Snippet_typeController.php
index 11ab43e80..be39dc5be 100644
--- a/admin/src/Controller/Snippet_typeController.php
+++ b/admin/src/Controller/Snippet_typeController.php
@@ -217,7 +217,7 @@ class Snippet_typeController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Snippet_type', '', []);
diff --git a/admin/src/Controller/TemplateController.php b/admin/src/Controller/TemplateController.php
index 1c1499a14..85bf33487 100644
--- a/admin/src/Controller/TemplateController.php
+++ b/admin/src/Controller/TemplateController.php
@@ -217,7 +217,7 @@ class TemplateController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Template', '', []);
diff --git a/admin/src/Controller/Validation_ruleController.php b/admin/src/Controller/Validation_ruleController.php
index 05488d584..f4dcb2ed8 100644
--- a/admin/src/Controller/Validation_ruleController.php
+++ b/admin/src/Controller/Validation_ruleController.php
@@ -217,7 +217,7 @@ class Validation_ruleController extends FormController
 	 */
 	public function batch($model = null)
 	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or exit(Text::_('JINVALID_TOKEN'));
 
 		// Set the model
 		$model = $this->getModel('Validation_rule', '', []);
diff --git a/admin/src/Field/AdminviewsField.php b/admin/src/Field/AdminviewsField.php
index a0729d31e..5e1fbf9a6 100644
--- a/admin/src/Field/AdminviewsField.php
+++ b/admin/src/Field/AdminviewsField.php
@@ -42,27 +42,24 @@ class AdminviewsField extends ListField
 	 */
 	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)
+			$db = Factory::getDBO();
+	$query = $db->getQuery(true);
+	$query->select($db->quoteName(array('a.guid','a.system_name'),array('guid','view_table_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 = array();
+	if ($items)
+	{
+		$options[] = Html::_('select.option', '', 'Select an option');
+		foreach($items as $item)
 		{
-			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);
-			}
+			$options[] = Html::_('select.option', $item->guid, $item->view_table_system_name);
 		}
-		return $options;
+	}
+
+	return $options;
 	}
 }
diff --git a/admin/src/Field/CustomadminviewsField.php b/admin/src/Field/CustomadminviewsField.php
deleted file mode 100644
index 67ec93451..000000000
--- a/admin/src/Field/CustomadminviewsField.php
+++ /dev/null
@@ -1,68 +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\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;
-	}
-}
diff --git a/admin/src/Field/FieldsField.php b/admin/src/Field/FieldsField.php
deleted file mode 100644
index 9e158ad5c..000000000
--- a/admin/src/Field/FieldsField.php
+++ /dev/null
@@ -1,77 +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\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;
-	}
-}
diff --git a/admin/src/Field/ModalSelectField.php b/admin/src/Field/ModalSelectField.php
new file mode 100644
index 000000000..921d71c92
--- /dev/null
+++ b/admin/src/Field/ModalSelectField.php
@@ -0,0 +1,69 @@
+<?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;
+	}
+}
\ No newline at end of file
diff --git a/admin/src/Field/NamespacesField.php b/admin/src/Field/NamespacesField.php
deleted file mode 100644
index bc7bca1ec..000000000
--- a/admin/src/Field/NamespacesField.php
+++ /dev/null
@@ -1,96 +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\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;
-
-	}
-}
diff --git a/admin/src/Model/Custom_codesModel.php b/admin/src/Model/Custom_codesModel.php
index 80b0f9d38..bb91182a7 100644
--- a/admin/src/Model/Custom_codesModel.php
+++ b/admin/src/Model/Custom_codesModel.php
@@ -218,6 +218,7 @@ class Custom_codesModel extends ListModel
 
 				$item->target_code = $item->target;
 				// making sure we have the component details
+				
 			}
 		}
 
diff --git a/admin/src/Model/FieldModel.php b/admin/src/Model/FieldModel.php
index 48afe8e64..013521948 100644
--- a/admin/src/Model/FieldModel.php
+++ b/admin/src/Model/FieldModel.php
@@ -1189,7 +1189,7 @@ class FieldModel extends AdminModel
 							}
 						break;
 						case 'type':
-							$property['value'] = TypeHelper::safe($property['value']);
+							$property['value'] = TypeHelper::safe($property['value'], 'com_componentbuilder');
 						break;
 					}
 					// load the property
diff --git a/admin/src/View/Admin_custom_tabs/HtmlView.php b/admin/src/View/Admin_custom_tabs/HtmlView.php
index 661b90c44..dec8baef5 100644
--- a/admin/src/View/Admin_custom_tabs/HtmlView.php
+++ b/admin/src/View/Admin_custom_tabs/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Admin_custom_tabs view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('admin_custom_tabs', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('admin_custom_tabs.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('admin_custom_tabs.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('admin_custom_tabs.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('admin_custom_tabs.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('admin_custom_tabs.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('admin_custom_tabs.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('admin_custom_tabs.create'))
+				{
+					ToolbarHelper::apply('admin_custom_tabs.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('admin_custom_tabs.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('admin_custom_tabs.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('admin_custom_tabs.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('admin_custom_tabs.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('admin_custom_tabs.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('admin_custom_tabs.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('admin_custom_tabs.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Admin_fields/HtmlView.php b/admin/src/View/Admin_fields/HtmlView.php
index 53fe34305..f03dec9b5 100644
--- a/admin/src/View/Admin_fields/HtmlView.php
+++ b/admin/src/View/Admin_fields/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Admin_fields view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('admin_fields', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('admin_fields.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('admin_fields.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('admin_fields.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('admin_fields.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('admin_fields.create'))
+				{
+					ToolbarHelper::apply('admin_fields.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('admin_fields.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('admin_fields.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('admin_fields.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('admin_fields.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('admin_fields.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Admin_fields_conditions/HtmlView.php b/admin/src/View/Admin_fields_conditions/HtmlView.php
index cbcfa83c0..9e3d935a5 100644
--- a/admin/src/View/Admin_fields_conditions/HtmlView.php
+++ b/admin/src/View/Admin_fields_conditions/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Admin_fields_conditions view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('admin_fields_conditions.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('admin_fields_conditions.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('admin_fields_conditions.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('admin_fields_conditions.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('admin_fields_conditions.create'))
+				{
+					ToolbarHelper::apply('admin_fields_conditions.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('admin_fields_conditions.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('admin_fields_conditions.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('admin_fields_conditions.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('admin_fields_conditions.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('admin_fields_conditions.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Admin_fields_relations/HtmlView.php b/admin/src/View/Admin_fields_relations/HtmlView.php
index 352fa2821..20cfe8fb4 100644
--- a/admin/src/View/Admin_fields_relations/HtmlView.php
+++ b/admin/src/View/Admin_fields_relations/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Admin_fields_relations view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('admin_fields_relations', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('admin_fields_relations.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('admin_fields_relations.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('admin_fields_relations.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('admin_fields_relations.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('admin_fields_relations.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('admin_fields_relations.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('admin_fields_relations.create'))
+				{
+					ToolbarHelper::apply('admin_fields_relations.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('admin_fields_relations.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('admin_fields_relations.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('admin_fields_relations.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('admin_fields_relations.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('admin_fields_relations.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('admin_fields_relations.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('admin_fields_relations.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Admin_view/HtmlView.php b/admin/src/View/Admin_view/HtmlView.php
index 3a1263da6..3711ed40f 100644
--- a/admin/src/View/Admin_view/HtmlView.php
+++ b/admin/src/View/Admin_view/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Admin_view view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('admin_view', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('admin_view.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('admin_view.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('admin_view.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('admin_view.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('admin_view.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('admin_view.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('admin_view.create'))
+				{
+					ToolbarHelper::apply('admin_view.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('admin_view.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('admin_view.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('admin_view.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('admin_view.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('admin_view.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('admin_view.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('admin_view.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Admin_views/HtmlView.php b/admin/src/View/Admin_views/HtmlView.php
index 8dc9628d3..47983b057 100644
--- a/admin/src/View/Admin_views/HtmlView.php
+++ b/admin/src/View/Admin_views/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Admins_custom_tabs/HtmlView.php b/admin/src/View/Admins_custom_tabs/HtmlView.php
index 8de77027e..58df48ea9 100644
--- a/admin/src/View/Admins_custom_tabs/HtmlView.php
+++ b/admin/src/View/Admins_custom_tabs/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Admins_fields/HtmlView.php b/admin/src/View/Admins_fields/HtmlView.php
index e30312a8b..17366d14d 100644
--- a/admin/src/View/Admins_fields/HtmlView.php
+++ b/admin/src/View/Admins_fields/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Admins_fields_conditions/HtmlView.php b/admin/src/View/Admins_fields_conditions/HtmlView.php
index 114bf193d..061f723ec 100644
--- a/admin/src/View/Admins_fields_conditions/HtmlView.php
+++ b/admin/src/View/Admins_fields_conditions/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Admins_fields_relations/HtmlView.php b/admin/src/View/Admins_fields_relations/HtmlView.php
index 2b8264544..51befddb1 100644
--- a/admin/src/View/Admins_fields_relations/HtmlView.php
+++ b/admin/src/View/Admins_fields_relations/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Class_extendings/HtmlView.php b/admin/src/View/Class_extendings/HtmlView.php
index 8386af059..cf5fe91f7 100644
--- a/admin/src/View/Class_extendings/HtmlView.php
+++ b/admin/src/View/Class_extendings/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Class_extends/HtmlView.php b/admin/src/View/Class_extends/HtmlView.php
index 33d82329a..8c6ef6702 100644
--- a/admin/src/View/Class_extends/HtmlView.php
+++ b/admin/src/View/Class_extends/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Class_extends view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('class_extends', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_CLASS_EXTENDS_NEW' : 'COM_COMPONENTBUILDER_CLASS_EXTENDS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('class_extends.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('class_extends.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('class_extends.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('class_extends.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('class_extends.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('class_extends.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('class_extends.create'))
+				{
+					ToolbarHelper::apply('class_extends.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('class_extends.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('class_extends.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('class_extends.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('class_extends.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('class_extends.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('class_extends.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('class_extends.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Class_method/HtmlView.php b/admin/src/View/Class_method/HtmlView.php
index 31fbbcd74..8fd61df4d 100644
--- a/admin/src/View/Class_method/HtmlView.php
+++ b/admin/src/View/Class_method/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Class_method view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('class_method', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_CLASS_METHOD_NEW' : 'COM_COMPONENTBUILDER_CLASS_METHOD_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('class_method.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('class_method.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('class_method.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('class_method.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('class_method.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('class_method.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('class_method.create'))
+				{
+					ToolbarHelper::apply('class_method.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('class_method.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('class_method.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('class_method.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('class_method.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('class_method.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('class_method.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('class_method.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Class_methods/HtmlView.php b/admin/src/View/Class_methods/HtmlView.php
index ee7db4a3e..7d31956b8 100644
--- a/admin/src/View/Class_methods/HtmlView.php
+++ b/admin/src/View/Class_methods/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Class_properties/HtmlView.php b/admin/src/View/Class_properties/HtmlView.php
index 897489f67..ba8860d41 100644
--- a/admin/src/View/Class_properties/HtmlView.php
+++ b/admin/src/View/Class_properties/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Class_property/HtmlView.php b/admin/src/View/Class_property/HtmlView.php
index a70dd4356..68568d166 100644
--- a/admin/src/View/Class_property/HtmlView.php
+++ b/admin/src/View/Class_property/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Class_property view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('class_property', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_CLASS_PROPERTY_NEW' : 'COM_COMPONENTBUILDER_CLASS_PROPERTY_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('class_property.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('class_property.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('class_property.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('class_property.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('class_property.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('class_property.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('class_property.create'))
+				{
+					ToolbarHelper::apply('class_property.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('class_property.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('class_property.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('class_property.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('class_property.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('class_property.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('class_property.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('class_property.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_admin_views/HtmlView.php b/admin/src/View/Component_admin_views/HtmlView.php
index 3485454ef..857b115c0 100644
--- a/admin/src/View/Component_admin_views/HtmlView.php
+++ b/admin/src/View/Component_admin_views/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_admin_views view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_admin_views', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_admin_views.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_admin_views.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_admin_views.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_admin_views.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_admin_views.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_admin_views.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_admin_views.create'))
+				{
+					ToolbarHelper::apply('component_admin_views.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_admin_views.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_admin_views.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_admin_views.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_admin_views.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_admin_views.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_admin_views.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_admin_views.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_config/HtmlView.php b/admin/src/View/Component_config/HtmlView.php
index 7853905f7..0d1316e34 100644
--- a/admin/src/View/Component_config/HtmlView.php
+++ b/admin/src/View/Component_config/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_config view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_config', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_config.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_config.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_config.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_config.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_config.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_config.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_config.create'))
+				{
+					ToolbarHelper::apply('component_config.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_config.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_config.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_config.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_config.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_config.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_config.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_config.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_custom_admin_menus/HtmlView.php b/admin/src/View/Component_custom_admin_menus/HtmlView.php
index 8369dabfd..006f96b17 100644
--- a/admin/src/View/Component_custom_admin_menus/HtmlView.php
+++ b/admin/src/View/Component_custom_admin_menus/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_custom_admin_menus view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_custom_admin_menus', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_custom_admin_menus.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_custom_admin_menus.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_custom_admin_menus.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_custom_admin_menus.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_custom_admin_menus.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_custom_admin_menus.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_custom_admin_menus.create'))
+				{
+					ToolbarHelper::apply('component_custom_admin_menus.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_custom_admin_menus.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_custom_admin_menus.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_custom_admin_menus.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_custom_admin_menus.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_custom_admin_menus.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_custom_admin_menus.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_custom_admin_menus.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_custom_admin_views/HtmlView.php b/admin/src/View/Component_custom_admin_views/HtmlView.php
index a67f0f3bc..dd8d6aac7 100644
--- a/admin/src/View/Component_custom_admin_views/HtmlView.php
+++ b/admin/src/View/Component_custom_admin_views/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_custom_admin_views view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_custom_admin_views', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_custom_admin_views.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_custom_admin_views.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_custom_admin_views.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_custom_admin_views.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_custom_admin_views.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_custom_admin_views.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_custom_admin_views.create'))
+				{
+					ToolbarHelper::apply('component_custom_admin_views.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_custom_admin_views.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_custom_admin_views.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_custom_admin_views.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_custom_admin_views.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_custom_admin_views.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_custom_admin_views.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_custom_admin_views.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_dashboard/HtmlView.php b/admin/src/View/Component_dashboard/HtmlView.php
index 95c53b645..2f9a767ca 100644
--- a/admin/src/View/Component_dashboard/HtmlView.php
+++ b/admin/src/View/Component_dashboard/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_dashboard view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_dashboard', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_dashboard.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_dashboard.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_dashboard.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_dashboard.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_dashboard.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_dashboard.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_dashboard.create'))
+				{
+					ToolbarHelper::apply('component_dashboard.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_dashboard.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_dashboard.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_dashboard.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_dashboard.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_dashboard.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_dashboard.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_dashboard.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_files_folders/HtmlView.php b/admin/src/View/Component_files_folders/HtmlView.php
index 9c2ddc95e..64cb9841e 100644
--- a/admin/src/View/Component_files_folders/HtmlView.php
+++ b/admin/src/View/Component_files_folders/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_files_folders view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_files_folders', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_files_folders.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_files_folders.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_files_folders.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_files_folders.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_files_folders.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_files_folders.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_files_folders.create'))
+				{
+					ToolbarHelper::apply('component_files_folders.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_files_folders.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_files_folders.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_files_folders.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_files_folders.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_files_folders.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_files_folders.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_files_folders.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_modules/HtmlView.php b/admin/src/View/Component_modules/HtmlView.php
index fd0f2a7c6..ba35c62a1 100644
--- a/admin/src/View/Component_modules/HtmlView.php
+++ b/admin/src/View/Component_modules/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_modules view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_modules', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_MODULES_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_MODULES_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_modules.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_modules.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_modules.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_modules.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_modules.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_modules.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_modules.create'))
+				{
+					ToolbarHelper::apply('component_modules.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_modules.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_modules.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_modules.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_modules.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_modules.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_modules.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_modules.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_mysql_tweaks/HtmlView.php b/admin/src/View/Component_mysql_tweaks/HtmlView.php
index 2cd557139..939ca8257 100644
--- a/admin/src/View/Component_mysql_tweaks/HtmlView.php
+++ b/admin/src/View/Component_mysql_tweaks/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_mysql_tweaks view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_mysql_tweaks', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_mysql_tweaks.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_mysql_tweaks.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_mysql_tweaks.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_mysql_tweaks.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_mysql_tweaks.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_mysql_tweaks.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_mysql_tweaks.create'))
+				{
+					ToolbarHelper::apply('component_mysql_tweaks.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_mysql_tweaks.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_mysql_tweaks.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_mysql_tweaks.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_mysql_tweaks.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_mysql_tweaks.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_mysql_tweaks.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_mysql_tweaks.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_placeholders/HtmlView.php b/admin/src/View/Component_placeholders/HtmlView.php
index 2ca037603..4c67ee71c 100644
--- a/admin/src/View/Component_placeholders/HtmlView.php
+++ b/admin/src/View/Component_placeholders/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_placeholders view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_placeholders', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_placeholders.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_placeholders.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_placeholders.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_placeholders.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_placeholders.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_placeholders.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_placeholders.create'))
+				{
+					ToolbarHelper::apply('component_placeholders.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_placeholders.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_placeholders.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_placeholders.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_placeholders.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_placeholders.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_placeholders.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_placeholders.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_plugins/HtmlView.php b/admin/src/View/Component_plugins/HtmlView.php
index 758bffa58..d9a588661 100644
--- a/admin/src/View/Component_plugins/HtmlView.php
+++ b/admin/src/View/Component_plugins/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_plugins view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_plugins', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_PLUGINS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_PLUGINS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_plugins.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_plugins.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_plugins.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_plugins.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_plugins.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_plugins.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_plugins.create'))
+				{
+					ToolbarHelper::apply('component_plugins.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_plugins.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_plugins.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_plugins.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_plugins.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_plugins.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_plugins.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_plugins.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_router/HtmlView.php b/admin/src/View/Component_router/HtmlView.php
index f748e8ce8..0df32aa54 100644
--- a/admin/src/View/Component_router/HtmlView.php
+++ b/admin/src/View/Component_router/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_router view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_router', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_ROUTER_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_ROUTER_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_router.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_router.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_router.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_router.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_router.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_router.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_router.create'))
+				{
+					ToolbarHelper::apply('component_router.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_router.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_router.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_router.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_router.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_router.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_router.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_router.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_site_views/HtmlView.php b/admin/src/View/Component_site_views/HtmlView.php
index 17f7cad06..94ab51726 100644
--- a/admin/src/View/Component_site_views/HtmlView.php
+++ b/admin/src/View/Component_site_views/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_site_views view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_site_views', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_site_views.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_site_views.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_site_views.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_site_views.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_site_views.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_site_views.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_site_views.create'))
+				{
+					ToolbarHelper::apply('component_site_views.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_site_views.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_site_views.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_site_views.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_site_views.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_site_views.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_site_views.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_site_views.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Component_updates/HtmlView.php b/admin/src/View/Component_updates/HtmlView.php
index b1f0a6358..0680bbc94 100644
--- a/admin/src/View/Component_updates/HtmlView.php
+++ b/admin/src/View/Component_updates/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Component_updates view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('component_updates', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('component_updates.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('component_updates.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('component_updates.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('component_updates.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('component_updates.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('component_updates.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('component_updates.create'))
+				{
+					ToolbarHelper::apply('component_updates.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_updates.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('component_updates.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('component_updates.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('component_updates.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('component_updates.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('component_updates.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('component_updates.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Components_admin_views/HtmlView.php b/admin/src/View/Components_admin_views/HtmlView.php
index f1383486f..374c088e5 100644
--- a/admin/src/View/Components_admin_views/HtmlView.php
+++ b/admin/src/View/Components_admin_views/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_config/HtmlView.php b/admin/src/View/Components_config/HtmlView.php
index fafa2fc43..0d2037173 100644
--- a/admin/src/View/Components_config/HtmlView.php
+++ b/admin/src/View/Components_config/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_custom_admin_menus/HtmlView.php b/admin/src/View/Components_custom_admin_menus/HtmlView.php
index 3818492c6..edb19f336 100644
--- a/admin/src/View/Components_custom_admin_menus/HtmlView.php
+++ b/admin/src/View/Components_custom_admin_menus/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_custom_admin_views/HtmlView.php b/admin/src/View/Components_custom_admin_views/HtmlView.php
index 2f570315a..a6f3ce074 100644
--- a/admin/src/View/Components_custom_admin_views/HtmlView.php
+++ b/admin/src/View/Components_custom_admin_views/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_dashboard/HtmlView.php b/admin/src/View/Components_dashboard/HtmlView.php
index c6fa187f1..4a95f81f9 100644
--- a/admin/src/View/Components_dashboard/HtmlView.php
+++ b/admin/src/View/Components_dashboard/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_files_folders/HtmlView.php b/admin/src/View/Components_files_folders/HtmlView.php
index 0064ab913..8e0673ff2 100644
--- a/admin/src/View/Components_files_folders/HtmlView.php
+++ b/admin/src/View/Components_files_folders/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_modules/HtmlView.php b/admin/src/View/Components_modules/HtmlView.php
index 128bcd6cc..abd3b9e99 100644
--- a/admin/src/View/Components_modules/HtmlView.php
+++ b/admin/src/View/Components_modules/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_mysql_tweaks/HtmlView.php b/admin/src/View/Components_mysql_tweaks/HtmlView.php
index d516b0c7a..3a3d02b92 100644
--- a/admin/src/View/Components_mysql_tweaks/HtmlView.php
+++ b/admin/src/View/Components_mysql_tweaks/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_placeholders/HtmlView.php b/admin/src/View/Components_placeholders/HtmlView.php
index 6923846ca..efff7d923 100644
--- a/admin/src/View/Components_placeholders/HtmlView.php
+++ b/admin/src/View/Components_placeholders/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_plugins/HtmlView.php b/admin/src/View/Components_plugins/HtmlView.php
index 895055334..55c7378d0 100644
--- a/admin/src/View/Components_plugins/HtmlView.php
+++ b/admin/src/View/Components_plugins/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_routers/HtmlView.php b/admin/src/View/Components_routers/HtmlView.php
index 38c5431a8..fc6de9f30 100644
--- a/admin/src/View/Components_routers/HtmlView.php
+++ b/admin/src/View/Components_routers/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_site_views/HtmlView.php b/admin/src/View/Components_site_views/HtmlView.php
index 79d3b8e4a..459be667c 100644
--- a/admin/src/View/Components_site_views/HtmlView.php
+++ b/admin/src/View/Components_site_views/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Components_updates/HtmlView.php b/admin/src/View/Components_updates/HtmlView.php
index c5e62adf2..c2e8da057 100644
--- a/admin/src/View/Components_updates/HtmlView.php
+++ b/admin/src/View/Components_updates/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Custom_admin_view/HtmlView.php b/admin/src/View/Custom_admin_view/HtmlView.php
index ee1a08e04..6e11f8216 100644
--- a/admin/src/View/Custom_admin_view/HtmlView.php
+++ b/admin/src/View/Custom_admin_view/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Custom_admin_view view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('custom_admin_view', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('core.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('custom_admin_view.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('core.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('custom_admin_view.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('custom_admin_view.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('custom_admin_view.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('core.create'))
+				{
+					ToolbarHelper::apply('custom_admin_view.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('custom_admin_view.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('custom_admin_view.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('custom_admin_view.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('core.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('custom_admin_view.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('custom_admin_view.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('custom_admin_view.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Custom_admin_views/HtmlView.php b/admin/src/View/Custom_admin_views/HtmlView.php
index f241baa75..3425f24c0 100644
--- a/admin/src/View/Custom_admin_views/HtmlView.php
+++ b/admin/src/View/Custom_admin_views/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -263,6 +281,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Custom_code/HtmlView.php b/admin/src/View/Custom_code/HtmlView.php
index 0c08e2059..012990a19 100644
--- a/admin/src/View/Custom_code/HtmlView.php
+++ b/admin/src/View/Custom_code/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Custom_code view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('custom_code', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_CODE_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_CODE_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('custom_code.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('custom_code.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('custom_code.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('custom_code.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('custom_code.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('custom_code.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('custom_code.create'))
+				{
+					ToolbarHelper::apply('custom_code.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('custom_code.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('custom_code.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('custom_code.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('custom_code.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('custom_code.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('custom_code.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('custom_code.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Custom_codes/HtmlView.php b/admin/src/View/Custom_codes/HtmlView.php
index 3c2a3bfb6..5453b6641 100644
--- a/admin/src/View/Custom_codes/HtmlView.php
+++ b/admin/src/View/Custom_codes/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -263,6 +281,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Dynamic_get/HtmlView.php b/admin/src/View/Dynamic_get/HtmlView.php
index 8b91f8cbb..bcce341af 100644
--- a/admin/src/View/Dynamic_get/HtmlView.php
+++ b/admin/src/View/Dynamic_get/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Dynamic_get view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('dynamic_get', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_DYNAMIC_GET_NEW' : 'COM_COMPONENTBUILDER_DYNAMIC_GET_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('dynamic_get.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('dynamic_get.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('dynamic_get.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('dynamic_get.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('dynamic_get.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('dynamic_get.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('dynamic_get.create'))
+				{
+					ToolbarHelper::apply('dynamic_get.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('dynamic_get.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('dynamic_get.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('dynamic_get.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('dynamic_get.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('dynamic_get.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('dynamic_get.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('dynamic_get.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Dynamic_gets/HtmlView.php b/admin/src/View/Dynamic_gets/HtmlView.php
index 16df5eb4b..c65199437 100644
--- a/admin/src/View/Dynamic_gets/HtmlView.php
+++ b/admin/src/View/Dynamic_gets/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Field/HtmlView.php b/admin/src/View/Field/HtmlView.php
index d18d249e8..9eee56597 100644
--- a/admin/src/View/Field/HtmlView.php
+++ b/admin/src/View/Field/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Field view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('field', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_FIELD_NEW' : 'COM_COMPONENTBUILDER_FIELD_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('field.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('field.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('field.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('field.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('field.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('field.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('field.create'))
+				{
+					ToolbarHelper::apply('field.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('field.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('field.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('field.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('field.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('field.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('field.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('field.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Fields/HtmlView.php b/admin/src/View/Fields/HtmlView.php
index 05d32eef5..facb3e7aa 100644
--- a/admin/src/View/Fields/HtmlView.php
+++ b/admin/src/View/Fields/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Fieldtype/HtmlView.php b/admin/src/View/Fieldtype/HtmlView.php
index 74430f6b6..8223cce14 100644
--- a/admin/src/View/Fieldtype/HtmlView.php
+++ b/admin/src/View/Fieldtype/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Fieldtype view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('fieldtype', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -168,7 +185,16 @@ class HtmlView extends BaseHtmlView
 		$this->vxlfields = $this->get('Vxlfields');
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -183,17 +209,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -281,6 +307,81 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_FIELDTYPE_NEW' : 'COM_COMPONENTBUILDER_FIELDTYPE_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('fieldtype.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('fieldtype.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('fieldtype.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('fieldtype.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('fieldtype.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('fieldtype.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('fieldtype.create'))
+				{
+					ToolbarHelper::apply('fieldtype.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('fieldtype.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('fieldtype.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('fieldtype.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('fieldtype.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('fieldtype.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('fieldtype.save', 'JTOOLBAR_SAVE');
+				}
+				if ($this->canDo->get('fieldtype.reset'))
+				{
+					// add Reset button.
+					ToolbarHelper::custom('fieldtype.resetPowers', 'joomla custom-button-resetpowers', '', 'COM_COMPONENTBUILDER_RESET', false);
+				}
+				if ($this->canDo->get('fieldtype.push'))
+				{
+					// add Push button.
+					ToolbarHelper::custom('fieldtype.pushPowers', 'joomla custom-button-pushpowers', '', 'COM_COMPONENTBUILDER_PUSH', false);
+				}
+				ToolbarHelper::cancel('fieldtype.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Fieldtypes/HtmlView.php b/admin/src/View/Fieldtypes/HtmlView.php
index 196445505..52a82054d 100644
--- a/admin/src/View/Fieldtypes/HtmlView.php
+++ b/admin/src/View/Fieldtypes/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -273,6 +291,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Help_document/HtmlView.php b/admin/src/View/Help_document/HtmlView.php
index 989170ab0..414e41427 100644
--- a/admin/src/View/Help_document/HtmlView.php
+++ b/admin/src/View/Help_document/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Help_document view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('help_document', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_HELP_DOCUMENT_NEW' : 'COM_COMPONENTBUILDER_HELP_DOCUMENT_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('help_document.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('help_document.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('help_document.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('help_document.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('help_document.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('help_document.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('help_document.create'))
+				{
+					ToolbarHelper::apply('help_document.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('help_document.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('help_document.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('help_document.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('help_document.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('help_document.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('help_document.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('help_document.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Help_documents/HtmlView.php b/admin/src/View/Help_documents/HtmlView.php
index 1d9868b22..b3f79a61e 100644
--- a/admin/src/View/Help_documents/HtmlView.php
+++ b/admin/src/View/Help_documents/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Joomla_component/HtmlView.php b/admin/src/View/Joomla_component/HtmlView.php
index 194611756..8900d5d56 100644
--- a/admin/src/View/Joomla_component/HtmlView.php
+++ b/admin/src/View/Joomla_component/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Joomla_component view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('joomla_component', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('joomla_component.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('joomla_component.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('joomla_component.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('joomla_component.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('joomla_component.create'))
+				{
+					ToolbarHelper::apply('joomla_component.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('joomla_component.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('joomla_component.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('joomla_component.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('joomla_component.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('joomla_component.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Joomla_components/HtmlView.php b/admin/src/View/Joomla_components/HtmlView.php
index 114081126..196aa1d1d 100644
--- a/admin/src/View/Joomla_components/HtmlView.php
+++ b/admin/src/View/Joomla_components/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -263,6 +281,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Joomla_module/HtmlView.php b/admin/src/View/Joomla_module/HtmlView.php
index eae2f5039..ff815ab28 100644
--- a/admin/src/View/Joomla_module/HtmlView.php
+++ b/admin/src/View/Joomla_module/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Joomla_module view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('joomla_module', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_MODULE_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_MODULE_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('joomla_module.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('joomla_module.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('joomla_module.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('joomla_module.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('joomla_module.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('joomla_module.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('joomla_module.create'))
+				{
+					ToolbarHelper::apply('joomla_module.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_module.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('joomla_module.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('joomla_module.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('joomla_module.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('joomla_module.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_module.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('joomla_module.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Joomla_module_files_folders_urls/HtmlView.php b/admin/src/View/Joomla_module_files_folders_urls/HtmlView.php
index 8f9cf7bc5..7ca65028a 100644
--- a/admin/src/View/Joomla_module_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Joomla_module_files_folders_urls/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Joomla_module_files_folders_urls view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('joomla_module_files_folders_urls', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('joomla_module_files_folders_urls.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('joomla_module_files_folders_urls.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('joomla_module_files_folders_urls.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('joomla_module_files_folders_urls.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('joomla_module_files_folders_urls.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('joomla_module_files_folders_urls.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('joomla_module_files_folders_urls.create'))
+				{
+					ToolbarHelper::apply('joomla_module_files_folders_urls.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_module_files_folders_urls.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('joomla_module_files_folders_urls.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('joomla_module_files_folders_urls.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('joomla_module_files_folders_urls.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('joomla_module_files_folders_urls.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_module_files_folders_urls.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('joomla_module_files_folders_urls.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Joomla_module_updates/HtmlView.php b/admin/src/View/Joomla_module_updates/HtmlView.php
index cb2a30f49..27c53a3fe 100644
--- a/admin/src/View/Joomla_module_updates/HtmlView.php
+++ b/admin/src/View/Joomla_module_updates/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Joomla_module_updates view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('joomla_module_updates', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATES_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATES_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('joomla_module_updates.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('joomla_module_updates.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('joomla_module_updates.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('joomla_module_updates.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('joomla_module_updates.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('joomla_module_updates.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('joomla_module_updates.create'))
+				{
+					ToolbarHelper::apply('joomla_module_updates.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_module_updates.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('joomla_module_updates.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('joomla_module_updates.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('joomla_module_updates.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('joomla_module_updates.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_module_updates.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('joomla_module_updates.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Joomla_modules/HtmlView.php b/admin/src/View/Joomla_modules/HtmlView.php
index 088176548..7f0ac6832 100644
--- a/admin/src/View/Joomla_modules/HtmlView.php
+++ b/admin/src/View/Joomla_modules/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Joomla_modules_files_folders_urls/HtmlView.php b/admin/src/View/Joomla_modules_files_folders_urls/HtmlView.php
index 12dd6f19c..c261b7bca 100644
--- a/admin/src/View/Joomla_modules_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Joomla_modules_files_folders_urls/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Joomla_modules_updates/HtmlView.php b/admin/src/View/Joomla_modules_updates/HtmlView.php
index 4daaf2534..b6c23e87f 100644
--- a/admin/src/View/Joomla_modules_updates/HtmlView.php
+++ b/admin/src/View/Joomla_modules_updates/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Joomla_plugin/HtmlView.php b/admin/src/View/Joomla_plugin/HtmlView.php
index ce9110def..9a567e1a6 100644
--- a/admin/src/View/Joomla_plugin/HtmlView.php
+++ b/admin/src/View/Joomla_plugin/HtmlView.php
@@ -27,6 +27,7 @@ use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -47,6 +48,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -119,6 +128,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Joomla_plugin view display method
 	 *
@@ -142,10 +159,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('joomla_plugin', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -166,7 +183,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -181,17 +207,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -269,6 +295,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('joomla_plugin.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('joomla_plugin.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('joomla_plugin.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('joomla_plugin.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('joomla_plugin.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('joomla_plugin.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('joomla_plugin.create'))
+				{
+					ToolbarHelper::apply('joomla_plugin.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_plugin.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('joomla_plugin.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('joomla_plugin.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('joomla_plugin.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('joomla_plugin.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_plugin.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('joomla_plugin.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Joomla_plugin_files_folders_urls/HtmlView.php b/admin/src/View/Joomla_plugin_files_folders_urls/HtmlView.php
index 60725552b..25638036b 100644
--- a/admin/src/View/Joomla_plugin_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Joomla_plugin_files_folders_urls/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Joomla_plugin_files_folders_urls view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('joomla_plugin_files_folders_urls', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('joomla_plugin_files_folders_urls.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('joomla_plugin_files_folders_urls.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('joomla_plugin_files_folders_urls.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('joomla_plugin_files_folders_urls.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('joomla_plugin_files_folders_urls.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('joomla_plugin_files_folders_urls.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('joomla_plugin_files_folders_urls.create'))
+				{
+					ToolbarHelper::apply('joomla_plugin_files_folders_urls.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_plugin_files_folders_urls.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('joomla_plugin_files_folders_urls.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('joomla_plugin_files_folders_urls.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('joomla_plugin_files_folders_urls.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('joomla_plugin_files_folders_urls.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_plugin_files_folders_urls.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('joomla_plugin_files_folders_urls.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Joomla_plugin_group/HtmlView.php b/admin/src/View/Joomla_plugin_group/HtmlView.php
index 02bf674d9..92a628614 100644
--- a/admin/src/View/Joomla_plugin_group/HtmlView.php
+++ b/admin/src/View/Joomla_plugin_group/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Joomla_plugin_group view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('joomla_plugin_group', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('core.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('joomla_plugin_group.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('core.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('joomla_plugin_group.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('joomla_plugin_group.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('joomla_plugin_group.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('core.create'))
+				{
+					ToolbarHelper::apply('joomla_plugin_group.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_plugin_group.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('joomla_plugin_group.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('joomla_plugin_group.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('core.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('joomla_plugin_group.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_plugin_group.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('joomla_plugin_group.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Joomla_plugin_groups/HtmlView.php b/admin/src/View/Joomla_plugin_groups/HtmlView.php
index 6e986ae11..4267bf576 100644
--- a/admin/src/View/Joomla_plugin_groups/HtmlView.php
+++ b/admin/src/View/Joomla_plugin_groups/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Joomla_plugin_updates/HtmlView.php b/admin/src/View/Joomla_plugin_updates/HtmlView.php
index c3900d0ca..c3d3d0bd5 100644
--- a/admin/src/View/Joomla_plugin_updates/HtmlView.php
+++ b/admin/src/View/Joomla_plugin_updates/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Joomla_plugin_updates view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('joomla_plugin_updates', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('joomla_plugin_updates.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('joomla_plugin_updates.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('joomla_plugin_updates.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('joomla_plugin_updates.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('joomla_plugin_updates.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('joomla_plugin_updates.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('joomla_plugin_updates.create'))
+				{
+					ToolbarHelper::apply('joomla_plugin_updates.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_plugin_updates.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('joomla_plugin_updates.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('joomla_plugin_updates.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('joomla_plugin_updates.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('joomla_plugin_updates.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_plugin_updates.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('joomla_plugin_updates.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Joomla_plugins/HtmlView.php b/admin/src/View/Joomla_plugins/HtmlView.php
index 72af49ff3..fb6e9822d 100644
--- a/admin/src/View/Joomla_plugins/HtmlView.php
+++ b/admin/src/View/Joomla_plugins/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -273,6 +291,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Joomla_plugins_files_folders_urls/HtmlView.php b/admin/src/View/Joomla_plugins_files_folders_urls/HtmlView.php
index 0c3d6a308..2a57f81a0 100644
--- a/admin/src/View/Joomla_plugins_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Joomla_plugins_files_folders_urls/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Joomla_plugins_updates/HtmlView.php b/admin/src/View/Joomla_plugins_updates/HtmlView.php
index 1b3ea8113..9e940020b 100644
--- a/admin/src/View/Joomla_plugins_updates/HtmlView.php
+++ b/admin/src/View/Joomla_plugins_updates/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Joomla_power/HtmlView.php b/admin/src/View/Joomla_power/HtmlView.php
index 875d25775..8b7f0da30 100644
--- a/admin/src/View/Joomla_power/HtmlView.php
+++ b/admin/src/View/Joomla_power/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Joomla_power view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('joomla_power', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -278,6 +304,81 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_POWER_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_POWER_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('joomla_power.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('joomla_power.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('joomla_power.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('joomla_power.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('joomla_power.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('joomla_power.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('joomla_power.create'))
+				{
+					ToolbarHelper::apply('joomla_power.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_power.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('joomla_power.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('joomla_power.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('joomla_power.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('joomla_power.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('joomla_power.save', 'JTOOLBAR_SAVE');
+				}
+				if ($this->canDo->get('joomla_power.reset'))
+				{
+					// add Reset button.
+					ToolbarHelper::custom('joomla_power.resetPowers', 'joomla custom-button-resetpowers', '', 'COM_COMPONENTBUILDER_RESET', false);
+				}
+				if ($this->canDo->get('joomla_power.push'))
+				{
+					// add Push button.
+					ToolbarHelper::custom('joomla_power.pushPowers', 'share custom-button-pushpowers', '', 'COM_COMPONENTBUILDER_PUSH', false);
+				}
+				ToolbarHelper::cancel('joomla_power.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Joomla_powers/HtmlView.php b/admin/src/View/Joomla_powers/HtmlView.php
index 17633b1bd..f1a94cbf0 100644
--- a/admin/src/View/Joomla_powers/HtmlView.php
+++ b/admin/src/View/Joomla_powers/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -273,6 +291,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Language/HtmlView.php b/admin/src/View/Language/HtmlView.php
index b8d4032f3..8eda47a00 100644
--- a/admin/src/View/Language/HtmlView.php
+++ b/admin/src/View/Language/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Language view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('language', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_LANGUAGE_NEW' : 'COM_COMPONENTBUILDER_LANGUAGE_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('language.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('language.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('language.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('language.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('language.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('language.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('language.create'))
+				{
+					ToolbarHelper::apply('language.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('language.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('language.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('language.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('language.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('language.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('language.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('language.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Language_translation/HtmlView.php b/admin/src/View/Language_translation/HtmlView.php
index 5aa6e9b65..eefa92582 100644
--- a/admin/src/View/Language_translation/HtmlView.php
+++ b/admin/src/View/Language_translation/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Language_translation view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('language_translation', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_NEW' : 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('language_translation.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('language_translation.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('language_translation.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('language_translation.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('language_translation.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('language_translation.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('language_translation.create'))
+				{
+					ToolbarHelper::apply('language_translation.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('language_translation.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('language_translation.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('language_translation.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('language_translation.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('language_translation.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('language_translation.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('language_translation.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Language_translations/HtmlView.php b/admin/src/View/Language_translations/HtmlView.php
index 30ab76831..b646bd6b7 100644
--- a/admin/src/View/Language_translations/HtmlView.php
+++ b/admin/src/View/Language_translations/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Languages/HtmlView.php b/admin/src/View/Languages/HtmlView.php
index 85c7e75e7..35e8fff26 100644
--- a/admin/src/View/Languages/HtmlView.php
+++ b/admin/src/View/Languages/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -263,6 +281,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Layout/HtmlView.php b/admin/src/View/Layout/HtmlView.php
index 00119a845..f84fd289e 100644
--- a/admin/src/View/Layout/HtmlView.php
+++ b/admin/src/View/Layout/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Layout view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('layout', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_LAYOUT_NEW' : 'COM_COMPONENTBUILDER_LAYOUT_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('core.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('layout.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('core.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('layout.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('layout.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('layout.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('core.create'))
+				{
+					ToolbarHelper::apply('layout.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('layout.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('layout.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('layout.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('core.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('layout.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('layout.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('layout.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Layouts/HtmlView.php b/admin/src/View/Layouts/HtmlView.php
index 2dc349d99..eb5b877d8 100644
--- a/admin/src/View/Layouts/HtmlView.php
+++ b/admin/src/View/Layouts/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -263,6 +281,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Libraries/HtmlView.php b/admin/src/View/Libraries/HtmlView.php
index 0432d2305..a697fe285 100644
--- a/admin/src/View/Libraries/HtmlView.php
+++ b/admin/src/View/Libraries/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -263,6 +281,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Libraries_config/HtmlView.php b/admin/src/View/Libraries_config/HtmlView.php
index adf45fb2d..fd73ee8a8 100644
--- a/admin/src/View/Libraries_config/HtmlView.php
+++ b/admin/src/View/Libraries_config/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Libraries_files_folders_urls/HtmlView.php b/admin/src/View/Libraries_files_folders_urls/HtmlView.php
index f0194d31f..243eeca89 100644
--- a/admin/src/View/Libraries_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Libraries_files_folders_urls/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Library/HtmlView.php b/admin/src/View/Library/HtmlView.php
index 5f3211518..36d9c2329 100644
--- a/admin/src/View/Library/HtmlView.php
+++ b/admin/src/View/Library/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Library view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('library', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_LIBRARY_NEW' : 'COM_COMPONENTBUILDER_LIBRARY_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('library.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('library.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('library.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('library.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('library.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('library.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('library.create'))
+				{
+					ToolbarHelper::apply('library.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('library.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('library.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('library.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('library.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('library.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('library.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('library.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Library_config/HtmlView.php b/admin/src/View/Library_config/HtmlView.php
index dfd13cda5..103aa93e4 100644
--- a/admin/src/View/Library_config/HtmlView.php
+++ b/admin/src/View/Library_config/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Library_config view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('library_config', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_LIBRARY_CONFIG_NEW' : 'COM_COMPONENTBUILDER_LIBRARY_CONFIG_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('library_config.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('library_config.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('library_config.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('library_config.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('library_config.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('library_config.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('library_config.create'))
+				{
+					ToolbarHelper::apply('library_config.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('library_config.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('library_config.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('library_config.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('library_config.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('library_config.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('library_config.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('library_config.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Library_files_folders_urls/HtmlView.php b/admin/src/View/Library_files_folders_urls/HtmlView.php
index 5a9136035..f4c794064 100644
--- a/admin/src/View/Library_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Library_files_folders_urls/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Library_files_folders_urls view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('library_files_folders_urls', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NEW' : 'COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('library_files_folders_urls.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('library_files_folders_urls.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('library_files_folders_urls.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('library_files_folders_urls.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('library_files_folders_urls.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('library_files_folders_urls.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('library_files_folders_urls.create'))
+				{
+					ToolbarHelper::apply('library_files_folders_urls.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('library_files_folders_urls.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('library_files_folders_urls.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('library_files_folders_urls.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('library_files_folders_urls.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('library_files_folders_urls.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('library_files_folders_urls.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('library_files_folders_urls.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Placeholder/HtmlView.php b/admin/src/View/Placeholder/HtmlView.php
index 06636252a..cca77f0d9 100644
--- a/admin/src/View/Placeholder/HtmlView.php
+++ b/admin/src/View/Placeholder/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Placeholder view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('placeholder', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_PLACEHOLDER_NEW' : 'COM_COMPONENTBUILDER_PLACEHOLDER_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('placeholder.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('placeholder.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('placeholder.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('placeholder.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('placeholder.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('placeholder.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('placeholder.create'))
+				{
+					ToolbarHelper::apply('placeholder.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('placeholder.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('placeholder.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('placeholder.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('placeholder.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('placeholder.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('placeholder.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('placeholder.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Placeholders/HtmlView.php b/admin/src/View/Placeholders/HtmlView.php
index dbedcd111..562efa0d7 100644
--- a/admin/src/View/Placeholders/HtmlView.php
+++ b/admin/src/View/Placeholders/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Power/HtmlView.php b/admin/src/View/Power/HtmlView.php
index 49c5e32ac..f9de19a2b 100644
--- a/admin/src/View/Power/HtmlView.php
+++ b/admin/src/View/Power/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Power view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('power', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -278,6 +304,81 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_POWER_NEW' : 'COM_COMPONENTBUILDER_POWER_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('power.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('power.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('power.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('power.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('power.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('power.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('power.create'))
+				{
+					ToolbarHelper::apply('power.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('power.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('power.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('power.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('power.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('power.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('power.save', 'JTOOLBAR_SAVE');
+				}
+				if ($this->canDo->get('power.reset'))
+				{
+					// add Reset button.
+					ToolbarHelper::custom('power.resetPowers', 'joomla custom-button-resetpowers', '', 'COM_COMPONENTBUILDER_RESET', false);
+				}
+				if ($this->canDo->get('power.push'))
+				{
+					// add Push button.
+					ToolbarHelper::custom('power.pushPowers', 'share custom-button-pushpowers', '', 'COM_COMPONENTBUILDER_PUSH', false);
+				}
+				ToolbarHelper::cancel('power.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Powers/HtmlView.php b/admin/src/View/Powers/HtmlView.php
index f517340b7..b6c5d9bcc 100644
--- a/admin/src/View/Powers/HtmlView.php
+++ b/admin/src/View/Powers/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -273,6 +291,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Repositories/HtmlView.php b/admin/src/View/Repositories/HtmlView.php
index e702d08af..40806093d 100644
--- a/admin/src/View/Repositories/HtmlView.php
+++ b/admin/src/View/Repositories/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Repository/HtmlView.php b/admin/src/View/Repository/HtmlView.php
index a61ab5b7f..1e92e6999 100644
--- a/admin/src/View/Repository/HtmlView.php
+++ b/admin/src/View/Repository/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Repository view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('repository', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_REPOSITORY_NEW' : 'COM_COMPONENTBUILDER_REPOSITORY_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('repository.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('repository.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('repository.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('repository.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('repository.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('repository.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('repository.create'))
+				{
+					ToolbarHelper::apply('repository.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('repository.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('repository.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('repository.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('repository.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('repository.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('repository.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('repository.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Server/HtmlView.php b/admin/src/View/Server/HtmlView.php
index fef2040b7..b62a3f380 100644
--- a/admin/src/View/Server/HtmlView.php
+++ b/admin/src/View/Server/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Server view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('server', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_SERVER_NEW' : 'COM_COMPONENTBUILDER_SERVER_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('server.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('server.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('server.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('server.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('server.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('server.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('server.create'))
+				{
+					ToolbarHelper::apply('server.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('server.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('server.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('server.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('server.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('server.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('server.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('server.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Servers/HtmlView.php b/admin/src/View/Servers/HtmlView.php
index 8358b8d59..40913556b 100644
--- a/admin/src/View/Servers/HtmlView.php
+++ b/admin/src/View/Servers/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Site_view/HtmlView.php b/admin/src/View/Site_view/HtmlView.php
index 9d0c4cc46..bcd586270 100644
--- a/admin/src/View/Site_view/HtmlView.php
+++ b/admin/src/View/Site_view/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Site_view view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('site_view', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_SITE_VIEW_NEW' : 'COM_COMPONENTBUILDER_SITE_VIEW_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('core.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('site_view.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('core.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('site_view.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('site_view.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('site_view.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('core.create'))
+				{
+					ToolbarHelper::apply('site_view.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('site_view.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('site_view.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('site_view.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('core.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('site_view.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('site_view.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('site_view.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Site_views/HtmlView.php b/admin/src/View/Site_views/HtmlView.php
index 3306ef1a0..5372724f9 100644
--- a/admin/src/View/Site_views/HtmlView.php
+++ b/admin/src/View/Site_views/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -263,6 +281,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Snippet/HtmlView.php b/admin/src/View/Snippet/HtmlView.php
index b03de6d2d..83fe70f35 100644
--- a/admin/src/View/Snippet/HtmlView.php
+++ b/admin/src/View/Snippet/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Snippet view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('snippet', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_SNIPPET_NEW' : 'COM_COMPONENTBUILDER_SNIPPET_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('core.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('snippet.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('core.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('snippet.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('snippet.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('snippet.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('core.create'))
+				{
+					ToolbarHelper::apply('snippet.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('snippet.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('snippet.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('snippet.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('core.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('snippet.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('snippet.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('snippet.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Snippet_type/HtmlView.php b/admin/src/View/Snippet_type/HtmlView.php
index 788ad04e4..1cb98f957 100644
--- a/admin/src/View/Snippet_type/HtmlView.php
+++ b/admin/src/View/Snippet_type/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Snippet_type view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('snippet_type', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_SNIPPET_TYPE_NEW' : 'COM_COMPONENTBUILDER_SNIPPET_TYPE_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('snippet_type.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('snippet_type.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('snippet_type.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('snippet_type.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('snippet_type.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('snippet_type.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('snippet_type.create'))
+				{
+					ToolbarHelper::apply('snippet_type.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('snippet_type.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('snippet_type.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('snippet_type.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('snippet_type.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('snippet_type.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('snippet_type.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('snippet_type.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Snippet_types/HtmlView.php b/admin/src/View/Snippet_types/HtmlView.php
index fd132c0f2..49234fa18 100644
--- a/admin/src/View/Snippet_types/HtmlView.php
+++ b/admin/src/View/Snippet_types/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Snippets/HtmlView.php b/admin/src/View/Snippets/HtmlView.php
index 44b827184..5d0ac190c 100644
--- a/admin/src/View/Snippets/HtmlView.php
+++ b/admin/src/View/Snippets/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -268,6 +286,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Template/HtmlView.php b/admin/src/View/Template/HtmlView.php
index 1d5d09270..3948f57c3 100644
--- a/admin/src/View/Template/HtmlView.php
+++ b/admin/src/View/Template/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Template view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('template', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_TEMPLATE_NEW' : 'COM_COMPONENTBUILDER_TEMPLATE_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('core.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('template.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('core.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('template.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('template.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('template.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('core.create'))
+				{
+					ToolbarHelper::apply('template.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('template.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('template.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('template.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('core.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('template.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('template.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('template.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Templates/HtmlView.php b/admin/src/View/Templates/HtmlView.php
index ac2b010d1..d4e2a9561 100644
--- a/admin/src/View/Templates/HtmlView.php
+++ b/admin/src/View/Templates/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -263,6 +281,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/src/View/Validation_rule/HtmlView.php b/admin/src/View/Validation_rule/HtmlView.php
index 8bf626849..7a9ce8ec2 100644
--- a/admin/src/View/Validation_rule/HtmlView.php
+++ b/admin/src/View/Validation_rule/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\Input\Input;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -46,6 +47,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public mixed $item;
 
+	/**
+	 * The input class
+	 *
+	 * @var    Input
+	 * @since  5.2.1
+	 */
+	public Input $input;
+
 	/**
 	 * The state object
 	 *
@@ -118,6 +127,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $referral;
 
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * Validation_rule view display method
 	 *
@@ -141,10 +158,10 @@ class HtmlView extends BaseHtmlView
 		// get action permissions
 		$this->canDo = ComponentbuilderHelper::getActions('validation_rule', $this->item);
 		// get input
-		$jinput = Factory::getApplication()->input;
-		$this->ref = $jinput->get('ref', 0, 'word');
-		$this->refid = $jinput->get('refid', 0, 'int');
-		$return = $jinput->get('return', null, 'base64');
+		$this->input ??= Factory::getApplication()->input;
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+		$return = $this->input->get('return', null, 'base64');
 		// set the referral string
 		$this->referral = '';
 		if ($this->refid && $this->ref)
@@ -165,7 +182,16 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->isModal = false;
+			$this->addToolbar();
+		}
+		else
+		{
+			$this->isModal = true;
+			$this->addModalToolbar();
+		}
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -180,17 +206,17 @@ class HtmlView extends BaseHtmlView
 		parent::display($tpl);
 	}
 
-
 	/**
 	 * Add the page title and toolbar.
 	 *
 	 * @return  void
+	 * @throws  \Exception
 	 * @since   1.6
 	 */
 	protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user = Factory::getApplication()->getIdentity();
+		$user = $this->getCurrentUser();
 		$userId	= $user->id;
 		$isNew = $this->item->id == 0;
 
@@ -268,6 +294,71 @@ class HtmlView extends BaseHtmlView
 		}
 	}
 
+	/**
+	 * Add the modal toolbar.
+	 *
+	 * @return  void
+	 * @throws  \Exception
+	 * @since   5.0.0
+	 */
+	protected function addModalToolbar()
+	{
+		Factory::getApplication()->input->set('hidemainmenu', true);
+		$user = $this->getCurrentUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_VALIDATION_RULE_NEW' : 'COM_COMPONENTBUILDER_VALIDATION_RULE_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (StringHelper::check($this->referral))
+		{
+			if ($this->canDo->get('validation_rule.create') && $isNew)
+			{
+				// We can create the record.
+				ToolbarHelper::save('validation_rule.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('validation_rule.edit'))
+			{
+				// We can save the record.
+				ToolbarHelper::save('validation_rule.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				ToolbarHelper::cancel('validation_rule.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				ToolbarHelper::cancel('validation_rule.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('validation_rule.create'))
+				{
+					ToolbarHelper::apply('validation_rule.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('validation_rule.save', 'JTOOLBAR_SAVE');
+					ToolbarHelper::custom('validation_rule.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				ToolbarHelper::cancel('validation_rule.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('validation_rule.edit'))
+				{
+					// We can save the new record
+					ToolbarHelper::apply('validation_rule.apply', 'JTOOLBAR_APPLY');
+					ToolbarHelper::save('validation_rule.save', 'JTOOLBAR_SAVE');
+				}
+				ToolbarHelper::cancel('validation_rule.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+	}
+
 	/**
 	 * Escapes a value for output in a view script.
 	 *
diff --git a/admin/src/View/Validation_rules/HtmlView.php b/admin/src/View/Validation_rules/HtmlView.php
index 7069f963f..d9948186b 100644
--- a/admin/src/View/Validation_rules/HtmlView.php
+++ b/admin/src/View/Validation_rules/HtmlView.php
@@ -87,6 +87,22 @@ class HtmlView extends BaseHtmlView
 	 */
 	public string $return_here;
 
+	/**
+	 * The title key used in modal
+	 *
+	 * @var    string
+	 * @since  5.2.1
+	 */
+	public string $modalTitleKey;
+
+	/**
+	 * The modal state
+	 *
+	 * @var    bool
+	 * @since  5.2.1
+	 */
+	public bool $isModal;
+
 	/**
 	 * The user object.
 	 *
@@ -138,8 +154,10 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// We don't need toolbar in the modal window.
+		$this->isModal = true;
 		if ($this->getLayout() !== 'modal')
 		{
+			$this->isModal = false;
 			$this->addToolbar();
 		}
 
@@ -258,6 +276,17 @@ class HtmlView extends BaseHtmlView
 		return StringHelper::html($var, $this->_charset ?? 'UTF-8', $shorten, $length);
 	}
 
+	/**
+	 * Get the modal data/title key
+	 *
+	 * @return  string  The key value.
+	 * @since   5.2.1
+	 */
+	public function getModalTitleKey(): string
+	{
+		return $this->modalTitleKey ?? 'id';
+	}
+
 	/**
 	 * Returns an array of fields the table can be sorted by
 	 *
diff --git a/admin/tmpl/admin_custom_tabs/default.php b/admin/tmpl/admin_custom_tabs/default.php
index 98c9043e0..ece60c2ef 100644
--- a/admin/tmpl/admin_custom_tabs/default.php
+++ b/admin/tmpl/admin_custom_tabs/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('admin_custom_tabs.tabs_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/admin_custom_tabs/modal.php b/admin/tmpl/admin_custom_tabs/modal.php
new file mode 100644
index 000000000..ba7abc407
--- /dev/null
+++ b/admin/tmpl/admin_custom_tabs/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_custom_tabs\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/admin_fields/default.php b/admin/tmpl/admin_fields/default.php
index d8a3b47ce..a3a6891c6 100644
--- a/admin/tmpl/admin_fields/default.php
+++ b/admin/tmpl/admin_fields/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('admin_fields.fields_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/admin_fields/modal.php b/admin/tmpl/admin_fields/modal.php
new file mode 100644
index 000000000..da5510912
--- /dev/null
+++ b/admin/tmpl/admin_fields/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_fields\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/admin_fields_conditions/default.php b/admin/tmpl/admin_fields_conditions/default.php
index 3075e74c4..1a3422ae6 100644
--- a/admin/tmpl/admin_fields_conditions/default.php
+++ b/admin/tmpl/admin_fields_conditions/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('admin_fields_conditions.conditions_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/admin_fields_conditions/modal.php b/admin/tmpl/admin_fields_conditions/modal.php
new file mode 100644
index 000000000..011ba60e5
--- /dev/null
+++ b/admin/tmpl/admin_fields_conditions/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_fields_conditions\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/admin_fields_relations/default.php b/admin/tmpl/admin_fields_relations/default.php
index 87338054a..870c7682a 100644
--- a/admin/tmpl/admin_fields_relations/default.php
+++ b/admin/tmpl/admin_fields_relations/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('admin_fields_relations.relations_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/admin_fields_relations/modal.php b/admin/tmpl/admin_fields_relations/modal.php
new file mode 100644
index 000000000..10eaf65ac
--- /dev/null
+++ b/admin/tmpl/admin_fields_relations/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_fields_relations\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/admin_view/default.php b/admin/tmpl/admin_view/default.php
index bd63c8b00..af39163c5 100644
--- a/admin/tmpl/admin_view/default.php
+++ b/admin/tmpl/admin_view/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('admin_view.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/admin_view/modal.php b/admin/tmpl/admin_view/modal.php
new file mode 100644
index 000000000..240554c4c
--- /dev/null
+++ b/admin/tmpl/admin_view/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_view\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/admin_views/default_body.php b/admin/tmpl/admin_views/default_body.php
index a0cd3f2d6..5b7da62c4 100644
--- a/admin/tmpl/admin_views/default_body.php
+++ b/admin/tmpl/admin_views/default_body.php
@@ -33,7 +33,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('admin_view.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('admin_view.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -53,7 +53,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('admin_view.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('admin_view.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -69,13 +69,29 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('admin_view.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('admin_view.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'admin_views.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $this->escape($item->system_name); ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $this->escape($item->system_name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.admin_view"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->system_name, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $this->escape($item->system_name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?>
 			 - 
 			<?php echo Text::_($item->type); ?>
@@ -139,7 +155,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('admin_view.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('admin_view.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'admin_views.', true, 'cb'); ?>
diff --git a/admin/tmpl/admin_views/default_head.php b/admin/tmpl/admin_views/default_head.php
index 863d663b4..be59ff909 100644
--- a/admin/tmpl/admin_views/default_head.php
+++ b/admin/tmpl/admin_views/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
@@ -36,10 +36,10 @@ defined('_JEXEC') or die;
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_LABEL', 'a.system_name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL', 'a.name_single', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEWS_NAMES', 'a.name_single', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_LABEL', 'a.short_description', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEWS_DETAILS', 'a.short_description', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
diff --git a/admin/tmpl/admin_views/modal.php b/admin/tmpl/admin_views/modal.php
new file mode 100644
index 000000000..011702dfc
--- /dev/null
+++ b/admin/tmpl/admin_views/modal.php
@@ -0,0 +1,92 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_views\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=admin_views&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="admin_viewList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// admin_views footer script
+
+	// get page body
+	var outerBodyDiv = document.querySelector('body');
+
+	// start loading spinner
+	var loadingDiv = document.createElement('div');
+	loadingDiv.id = 'loading';
+
+	// Set CSS properties individually
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
+	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
+	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
+	loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
+	loadingDiv.style.position = 'fixed';
+	loadingDiv.style.opacity = '0.80';
+	loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	loadingDiv.style.filter = "alpha(opacity=80)";
+	loadingDiv.style.display = 'none';
+
+	// add to page body
+	outerBodyDiv.appendChild(loadingDiv);
+// when the expand button is clicked
+jQuery('#toolbar').on('click',"button.button-expand-2", function(e){
+	loadingDiv.style.display = 'block';
+});
+</script>
diff --git a/admin/tmpl/admins_custom_tabs/default_body.php b/admin/tmpl/admins_custom_tabs/default_body.php
index 9b23622de..57582cd41 100644
--- a/admin/tmpl/admins_custom_tabs/default_body.php
+++ b/admin/tmpl/admins_custom_tabs/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_custom_tabs&task=admi
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('admin_custom_tabs.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('admin_custom_tabs.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_custom_tabs&task=admi
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('admin_custom_tabs.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('admin_custom_tabs.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=admins_custom_tabs&task=admi
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('admin_custom_tabs.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('admin_custom_tabs.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->admin_view_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'admins_custom_tabs.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->admin_view_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->admin_view_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->admin_view_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.admin_custom_tabs"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->admin_view_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->admin_view_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('admin_custom_tabs.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('admin_custom_tabs.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'admins_custom_tabs.', true, 'cb'); ?>
diff --git a/admin/tmpl/admins_custom_tabs/default_head.php b/admin/tmpl/admins_custom_tabs/default_head.php
index cc16172d0..49d28b629 100644
--- a/admin/tmpl/admins_custom_tabs/default_head.php
+++ b/admin/tmpl/admins_custom_tabs/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/admins_custom_tabs/modal.php b/admin/tmpl/admins_custom_tabs/modal.php
new file mode 100644
index 000000000..ee2136933
--- /dev/null
+++ b/admin/tmpl/admins_custom_tabs/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admins_custom_tabs\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=admins_custom_tabs&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="admin_custom_tabsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/admins_fields/default_body.php b/admin/tmpl/admins_fields/default_body.php
index a8a66b245..82219b941 100644
--- a/admin/tmpl/admins_fields/default_body.php
+++ b/admin/tmpl/admins_fields/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('admin_fields.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('admin_fields.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('admin_fields.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('admin_fields.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('admin_fields.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('admin_fields.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->admin_view_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'admins_fields.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->admin_view_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->admin_view_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->admin_view_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.admin_fields"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->admin_view_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->admin_view_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('admin_fields.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('admin_fields.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'admins_fields.', true, 'cb'); ?>
diff --git a/admin/tmpl/admins_fields/default_head.php b/admin/tmpl/admins_fields/default_head.php
index cbdfe9c06..c0c4e38f9 100644
--- a/admin/tmpl/admins_fields/default_head.php
+++ b/admin/tmpl/admins_fields/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/admins_fields/modal.php b/admin/tmpl/admins_fields/modal.php
new file mode 100644
index 000000000..77eaaa879
--- /dev/null
+++ b/admin/tmpl/admins_fields/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admins_fields\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=admins_fields&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="admin_fieldsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/admins_fields_conditions/default_body.php b/admin/tmpl/admins_fields_conditions/default_body.php
index 9bac13efe..1f064a577 100644
--- a/admin/tmpl/admins_fields_conditions/default_body.php
+++ b/admin/tmpl/admins_fields_conditions/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('admin_fields_conditions.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('admin_fields_conditions.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('admin_fields_conditions.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('admin_fields_conditions.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('admin_fields_conditions.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('admin_fields_conditions.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->admin_view_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'admins_fields_conditions.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->admin_view_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->admin_view_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->admin_view_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.admin_fields_conditions"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->admin_view_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->admin_view_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('admin_fields_conditions.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('admin_fields_conditions.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'admins_fields_conditions.', true, 'cb'); ?>
diff --git a/admin/tmpl/admins_fields_conditions/default_head.php b/admin/tmpl/admins_fields_conditions/default_head.php
index 472eb6f3b..5c32179d0 100644
--- a/admin/tmpl/admins_fields_conditions/default_head.php
+++ b/admin/tmpl/admins_fields_conditions/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/admins_fields_conditions/modal.php b/admin/tmpl/admins_fields_conditions/modal.php
new file mode 100644
index 000000000..7cec6735c
--- /dev/null
+++ b/admin/tmpl/admins_fields_conditions/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admins_fields_conditions\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=admins_fields_conditions&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="admin_fields_conditionsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/admins_fields_relations/default_body.php b/admin/tmpl/admins_fields_relations/default_body.php
index f9f6471f4..f3b272e34 100644
--- a/admin/tmpl/admins_fields_relations/default_body.php
+++ b/admin/tmpl/admins_fields_relations/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_relations&task
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('admin_fields_relations.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('admin_fields_relations.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_relations&task
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('admin_fields_relations.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('admin_fields_relations.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_relations&task
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('admin_fields_relations.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('admin_fields_relations.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->admin_view_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'admins_fields_relations.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->admin_view_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->admin_view_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->admin_view_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.admin_fields_relations"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->admin_view_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->admin_view_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('admin_fields_relations.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('admin_fields_relations.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'admins_fields_relations.', true, 'cb'); ?>
diff --git a/admin/tmpl/admins_fields_relations/default_head.php b/admin/tmpl/admins_fields_relations/default_head.php
index 54df8b0a7..ba772367f 100644
--- a/admin/tmpl/admins_fields_relations/default_head.php
+++ b/admin/tmpl/admins_fields_relations/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/admins_fields_relations/modal.php b/admin/tmpl/admins_fields_relations/modal.php
new file mode 100644
index 000000000..6f066a203
--- /dev/null
+++ b/admin/tmpl/admins_fields_relations/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admins_fields_relations\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=admins_fields_relations&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="admin_fields_relationsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/class_extendings/default_body.php b/admin/tmpl/class_extendings/default_body.php
index 54cbfc78f..0bc3c6844 100644
--- a/admin/tmpl/class_extendings/default_body.php
+++ b/admin/tmpl/class_extendings/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_extendings&task=class_
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('class_extends.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('class_extends.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_extendings&task=class_
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('class_extends.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('class_extends.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=class_extendings&task=class_
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('class_extends.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('class_extends.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'class_extendings.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.class_extends"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -81,7 +97,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_extendings&task=class_
 			<?php echo Text::_($item->extension_type); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('class_extends.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('class_extends.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'class_extendings.', true, 'cb'); ?>
diff --git a/admin/tmpl/class_extendings/default_head.php b/admin/tmpl/class_extendings/default_head.php
index 22dea094f..6b9544ef5 100644
--- a/admin/tmpl/class_extendings/default_head.php
+++ b/admin/tmpl/class_extendings/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/class_extendings/modal.php b/admin/tmpl/class_extendings/modal.php
new file mode 100644
index 000000000..0c4ec30d5
--- /dev/null
+++ b/admin/tmpl/class_extendings/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Class_extendings\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=class_extendings&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="class_extendsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/class_extends/default.php b/admin/tmpl/class_extends/default.php
index 7f24a74a8..e84c96081 100644
--- a/admin/tmpl/class_extends/default.php
+++ b/admin/tmpl/class_extends/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="main-card">
 
diff --git a/admin/tmpl/class_extends/modal.php b/admin/tmpl/class_extends/modal.php
new file mode 100644
index 000000000..3667030f8
--- /dev/null
+++ b/admin/tmpl/class_extends/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Class_extends\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/class_method/default.php b/admin/tmpl/class_method/default.php
index 82e4a4b1f..20537c29e 100644
--- a/admin/tmpl/class_method/default.php
+++ b/admin/tmpl/class_method/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="main-card">
 
diff --git a/admin/tmpl/class_method/modal.php b/admin/tmpl/class_method/modal.php
new file mode 100644
index 000000000..85dca5f5a
--- /dev/null
+++ b/admin/tmpl/class_method/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Class_method\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/class_methods/default_body.php b/admin/tmpl/class_methods/default_body.php
index eaba5ee66..b81c823c3 100644
--- a/admin/tmpl/class_methods/default_body.php
+++ b/admin/tmpl/class_methods/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('class_method.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('class_method.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('class_method.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('class_method.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('class_method.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('class_method.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'class_methods.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $this->escape($item->name); ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $this->escape($item->name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.class_method"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->name, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $this->escape($item->name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?>(
 			<?php echo $this->escape($item->arguments); ?>)
 			</div>
@@ -93,7 +109,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('class_method.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('class_method.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'class_methods.', true, 'cb'); ?>
diff --git a/admin/tmpl/class_methods/default_head.php b/admin/tmpl/class_methods/default_head.php
index 58e9d1012..6fa534f0c 100644
--- a/admin/tmpl/class_methods/default_head.php
+++ b/admin/tmpl/class_methods/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/class_methods/modal.php b/admin/tmpl/class_methods/modal.php
new file mode 100644
index 000000000..e6153c553
--- /dev/null
+++ b/admin/tmpl/class_methods/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Class_methods\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=class_methods&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="class_methodList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/class_properties/default_body.php b/admin/tmpl/class_properties/default_body.php
index bc963af8b..a94eb54dc 100644
--- a/admin/tmpl/class_properties/default_body.php
+++ b/admin/tmpl/class_properties/default_body.php
@@ -32,7 +32,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_properties&task=class_
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('class_property.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('class_property.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -52,7 +52,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_properties&task=class_
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('class_property.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('class_property.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -68,13 +68,29 @@ $edit = "index.php?option=com_componentbuilder&view=class_properties&task=class_
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('class_property.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('class_property.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'class_properties.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.class_property"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -93,7 +109,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_properties&task=class_
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('class_property.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('class_property.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'class_properties.', true, 'cb'); ?>
diff --git a/admin/tmpl/class_properties/default_head.php b/admin/tmpl/class_properties/default_head.php
index 463576c71..3f70e8546 100644
--- a/admin/tmpl/class_properties/default_head.php
+++ b/admin/tmpl/class_properties/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/class_properties/modal.php b/admin/tmpl/class_properties/modal.php
new file mode 100644
index 000000000..44ca91739
--- /dev/null
+++ b/admin/tmpl/class_properties/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Class_properties\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=class_properties&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="class_propertyList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/class_property/default.php b/admin/tmpl/class_property/default.php
index 29e53aa00..b01b818f1 100644
--- a/admin/tmpl/class_property/default.php
+++ b/admin/tmpl/class_property/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="main-card">
 
diff --git a/admin/tmpl/class_property/modal.php b/admin/tmpl/class_property/modal.php
new file mode 100644
index 000000000..3bebd6940
--- /dev/null
+++ b/admin/tmpl/class_property/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Class_property\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_admin_views/default.php b/admin/tmpl/component_admin_views/default.php
index 0137b3951..a07cdacac 100644
--- a/admin/tmpl/component_admin_views/default.php
+++ b/admin/tmpl/component_admin_views/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_admin_views.views_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_admin_views/modal.php b/admin/tmpl/component_admin_views/modal.php
new file mode 100644
index 000000000..ff2f3f67a
--- /dev/null
+++ b/admin/tmpl/component_admin_views/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_admin_views\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_config/default.php b/admin/tmpl/component_config/default.php
index f3f99ac04..fcdf14583 100644
--- a/admin/tmpl/component_config/default.php
+++ b/admin/tmpl/component_config/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_config.options_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_config/modal.php b/admin/tmpl/component_config/modal.php
new file mode 100644
index 000000000..b2d920d98
--- /dev/null
+++ b/admin/tmpl/component_config/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_config\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_custom_admin_menus/default.php b/admin/tmpl/component_custom_admin_menus/default.php
index 19e788e08..75f9f8f91 100644
--- a/admin/tmpl/component_custom_admin_menus/default.php
+++ b/admin/tmpl/component_custom_admin_menus/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_custom_admin_menus.menus_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_custom_admin_menus/modal.php b/admin/tmpl/component_custom_admin_menus/modal.php
new file mode 100644
index 000000000..d63e23d3e
--- /dev/null
+++ b/admin/tmpl/component_custom_admin_menus/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_custom_admin_menus\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_custom_admin_views/default.php b/admin/tmpl/component_custom_admin_views/default.php
index 1abd52ebf..05368cecb 100644
--- a/admin/tmpl/component_custom_admin_views/default.php
+++ b/admin/tmpl/component_custom_admin_views/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_custom_admin_views.views_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_custom_admin_views/modal.php b/admin/tmpl/component_custom_admin_views/modal.php
new file mode 100644
index 000000000..c4d689c39
--- /dev/null
+++ b/admin/tmpl/component_custom_admin_views/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_custom_admin_views\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_dashboard/default.php b/admin/tmpl/component_dashboard/default.php
index 4cf174be4..bf3e71757 100644
--- a/admin/tmpl/component_dashboard/default.php
+++ b/admin/tmpl/component_dashboard/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_dashboard.dashboard_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_dashboard/modal.php b/admin/tmpl/component_dashboard/modal.php
new file mode 100644
index 000000000..e9d29bdba
--- /dev/null
+++ b/admin/tmpl/component_dashboard/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_dashboard\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_files_folders/default.php b/admin/tmpl/component_files_folders/default.php
index 552956418..becc59040 100644
--- a/admin/tmpl/component_files_folders/default.php
+++ b/admin/tmpl/component_files_folders/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_files_folders.basic_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_files_folders/modal.php b/admin/tmpl/component_files_folders/modal.php
new file mode 100644
index 000000000..945fe46a3
--- /dev/null
+++ b/admin/tmpl/component_files_folders/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_files_folders\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_modules/default.php b/admin/tmpl/component_modules/default.php
index dd9b04634..9ab5f9033 100644
--- a/admin/tmpl/component_modules/default.php
+++ b/admin/tmpl/component_modules/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_modules.modules_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_modules/modal.php b/admin/tmpl/component_modules/modal.php
new file mode 100644
index 000000000..3b2f3cdee
--- /dev/null
+++ b/admin/tmpl/component_modules/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_modules\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_mysql_tweaks/default.php b/admin/tmpl/component_mysql_tweaks/default.php
index 60eb6a526..baebad2be 100644
--- a/admin/tmpl/component_mysql_tweaks/default.php
+++ b/admin/tmpl/component_mysql_tweaks/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_mysql_tweaks.mysql_tweaks_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_mysql_tweaks/modal.php b/admin/tmpl/component_mysql_tweaks/modal.php
new file mode 100644
index 000000000..af7db5f4c
--- /dev/null
+++ b/admin/tmpl/component_mysql_tweaks/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_mysql_tweaks\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_placeholders/default.php b/admin/tmpl/component_placeholders/default.php
index 98e06e586..50246b75b 100644
--- a/admin/tmpl/component_placeholders/default.php
+++ b/admin/tmpl/component_placeholders/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_placeholders.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_placeholders/modal.php b/admin/tmpl/component_placeholders/modal.php
new file mode 100644
index 000000000..5c9732184
--- /dev/null
+++ b/admin/tmpl/component_placeholders/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_placeholders\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_plugins/default.php b/admin/tmpl/component_plugins/default.php
index df026c944..1035cc4dc 100644
--- a/admin/tmpl/component_plugins/default.php
+++ b/admin/tmpl/component_plugins/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_plugins.plugins_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_plugins/modal.php b/admin/tmpl/component_plugins/modal.php
new file mode 100644
index 000000000..36e9b2ff4
--- /dev/null
+++ b/admin/tmpl/component_plugins/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_plugins\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_router/default.php b/admin/tmpl/component_router/default.php
index 0da1c2ccb..a2fbab6d8 100644
--- a/admin/tmpl/component_router/default.php
+++ b/admin/tmpl/component_router/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_router.settings_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_router/modal.php b/admin/tmpl/component_router/modal.php
new file mode 100644
index 000000000..25f191c8d
--- /dev/null
+++ b/admin/tmpl/component_router/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_router\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_site_views/default.php b/admin/tmpl/component_site_views/default.php
index 2881b049a..d2a5a9a56 100644
--- a/admin/tmpl/component_site_views/default.php
+++ b/admin/tmpl/component_site_views/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_site_views.views_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_site_views/modal.php b/admin/tmpl/component_site_views/modal.php
new file mode 100644
index 000000000..f097467c5
--- /dev/null
+++ b/admin/tmpl/component_site_views/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_site_views\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/component_updates/default.php b/admin/tmpl/component_updates/default.php
index 75afd6b62..7c8ec0eb1 100644
--- a/admin/tmpl/component_updates/default.php
+++ b/admin/tmpl/component_updates/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('component_updates.updates_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/component_updates/modal.php b/admin/tmpl/component_updates/modal.php
new file mode 100644
index 000000000..753344db2
--- /dev/null
+++ b/admin/tmpl/component_updates/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_updates\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/components_admin_views/default_body.php b/admin/tmpl/components_admin_views/default_body.php
index 947b3ad78..9ef084dee 100644
--- a/admin/tmpl/components_admin_views/default_body.php
+++ b/admin/tmpl/components_admin_views/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_admin_views&task=
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_admin_views.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_admin_views.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_admin_views&task=
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_admin_views.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_admin_views.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_admin_views&task=
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_admin_views.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_admin_views.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_admin_views.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_admin_views"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_admin_views.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_admin_views.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_admin_views.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_admin_views/default_head.php b/admin/tmpl/components_admin_views/default_head.php
index f770979c1..cf88d95a8 100644
--- a/admin/tmpl/components_admin_views/default_head.php
+++ b/admin/tmpl/components_admin_views/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_admin_views/modal.php b/admin/tmpl/components_admin_views/modal.php
new file mode 100644
index 000000000..5ce6102dc
--- /dev/null
+++ b/admin/tmpl/components_admin_views/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_admin_views\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_admin_views&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_admin_viewsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_config/default_body.php b/admin/tmpl/components_config/default_body.php
index 170bc0301..a88c30a4a 100644
--- a/admin/tmpl/components_config/default_body.php
+++ b/admin/tmpl/components_config/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_config&task=compo
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_config.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_config.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_config&task=compo
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_config.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_config.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_config&task=compo
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_config.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_config.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_config.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_config"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_config.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_config.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_config.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_config/default_head.php b/admin/tmpl/components_config/default_head.php
index 047a7e5c9..b15ece195 100644
--- a/admin/tmpl/components_config/default_head.php
+++ b/admin/tmpl/components_config/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_config/modal.php b/admin/tmpl/components_config/modal.php
new file mode 100644
index 000000000..66c6f073a
--- /dev/null
+++ b/admin/tmpl/components_config/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_config\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_config&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_configList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_custom_admin_menus/default_body.php b/admin/tmpl/components_custom_admin_menus/default_body.php
index a54a99498..87c8a611c 100644
--- a/admin/tmpl/components_custom_admin_menus/default_body.php
+++ b/admin/tmpl/components_custom_admin_menus/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_custom_admin_menu
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_custom_admin_menus.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_custom_admin_menus.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_custom_admin_menu
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_custom_admin_menus.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_custom_admin_menus.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_custom_admin_menu
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_custom_admin_menus.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_custom_admin_menus.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_custom_admin_menus.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_custom_admin_menus"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_custom_admin_menus.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_custom_admin_menus.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_custom_admin_menus.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_custom_admin_menus/default_head.php b/admin/tmpl/components_custom_admin_menus/default_head.php
index eb72f9c88..9cb6be0d4 100644
--- a/admin/tmpl/components_custom_admin_menus/default_head.php
+++ b/admin/tmpl/components_custom_admin_menus/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_custom_admin_menus/modal.php b/admin/tmpl/components_custom_admin_menus/modal.php
new file mode 100644
index 000000000..e8c4058de
--- /dev/null
+++ b/admin/tmpl/components_custom_admin_menus/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_custom_admin_menus\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_custom_admin_menus&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_custom_admin_menusList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_custom_admin_views/default_body.php b/admin/tmpl/components_custom_admin_views/default_body.php
index 8cc3e3d4b..5350e5189 100644
--- a/admin/tmpl/components_custom_admin_views/default_body.php
+++ b/admin/tmpl/components_custom_admin_views/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_custom_admin_view
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_custom_admin_views.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_custom_admin_views.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_custom_admin_view
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_custom_admin_views.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_custom_admin_views.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_custom_admin_view
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_custom_admin_views.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_custom_admin_views.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_custom_admin_views.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_custom_admin_views"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_custom_admin_views.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_custom_admin_views.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_custom_admin_views.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_custom_admin_views/default_head.php b/admin/tmpl/components_custom_admin_views/default_head.php
index c9b591c2a..ab1dd15fb 100644
--- a/admin/tmpl/components_custom_admin_views/default_head.php
+++ b/admin/tmpl/components_custom_admin_views/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_custom_admin_views/modal.php b/admin/tmpl/components_custom_admin_views/modal.php
new file mode 100644
index 000000000..e67464ff0
--- /dev/null
+++ b/admin/tmpl/components_custom_admin_views/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_custom_admin_views\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_custom_admin_views&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_custom_admin_viewsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_dashboard/default_body.php b/admin/tmpl/components_dashboard/default_body.php
index e5146985b..e9c931c53 100644
--- a/admin/tmpl/components_dashboard/default_body.php
+++ b/admin/tmpl/components_dashboard/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_dashboard&task=co
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_dashboard.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_dashboard.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_dashboard&task=co
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_dashboard.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_dashboard.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_dashboard&task=co
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_dashboard.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_dashboard.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_dashboard.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_dashboard"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_dashboard.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_dashboard.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_dashboard.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_dashboard/default_head.php b/admin/tmpl/components_dashboard/default_head.php
index a219db9c9..03cba0429 100644
--- a/admin/tmpl/components_dashboard/default_head.php
+++ b/admin/tmpl/components_dashboard/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_dashboard/modal.php b/admin/tmpl/components_dashboard/modal.php
new file mode 100644
index 000000000..8b4adf84b
--- /dev/null
+++ b/admin/tmpl/components_dashboard/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_dashboard\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_dashboard&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_dashboardList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_files_folders/default_body.php b/admin/tmpl/components_files_folders/default_body.php
index cc7be882d..70ce6f2d1 100644
--- a/admin/tmpl/components_files_folders/default_body.php
+++ b/admin/tmpl/components_files_folders/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_files_folders&tas
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_files_folders.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_files_folders.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_files_folders&tas
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_files_folders.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_files_folders.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_files_folders&tas
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_files_folders.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_files_folders.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_files_folders.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_files_folders"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_files_folders.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_files_folders.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_files_folders.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_files_folders/default_head.php b/admin/tmpl/components_files_folders/default_head.php
index b602e599f..631c01ca4 100644
--- a/admin/tmpl/components_files_folders/default_head.php
+++ b/admin/tmpl/components_files_folders/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_files_folders/modal.php b/admin/tmpl/components_files_folders/modal.php
new file mode 100644
index 000000000..b3a03f517
--- /dev/null
+++ b/admin/tmpl/components_files_folders/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_files_folders\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_files_folders&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_files_foldersList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_modules/default_body.php b/admin/tmpl/components_modules/default_body.php
index c0a23e73c..7c2511161 100644
--- a/admin/tmpl/components_modules/default_body.php
+++ b/admin/tmpl/components_modules/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_modules&task=comp
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_modules.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_modules.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_modules&task=comp
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_modules.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_modules.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_modules&task=comp
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_modules.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_modules.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_modules.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_modules"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_modules.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_modules.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_modules.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_modules/default_head.php b/admin/tmpl/components_modules/default_head.php
index 6e31a0d29..14000f22f 100644
--- a/admin/tmpl/components_modules/default_head.php
+++ b/admin/tmpl/components_modules/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_modules/modal.php b/admin/tmpl/components_modules/modal.php
new file mode 100644
index 000000000..ff25ff308
--- /dev/null
+++ b/admin/tmpl/components_modules/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_modules\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_modules&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_modulesList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_mysql_tweaks/default_body.php b/admin/tmpl/components_mysql_tweaks/default_body.php
index ca69bcd0a..b78d8032b 100644
--- a/admin/tmpl/components_mysql_tweaks/default_body.php
+++ b/admin/tmpl/components_mysql_tweaks/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_mysql_tweaks&task
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_mysql_tweaks.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_mysql_tweaks.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_mysql_tweaks&task
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_mysql_tweaks.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_mysql_tweaks.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_mysql_tweaks&task
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_mysql_tweaks.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_mysql_tweaks.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_mysql_tweaks.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_mysql_tweaks"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_mysql_tweaks.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_mysql_tweaks.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_mysql_tweaks.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_mysql_tweaks/default_head.php b/admin/tmpl/components_mysql_tweaks/default_head.php
index 9e4eef105..ce286fb17 100644
--- a/admin/tmpl/components_mysql_tweaks/default_head.php
+++ b/admin/tmpl/components_mysql_tweaks/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_mysql_tweaks/modal.php b/admin/tmpl/components_mysql_tweaks/modal.php
new file mode 100644
index 000000000..1da8f836d
--- /dev/null
+++ b/admin/tmpl/components_mysql_tweaks/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_mysql_tweaks\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_mysql_tweaks&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_mysql_tweaksList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_placeholders/default_body.php b/admin/tmpl/components_placeholders/default_body.php
index 700bddf9f..6f4ff025c 100644
--- a/admin/tmpl/components_placeholders/default_body.php
+++ b/admin/tmpl/components_placeholders/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_placeholders&task
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_placeholders.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_placeholders.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_placeholders&task
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_placeholders.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_placeholders.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_placeholders&task
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_placeholders.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_placeholders.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_placeholders.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_placeholders"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_placeholders.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_placeholders.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_placeholders.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_placeholders/default_head.php b/admin/tmpl/components_placeholders/default_head.php
index 85d33e64b..c1da75a55 100644
--- a/admin/tmpl/components_placeholders/default_head.php
+++ b/admin/tmpl/components_placeholders/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_placeholders/modal.php b/admin/tmpl/components_placeholders/modal.php
new file mode 100644
index 000000000..efc173938
--- /dev/null
+++ b/admin/tmpl/components_placeholders/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_placeholders\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_placeholders&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_placeholdersList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_plugins/default_body.php b/admin/tmpl/components_plugins/default_body.php
index 357c8ab58..1a44b2171 100644
--- a/admin/tmpl/components_plugins/default_body.php
+++ b/admin/tmpl/components_plugins/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_plugins&task=comp
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_plugins.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_plugins.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_plugins&task=comp
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_plugins.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_plugins.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_plugins&task=comp
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_plugins.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_plugins.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_plugins.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_plugins"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_plugins.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_plugins.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_plugins.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_plugins/default_head.php b/admin/tmpl/components_plugins/default_head.php
index 0b4d05e51..749e5507b 100644
--- a/admin/tmpl/components_plugins/default_head.php
+++ b/admin/tmpl/components_plugins/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_plugins/modal.php b/admin/tmpl/components_plugins/modal.php
new file mode 100644
index 000000000..316ecbe79
--- /dev/null
+++ b/admin/tmpl/components_plugins/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_plugins\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_plugins&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_pluginsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_routers/default_body.php b/admin/tmpl/components_routers/default_body.php
index 585446646..3033b2a96 100644
--- a/admin/tmpl/components_routers/default_body.php
+++ b/admin/tmpl/components_routers/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_routers&task=comp
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_router.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_router.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_routers&task=comp
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_router.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_router.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=components_routers&task=comp
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_router.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_router.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_routers.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_router"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -87,7 +103,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_routers&task=comp
 			<?php echo Text::_($item->mode_methods); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_router.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_router.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_routers.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_routers/default_head.php b/admin/tmpl/components_routers/default_head.php
index e4ba3fe27..21f6cc484 100644
--- a/admin/tmpl/components_routers/default_head.php
+++ b/admin/tmpl/components_routers/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_routers/modal.php b/admin/tmpl/components_routers/modal.php
new file mode 100644
index 000000000..968e7097f
--- /dev/null
+++ b/admin/tmpl/components_routers/modal.php
@@ -0,0 +1,99 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_routers\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_routers&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_routerList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// components_routers footer script
+
+<?php
+	$app = Factory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isClient('site'))
+	{
+		echo 'var url = "'. Uri::root() . '";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
+
+document.addEventListener("DOMContentLoaded", function() {
+	document.querySelectorAll(".loading-dots").forEach(function(loading_dots) {
+		let x = 0;
+		let intervalId = setInterval(function() {
+			if (!loading_dots.classList.contains("loading-dots")) {
+				clearInterval(intervalId);
+				return;
+			}
+			let dots = ".".repeat(x % 8);
+			loading_dots.textContent = dots;
+			x++;
+		}, 500);
+	});
+});
+</script>
diff --git a/admin/tmpl/components_site_views/default_body.php b/admin/tmpl/components_site_views/default_body.php
index 6e1568abe..cb3a51ade 100644
--- a/admin/tmpl/components_site_views/default_body.php
+++ b/admin/tmpl/components_site_views/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_site_views&task=c
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_site_views.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_site_views.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_site_views&task=c
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_site_views.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_site_views.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_site_views&task=c
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_site_views.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_site_views.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_site_views.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_site_views"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_site_views.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_site_views.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_site_views.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_site_views/default_head.php b/admin/tmpl/components_site_views/default_head.php
index d32359dc5..06d727c5f 100644
--- a/admin/tmpl/components_site_views/default_head.php
+++ b/admin/tmpl/components_site_views/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_site_views/modal.php b/admin/tmpl/components_site_views/modal.php
new file mode 100644
index 000000000..d59be40a4
--- /dev/null
+++ b/admin/tmpl/components_site_views/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_site_views\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_site_views&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_site_viewsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/components_updates/default_body.php b/admin/tmpl/components_updates/default_body.php
index 88b77418b..a9eb9088b 100644
--- a/admin/tmpl/components_updates/default_body.php
+++ b/admin/tmpl/components_updates/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_updates&task=comp
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('component_updates.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_updates.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_updates&task=comp
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('component_updates.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('component_updates.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_updates&task=comp
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('component_updates.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('component_updates.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_updates.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_component_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.component_updates"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_component_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('component_updates.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('component_updates.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'components_updates.', true, 'cb'); ?>
diff --git a/admin/tmpl/components_updates/default_head.php b/admin/tmpl/components_updates/default_head.php
index 2bbab1aac..0639654b1 100644
--- a/admin/tmpl/components_updates/default_head.php
+++ b/admin/tmpl/components_updates/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/components_updates/modal.php b/admin/tmpl/components_updates/modal.php
new file mode 100644
index 000000000..67f3e0fed
--- /dev/null
+++ b/admin/tmpl/components_updates/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_updates\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_updates&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="component_updatesList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/custom_admin_view/default.php b/admin/tmpl/custom_admin_view/default.php
index 7bf9598de..0505e382f 100644
--- a/admin/tmpl/custom_admin_view/default.php
+++ b/admin/tmpl/custom_admin_view/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('custom_admin_view.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/custom_admin_view/modal.php b/admin/tmpl/custom_admin_view/modal.php
new file mode 100644
index 000000000..3769b373b
--- /dev/null
+++ b/admin/tmpl/custom_admin_view/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Custom_admin_view\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/custom_admin_views/default_body.php b/admin/tmpl/custom_admin_views/default_body.php
index 4b3c32470..f75badcd8 100644
--- a/admin/tmpl/custom_admin_views/default_body.php
+++ b/admin/tmpl/custom_admin_views/default_body.php
@@ -32,7 +32,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('core.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -52,7 +52,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('core.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -68,13 +68,29 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('core.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'custom_admin_views.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.custom_admin_view"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -102,7 +118,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $item->main_get_id)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $item->main_get_id)): ?>
 					<a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->main_get_id; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->main_get_name); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->main_get_name); ?>
@@ -110,7 +126,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('core.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'custom_admin_views.', true, 'cb'); ?>
diff --git a/admin/tmpl/custom_admin_views/default_head.php b/admin/tmpl/custom_admin_views/default_head.php
index 2d2e5d73e..c2f373965 100644
--- a/admin/tmpl/custom_admin_views/default_head.php
+++ b/admin/tmpl/custom_admin_views/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
@@ -36,10 +36,10 @@ defined('_JEXEC') or die;
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SYSTEM_NAME_LABEL', 'a.system_name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME_LABEL', 'a.name', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_NAMES', 'a.name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DESCRIPTION_LABEL', 'a.description', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DETAILS', 'a.description', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap" >
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL', 'g.name', $this->listDirn, $this->listOrder); ?>
diff --git a/admin/tmpl/custom_admin_views/modal.php b/admin/tmpl/custom_admin_views/modal.php
new file mode 100644
index 000000000..ac31ffb01
--- /dev/null
+++ b/admin/tmpl/custom_admin_views/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Custom_admin_views\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=custom_admin_views&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="custom_admin_viewList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/custom_code/default.php b/admin/tmpl/custom_code/default.php
index cc9c5782c..5ffba76e4 100644
--- a/admin/tmpl/custom_code/default.php
+++ b/admin/tmpl/custom_code/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('custom_code.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/custom_code/modal.php b/admin/tmpl/custom_code/modal.php
new file mode 100644
index 000000000..c4e8307d8
--- /dev/null
+++ b/admin/tmpl/custom_code/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Custom_code\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/custom_codes/default_body.php b/admin/tmpl/custom_codes/default_body.php
index ec0d45a8a..e3903d4dd 100644
--- a/admin/tmpl/custom_codes/default_body.php
+++ b/admin/tmpl/custom_codes/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('custom_code.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('custom_code.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('custom_code.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('custom_code.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('custom_code.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('custom_code.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'custom_codes.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.custom_code"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -98,7 +114,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('custom_code.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('custom_code.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'custom_codes.', true, 'cb'); ?>
diff --git a/admin/tmpl/custom_codes/default_head.php b/admin/tmpl/custom_codes/default_head.php
index f87ea11ab..2dde4a091 100644
--- a/admin/tmpl/custom_codes/default_head.php
+++ b/admin/tmpl/custom_codes/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
@@ -33,7 +33,7 @@ defined('_JEXEC') or die;
 		</th>
 	<?php endif; ?>
 	<th class="nowrap" >
-			<?php echo Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL'); ?>
+			<?php echo Text::_('COM_COMPONENTBUILDER_CUSTOM_CODES_CODE'); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL', 'a.path', $this->listDirn, $this->listOrder); ?>
@@ -45,7 +45,7 @@ defined('_JEXEC') or die;
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL', 'a.type', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL', 'a.comment_type', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODES_COMMENT_TYPE', 'a.comment_type', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_JOOMLA_VERSION_LABEL', 'a.joomla_version', $this->listDirn, $this->listOrder); ?>
diff --git a/admin/tmpl/custom_codes/modal.php b/admin/tmpl/custom_codes/modal.php
new file mode 100644
index 000000000..f5ab55e4c
--- /dev/null
+++ b/admin/tmpl/custom_codes/modal.php
@@ -0,0 +1,92 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Custom_codes\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=custom_codes&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="custom_codeList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// custom_codes footer script
+
+	// get page body
+	var outerBodyDiv = document.querySelector('body');
+
+	// start loading spinner
+	var loadingDiv = document.createElement('div');
+	loadingDiv.id = 'loading';
+
+	// Set CSS properties individually
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
+	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
+	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
+	loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
+	loadingDiv.style.position = 'fixed';
+	loadingDiv.style.opacity = '0.80';
+	loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	loadingDiv.style.filter = "alpha(opacity=80)";
+	loadingDiv.style.display = 'none';
+
+	// add to page body
+	outerBodyDiv.appendChild(loadingDiv);
+// when the expand button is clicked
+jQuery('#toolbar').on('click',"button.button-expand-2", function(e){
+	loadingDiv.style.display = 'block';
+});
+</script>
diff --git a/admin/tmpl/dynamic_get/default.php b/admin/tmpl/dynamic_get/default.php
index afa006c00..065f13888 100644
--- a/admin/tmpl/dynamic_get/default.php
+++ b/admin/tmpl/dynamic_get/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('dynamic_get.main_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/dynamic_get/modal.php b/admin/tmpl/dynamic_get/modal.php
new file mode 100644
index 000000000..9ece6f44f
--- /dev/null
+++ b/admin/tmpl/dynamic_get/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Dynamic_get\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/dynamic_gets/default_body.php b/admin/tmpl/dynamic_gets/default_body.php
index e9b08cbb8..9e82b44f9 100644
--- a/admin/tmpl/dynamic_gets/default_body.php
+++ b/admin/tmpl/dynamic_gets/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_ge
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('dynamic_get.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('dynamic_get.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_ge
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('dynamic_get.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('dynamic_get.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_ge
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('dynamic_get.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('dynamic_get.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'dynamic_gets.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.dynamic_get"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -84,7 +100,7 @@ $edit = "index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_ge
 			<?php echo Text::_($item->gettype); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('dynamic_get.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('dynamic_get.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'dynamic_gets.', true, 'cb'); ?>
diff --git a/admin/tmpl/dynamic_gets/default_head.php b/admin/tmpl/dynamic_gets/default_head.php
index 9d8ae74d6..82be77c27 100644
--- a/admin/tmpl/dynamic_gets/default_head.php
+++ b/admin/tmpl/dynamic_gets/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/dynamic_gets/modal.php b/admin/tmpl/dynamic_gets/modal.php
new file mode 100644
index 000000000..438f4288c
--- /dev/null
+++ b/admin/tmpl/dynamic_gets/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Dynamic_gets\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=dynamic_gets&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="dynamic_getList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/field/default.php b/admin/tmpl/field/default.php
index d0e299a56..6b53bea01 100644
--- a/admin/tmpl/field/default.php
+++ b/admin/tmpl/field/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('field.set_properties_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/field/modal.php b/admin/tmpl/field/modal.php
new file mode 100644
index 000000000..16fd29cec
--- /dev/null
+++ b/admin/tmpl/field/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Field\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/fields/default_body.php b/admin/tmpl/fields/default_body.php
index 50c66661e..c9b3d8695 100644
--- a/admin/tmpl/fields/default_body.php
+++ b/admin/tmpl/fields/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('field.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('field.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('field.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('field.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,19 +67,35 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('field.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('field.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'fields.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.field"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('fieldtype.edit', 'com_componentbuilder.fieldtype.' . (int) $item->fieldtype_id)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('fieldtype.edit', 'com_componentbuilder.fieldtype.' . (int) $item->fieldtype_id)): ?>
 					<a href="index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.edit&id=<?php echo $item->fieldtype_id; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->fieldtype_name); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->fieldtype_name); ?>
@@ -100,7 +116,7 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('core.edit', 'com_componentbuilder.field.category.' . (int)$item->catid)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('core.edit', 'com_componentbuilder.field.category.' . (int)$item->catid)): ?>
 					<a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_componentbuilder.field"><?php echo $this->escape($item->category_title); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->category_title); ?>
@@ -108,7 +124,7 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('field.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('field.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'fields.', true, 'cb'); ?>
diff --git a/admin/tmpl/fields/default_head.php b/admin/tmpl/fields/default_head.php
index 51099810f..1ba41d982 100644
--- a/admin/tmpl/fields/default_head.php
+++ b/admin/tmpl/fields/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/fields/modal.php b/admin/tmpl/fields/modal.php
new file mode 100644
index 000000000..a6d5f003e
--- /dev/null
+++ b/admin/tmpl/fields/modal.php
@@ -0,0 +1,92 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Fields\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=fields&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="fieldList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// fields footer script
+
+	// get page body
+	var outerBodyDiv = document.querySelector('body');
+
+	// start loading spinner
+	var loadingDiv = document.createElement('div');
+	loadingDiv.id = 'loading';
+
+	// Set CSS properties individually
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
+	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
+	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
+	loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
+	loadingDiv.style.position = 'fixed';
+	loadingDiv.style.opacity = '0.80';
+	loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	loadingDiv.style.filter = "alpha(opacity=80)";
+	loadingDiv.style.display = 'none';
+
+	// add to page body
+	outerBodyDiv.appendChild(loadingDiv);
+// when the expand button is clicked
+jQuery('#toolbar').on('click',"button.button-expand-2", function(e){
+	loadingDiv.style.display = 'block';
+});
+</script>
diff --git a/admin/tmpl/fieldtype/default.php b/admin/tmpl/fieldtype/default.php
index 0db0e0187..be84e7a16 100644
--- a/admin/tmpl/fieldtype/default.php
+++ b/admin/tmpl/fieldtype/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('fieldtype.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/fieldtype/modal.php b/admin/tmpl/fieldtype/modal.php
new file mode 100644
index 000000000..d8a53b962
--- /dev/null
+++ b/admin/tmpl/fieldtype/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Fieldtype\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/fieldtypes/default_body.php b/admin/tmpl/fieldtypes/default_body.php
index c98de9b82..e93c31a73 100644
--- a/admin/tmpl/fieldtypes/default_body.php
+++ b/admin/tmpl/fieldtypes/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.ed
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('fieldtype.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('fieldtype.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.ed
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('fieldtype.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('fieldtype.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.ed
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('fieldtype.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('fieldtype.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'fieldtypes.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.fieldtype"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -82,7 +98,7 @@ $edit = "index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.ed
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('core.edit', 'com_componentbuilder.fieldtype.category.' . (int)$item->catid)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('core.edit', 'com_componentbuilder.fieldtype.category.' . (int)$item->catid)): ?>
 					<a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_componentbuilder.fieldtype"><?php echo $this->escape($item->category_title); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->category_title); ?>
@@ -90,7 +106,7 @@ $edit = "index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.ed
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('fieldtype.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('fieldtype.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'fieldtypes.', true, 'cb'); ?>
diff --git a/admin/tmpl/fieldtypes/default_head.php b/admin/tmpl/fieldtypes/default_head.php
index 48ae38ce8..a4d3e775d 100644
--- a/admin/tmpl/fieldtypes/default_head.php
+++ b/admin/tmpl/fieldtypes/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/fieldtypes/modal.php b/admin/tmpl/fieldtypes/modal.php
new file mode 100644
index 000000000..fc87223e8
--- /dev/null
+++ b/admin/tmpl/fieldtypes/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Fieldtypes\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=fieldtypes&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="fieldtypeList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/help_document/default.php b/admin/tmpl/help_document/default.php
index 306659c4c..a186b48c0 100644
--- a/admin/tmpl/help_document/default.php
+++ b/admin/tmpl/help_document/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('help_document.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/help_document/modal.php b/admin/tmpl/help_document/modal.php
new file mode 100644
index 000000000..768a0cd50
--- /dev/null
+++ b/admin/tmpl/help_document/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Help_document\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/help_documents/default_body.php b/admin/tmpl/help_documents/default_body.php
index 83d624f12..1cd9ff8f3 100644
--- a/admin/tmpl/help_documents/default_body.php
+++ b/admin/tmpl/help_documents/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=help_documents&task=help_doc
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('help_document.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('help_document.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=help_documents&task=help_doc
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('help_document.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('help_document.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=help_documents&task=help_doc
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('help_document.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('help_document.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->title); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'help_documents.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->title); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->title); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->title, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.help_document"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->title, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->title); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -93,7 +109,7 @@ $edit = "index.php?option=com_componentbuilder&view=help_documents&task=help_doc
 			<?php echo $this->escape($item->site_view); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('help_document.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('help_document.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'help_documents.', true, 'cb'); ?>
diff --git a/admin/tmpl/help_documents/default_head.php b/admin/tmpl/help_documents/default_head.php
index 5853a024f..da864351d 100644
--- a/admin/tmpl/help_documents/default_head.php
+++ b/admin/tmpl/help_documents/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/help_documents/modal.php b/admin/tmpl/help_documents/modal.php
new file mode 100644
index 000000000..0b68f885e
--- /dev/null
+++ b/admin/tmpl/help_documents/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Help_documents\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=help_documents&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="help_documentList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/joomla_component/default.php b/admin/tmpl/joomla_component/default.php
index 4ed1dd623..8b1933b4e 100644
--- a/admin/tmpl/joomla_component/default.php
+++ b/admin/tmpl/joomla_component/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('joomla_component.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/joomla_component/modal.php b/admin/tmpl/joomla_component/modal.php
new file mode 100644
index 000000000..a35e34a55
--- /dev/null
+++ b/admin/tmpl/joomla_component/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_component\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/joomla_components/default_body.php b/admin/tmpl/joomla_components/default_body.php
index 32df96839..cbbf788f0 100644
--- a/admin/tmpl/joomla_components/default_body.php
+++ b/admin/tmpl/joomla_components/default_body.php
@@ -34,7 +34,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('joomla_component.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_component.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -54,7 +54,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('joomla_component.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_component.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -70,13 +70,29 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('joomla_component.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('joomla_component.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $this->escape($item->system_name); ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $this->escape($item->system_name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.joomla_component"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->system_name, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $this->escape($item->system_name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?>
 				- <?php echo $this->escape($item->component_version); ?>
 			</div>
@@ -220,7 +236,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('joomla_component.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_component.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_components.', true, 'cb'); ?>
diff --git a/admin/tmpl/joomla_components/default_head.php b/admin/tmpl/joomla_components/default_head.php
index 97434606e..2ade39dbc 100644
--- a/admin/tmpl/joomla_components/default_head.php
+++ b/admin/tmpl/joomla_components/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
@@ -36,13 +36,13 @@ defined('_JEXEC') or die;
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SYSTEM_NAME_LABEL', 'a.system_name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL', 'a.name_code', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CODE_NAME', 'a.name_code', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SHORT_DESCRIPTION_LABEL', 'a.short_description', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DESCRIPTION', 'a.short_description', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL', 'a.companyname', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_COMPANY_DETAILS', 'a.companyname', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
diff --git a/admin/tmpl/joomla_components/modal.php b/admin/tmpl/joomla_components/modal.php
new file mode 100644
index 000000000..6df1dc229
--- /dev/null
+++ b/admin/tmpl/joomla_components/modal.php
@@ -0,0 +1,110 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_components\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=joomla_components&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="joomla_componentList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// joomla_components footer script
+
+	// get page body
+	var outerBodyDiv = document.querySelector('body');
+
+	// start loading spinner
+	var loadingDiv = document.createElement('div');
+	loadingDiv.id = 'loading';
+
+	// Set CSS properties individually
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
+	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
+	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
+	loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
+	loadingDiv.style.position = 'fixed';
+	loadingDiv.style.opacity = '0.80';
+	loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	loadingDiv.style.filter = "alpha(opacity=80)";
+	loadingDiv.style.display = 'none';
+
+	// add to page body
+	outerBodyDiv.appendChild(loadingDiv);
+// when the clone button is clicked
+jQuery('#toolbar').on('click',"button.button-save-copy", function(e){
+	if (document.adminForm.boxchecked.value != 0){
+		loadingDiv.style.display = 'block';
+	}
+});
+// when the backup button is clicked
+jQuery('#toolbar').on('click',"button.button-archive", function(e){
+	if (document.adminForm.boxchecked.value != 0){
+		loadingDiv.style.display = 'block';
+	}
+});
+// when the export button is clicked
+jQuery('#toolbar').on('click',"button.button-download", function(e){
+	if (document.adminForm.boxchecked.value != 0){
+		loadingDiv.style.display = 'block';
+	}
+});
+// when the expand button is clicked
+jQuery('#toolbar').on('click',"button.button-expand-2", function(e){
+	loadingDiv.style.display = 'block';
+});
+</script>
diff --git a/admin/tmpl/joomla_module/default.php b/admin/tmpl/joomla_module/default.php
index d4f04eab9..d85983032 100644
--- a/admin/tmpl/joomla_module/default.php
+++ b/admin/tmpl/joomla_module/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('joomla_module.html_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/joomla_module/modal.php b/admin/tmpl/joomla_module/modal.php
new file mode 100644
index 000000000..616a05f50
--- /dev/null
+++ b/admin/tmpl/joomla_module/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_module\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/joomla_module_files_folders_urls/default.php b/admin/tmpl/joomla_module_files_folders_urls/default.php
index d9f1cca4d..354ccebf8 100644
--- a/admin/tmpl/joomla_module_files_folders_urls/default.php
+++ b/admin/tmpl/joomla_module_files_folders_urls/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('joomla_module_files_folders_urls.basic_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/joomla_module_files_folders_urls/modal.php b/admin/tmpl/joomla_module_files_folders_urls/modal.php
new file mode 100644
index 000000000..54ffdc766
--- /dev/null
+++ b/admin/tmpl/joomla_module_files_folders_urls/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_module_files_folders_urls\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/joomla_module_updates/default.php b/admin/tmpl/joomla_module_updates/default.php
index 4a70482f8..c14da406c 100644
--- a/admin/tmpl/joomla_module_updates/default.php
+++ b/admin/tmpl/joomla_module_updates/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('joomla_module_updates.updates_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/joomla_module_updates/modal.php b/admin/tmpl/joomla_module_updates/modal.php
new file mode 100644
index 000000000..3e6d3bd56
--- /dev/null
+++ b/admin/tmpl/joomla_module_updates/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_module_updates\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/joomla_modules/default_body.php b/admin/tmpl/joomla_modules/default_body.php
index f1099cd45..ad169c07d 100644
--- a/admin/tmpl/joomla_modules/default_body.php
+++ b/admin/tmpl/joomla_modules/default_body.php
@@ -33,7 +33,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('joomla_module.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_module.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -53,7 +53,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('joomla_module.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_module.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -69,13 +69,29 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('joomla_module.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('joomla_module.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_modules.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $this->escape($item->system_name); ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $this->escape($item->system_name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.joomla_module"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->system_name, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $this->escape($item->system_name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?> - <b>
 			<?php echo $this->escape($item->module_version); ?></b>
 			</div>
@@ -115,7 +131,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 			<?php echo $this->escape($item->description); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('joomla_module.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_module.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules.', true, 'cb'); ?>
diff --git a/admin/tmpl/joomla_modules/default_head.php b/admin/tmpl/joomla_modules/default_head.php
index 6c72f4003..7ce71de7b 100644
--- a/admin/tmpl/joomla_modules/default_head.php
+++ b/admin/tmpl/joomla_modules/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/joomla_modules/modal.php b/admin/tmpl/joomla_modules/modal.php
new file mode 100644
index 000000000..bae966da7
--- /dev/null
+++ b/admin/tmpl/joomla_modules/modal.php
@@ -0,0 +1,93 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_modules\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=joomla_modules&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="joomla_moduleList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// joomla_modules footer script
+
+	// get page body
+	var outerBodyDiv = document.querySelector('body');
+
+	// start loading spinner
+	var loadingDiv = document.createElement('div');
+	loadingDiv.id = 'loading';
+
+	// Set CSS properties individually
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
+	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
+	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
+	loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
+	loadingDiv.style.position = 'fixed';
+	loadingDiv.style.opacity = '0.80';
+	loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	loadingDiv.style.filter = "alpha(opacity=80)";
+	loadingDiv.style.display = 'none';
+
+	// add to page body
+	outerBodyDiv.appendChild(loadingDiv);
+// when the build button is clicked
+jQuery('#toolbar').on('click',"button.button-joomla", function(e){
+	loadingDiv.style.display = 'block';
+});
+
+</script>
diff --git a/admin/tmpl/joomla_modules_files_folders_urls/default_body.php b/admin/tmpl/joomla_modules_files_folders_urls/default_body.php
index d31cfcbf7..3f8e354ae 100644
--- a/admin/tmpl/joomla_modules_files_folders_urls/default_body.php
+++ b/admin/tmpl/joomla_modules_files_folders_urls/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules_files_folders
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('joomla_module_files_folders_urls.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_module_files_folders_urls.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules_files_folders
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('joomla_module_files_folders_urls.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_module_files_folders_urls.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules_files_folders
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('joomla_module_files_folders_urls.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('joomla_module_files_folders_urls.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_module_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_modules_files_folders_urls.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_module_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_module_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_module_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.joomla_module_files_folders_urls"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_module_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_module_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('joomla_module_files_folders_urls.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_module_files_folders_urls.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules_files_folders_urls.', true, 'cb'); ?>
diff --git a/admin/tmpl/joomla_modules_files_folders_urls/default_head.php b/admin/tmpl/joomla_modules_files_folders_urls/default_head.php
index b816e7306..7dc160b71 100644
--- a/admin/tmpl/joomla_modules_files_folders_urls/default_head.php
+++ b/admin/tmpl/joomla_modules_files_folders_urls/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/joomla_modules_files_folders_urls/modal.php b/admin/tmpl/joomla_modules_files_folders_urls/modal.php
new file mode 100644
index 000000000..52a34b570
--- /dev/null
+++ b/admin/tmpl/joomla_modules_files_folders_urls/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_modules_files_folders_urls\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=joomla_modules_files_folders_urls&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="joomla_module_files_folders_urlsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/joomla_modules_updates/default_body.php b/admin/tmpl/joomla_modules_updates/default_body.php
index f1cb127ff..a3181c3e2 100644
--- a/admin/tmpl/joomla_modules_updates/default_body.php
+++ b/admin/tmpl/joomla_modules_updates/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules_updates&task=
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('joomla_module_updates.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_module_updates.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules_updates&task=
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('joomla_module_updates.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_module_updates.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules_updates&task=
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('joomla_module_updates.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('joomla_module_updates.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_module_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_modules_updates.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_module_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_module_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_module_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.joomla_module_updates"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_module_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_module_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('joomla_module_updates.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_module_updates.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules_updates.', true, 'cb'); ?>
diff --git a/admin/tmpl/joomla_modules_updates/default_head.php b/admin/tmpl/joomla_modules_updates/default_head.php
index 6511f1804..7a41f74df 100644
--- a/admin/tmpl/joomla_modules_updates/default_head.php
+++ b/admin/tmpl/joomla_modules_updates/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/joomla_modules_updates/modal.php b/admin/tmpl/joomla_modules_updates/modal.php
new file mode 100644
index 000000000..26b03c425
--- /dev/null
+++ b/admin/tmpl/joomla_modules_updates/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_modules_updates\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=joomla_modules_updates&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="joomla_module_updatesList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/joomla_plugin/default.php b/admin/tmpl/joomla_plugin/default.php
index 5b2511358..5f2c8a8ec 100644
--- a/admin/tmpl/joomla_plugin/default.php
+++ b/admin/tmpl/joomla_plugin/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('joomla_plugin.code_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/joomla_plugin/modal.php b/admin/tmpl/joomla_plugin/modal.php
new file mode 100644
index 000000000..8328a12f5
--- /dev/null
+++ b/admin/tmpl/joomla_plugin/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_plugin\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/joomla_plugin_files_folders_urls/default.php b/admin/tmpl/joomla_plugin_files_folders_urls/default.php
index 18eea30e8..d8962fb63 100644
--- a/admin/tmpl/joomla_plugin_files_folders_urls/default.php
+++ b/admin/tmpl/joomla_plugin_files_folders_urls/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('joomla_plugin_files_folders_urls.basic_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/joomla_plugin_files_folders_urls/modal.php b/admin/tmpl/joomla_plugin_files_folders_urls/modal.php
new file mode 100644
index 000000000..be54fce6c
--- /dev/null
+++ b/admin/tmpl/joomla_plugin_files_folders_urls/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_plugin_files_folders_urls\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/joomla_plugin_group/default.php b/admin/tmpl/joomla_plugin_group/default.php
index 12b66ccac..3b2bde73e 100644
--- a/admin/tmpl/joomla_plugin_group/default.php
+++ b/admin/tmpl/joomla_plugin_group/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="main-card">
 
diff --git a/admin/tmpl/joomla_plugin_group/modal.php b/admin/tmpl/joomla_plugin_group/modal.php
new file mode 100644
index 000000000..a99e1f6df
--- /dev/null
+++ b/admin/tmpl/joomla_plugin_group/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_plugin_group\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/joomla_plugin_groups/default_body.php b/admin/tmpl/joomla_plugin_groups/default_body.php
index fa6f294d8..9d3665974 100644
--- a/admin/tmpl/joomla_plugin_groups/default_body.php
+++ b/admin/tmpl/joomla_plugin_groups/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugin_groups&task=jo
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('core.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugin_groups&task=jo
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('core.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,19 +67,35 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugin_groups&task=jo
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('core.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_plugin_groups.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.joomla_plugin_group"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('class_extends.edit', 'com_componentbuilder.class_extends.' . (int) $item->class_extends_id)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('class_extends.edit', 'com_componentbuilder.class_extends.' . (int) $item->class_extends_id)): ?>
 					<a href="index.php?option=com_componentbuilder&view=class_extendings&task=class_extends.edit&id=<?php echo $item->class_extends_id; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->class_extends_name); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->class_extends_name); ?>
@@ -87,7 +103,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugin_groups&task=jo
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('core.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_plugin_groups.', true, 'cb'); ?>
diff --git a/admin/tmpl/joomla_plugin_groups/default_head.php b/admin/tmpl/joomla_plugin_groups/default_head.php
index d34dfcdeb..e4ddc79a6 100644
--- a/admin/tmpl/joomla_plugin_groups/default_head.php
+++ b/admin/tmpl/joomla_plugin_groups/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/joomla_plugin_groups/modal.php b/admin/tmpl/joomla_plugin_groups/modal.php
new file mode 100644
index 000000000..26ba7ec68
--- /dev/null
+++ b/admin/tmpl/joomla_plugin_groups/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_plugin_groups\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=joomla_plugin_groups&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="joomla_plugin_groupList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/joomla_plugin_updates/default.php b/admin/tmpl/joomla_plugin_updates/default.php
index f70b2e006..2e73bb8da 100644
--- a/admin/tmpl/joomla_plugin_updates/default.php
+++ b/admin/tmpl/joomla_plugin_updates/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('joomla_plugin_updates.updates_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/joomla_plugin_updates/modal.php b/admin/tmpl/joomla_plugin_updates/modal.php
new file mode 100644
index 000000000..a8d64af27
--- /dev/null
+++ b/admin/tmpl/joomla_plugin_updates/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_plugin_updates\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/joomla_plugins/default_body.php b/admin/tmpl/joomla_plugins/default_body.php
index ba6c6c022..7bc9739d5 100644
--- a/admin/tmpl/joomla_plugins/default_body.php
+++ b/admin/tmpl/joomla_plugins/default_body.php
@@ -33,7 +33,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_p
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('joomla_plugin.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_plugin.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -53,7 +53,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_p
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('joomla_plugin.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_plugin.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -69,13 +69,29 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_p
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('joomla_plugin.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('joomla_plugin.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_plugins.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $this->escape($item->system_name); ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $this->escape($item->system_name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.joomla_plugin"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->system_name, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $this->escape($item->system_name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?> - <b>
 			<?php echo $this->escape($item->plugin_version); ?></b>
 			</div>
@@ -110,7 +126,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_p
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('class_extends.edit', 'com_componentbuilder.class_extends.' . (int) $item->class_extends_id)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('class_extends.edit', 'com_componentbuilder.class_extends.' . (int) $item->class_extends_id)): ?>
 					<a href="index.php?option=com_componentbuilder&view=class_extendings&task=class_extends.edit&id=<?php echo $item->class_extends_id; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->class_extends_name); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->class_extends_name); ?>
@@ -119,7 +135,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_p
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('core.edit', 'com_componentbuilder.joomla_plugin_group.' . (int) $item->joomla_plugin_group_id)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('core.edit', 'com_componentbuilder.joomla_plugin_group.' . (int) $item->joomla_plugin_group_id)): ?>
 					<a href="index.php?option=com_componentbuilder&view=joomla_plugin_groups&task=joomla_plugin_group.edit&id=<?php echo $item->joomla_plugin_group_id; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->joomla_plugin_group_name); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->joomla_plugin_group_name); ?>
@@ -127,7 +143,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_p
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('joomla_plugin.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_plugin.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_plugins.', true, 'cb'); ?>
diff --git a/admin/tmpl/joomla_plugins/default_head.php b/admin/tmpl/joomla_plugins/default_head.php
index 6c4e493dd..89daea54b 100644
--- a/admin/tmpl/joomla_plugins/default_head.php
+++ b/admin/tmpl/joomla_plugins/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/joomla_plugins/modal.php b/admin/tmpl/joomla_plugins/modal.php
new file mode 100644
index 000000000..1b7eb2251
--- /dev/null
+++ b/admin/tmpl/joomla_plugins/modal.php
@@ -0,0 +1,93 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_plugins\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=joomla_plugins&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="joomla_pluginList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// joomla_plugins footer script
+
+	// get page body
+	var outerBodyDiv = document.querySelector('body');
+
+	// start loading spinner
+	var loadingDiv = document.createElement('div');
+	loadingDiv.id = 'loading';
+
+	// Set CSS properties individually
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
+	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
+	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
+	loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
+	loadingDiv.style.position = 'fixed';
+	loadingDiv.style.opacity = '0.80';
+	loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	loadingDiv.style.filter = "alpha(opacity=80)";
+	loadingDiv.style.display = 'none';
+
+	// add to page body
+	outerBodyDiv.appendChild(loadingDiv);
+// when the build button is clicked
+jQuery('#toolbar').on('click',"button.button-joomla", function(e){
+	loadingDiv.style.display = 'block';
+});
+
+</script>
diff --git a/admin/tmpl/joomla_plugins_files_folders_urls/default_body.php b/admin/tmpl/joomla_plugins_files_folders_urls/default_body.php
index cdccd219c..1c4717fd2 100644
--- a/admin/tmpl/joomla_plugins_files_folders_urls/default_body.php
+++ b/admin/tmpl/joomla_plugins_files_folders_urls/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins_files_folders
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('joomla_plugin_files_folders_urls.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_plugin_files_folders_urls.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins_files_folders
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('joomla_plugin_files_folders_urls.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_plugin_files_folders_urls.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins_files_folders
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('joomla_plugin_files_folders_urls.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('joomla_plugin_files_folders_urls.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_plugin_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_plugins_files_folders_urls.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_plugin_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_plugin_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_plugin_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.joomla_plugin_files_folders_urls"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_plugin_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_plugin_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('joomla_plugin_files_folders_urls.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_plugin_files_folders_urls.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_plugins_files_folders_urls.', true, 'cb'); ?>
diff --git a/admin/tmpl/joomla_plugins_files_folders_urls/default_head.php b/admin/tmpl/joomla_plugins_files_folders_urls/default_head.php
index fa2f935dd..0932419cc 100644
--- a/admin/tmpl/joomla_plugins_files_folders_urls/default_head.php
+++ b/admin/tmpl/joomla_plugins_files_folders_urls/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/joomla_plugins_files_folders_urls/modal.php b/admin/tmpl/joomla_plugins_files_folders_urls/modal.php
new file mode 100644
index 000000000..38306dc92
--- /dev/null
+++ b/admin/tmpl/joomla_plugins_files_folders_urls/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_plugins_files_folders_urls\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=joomla_plugins_files_folders_urls&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="joomla_plugin_files_folders_urlsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/joomla_plugins_updates/default_body.php b/admin/tmpl/joomla_plugins_updates/default_body.php
index eab015411..24ebec3a8 100644
--- a/admin/tmpl/joomla_plugins_updates/default_body.php
+++ b/admin/tmpl/joomla_plugins_updates/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins_updates&task=
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('joomla_plugin_updates.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_plugin_updates.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins_updates&task=
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('joomla_plugin_updates.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_plugin_updates.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins_updates&task=
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('joomla_plugin_updates.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('joomla_plugin_updates.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_plugin_system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_plugins_updates.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->joomla_plugin_system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->joomla_plugin_system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_plugin_system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.joomla_plugin_updates"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->joomla_plugin_system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->joomla_plugin_system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('joomla_plugin_updates.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_plugin_updates.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_plugins_updates.', true, 'cb'); ?>
diff --git a/admin/tmpl/joomla_plugins_updates/default_head.php b/admin/tmpl/joomla_plugins_updates/default_head.php
index 6702c44f1..c891098ee 100644
--- a/admin/tmpl/joomla_plugins_updates/default_head.php
+++ b/admin/tmpl/joomla_plugins_updates/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/joomla_plugins_updates/modal.php b/admin/tmpl/joomla_plugins_updates/modal.php
new file mode 100644
index 000000000..9fec81ce0
--- /dev/null
+++ b/admin/tmpl/joomla_plugins_updates/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_plugins_updates\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=joomla_plugins_updates&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="joomla_plugin_updatesList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/joomla_power/default.php b/admin/tmpl/joomla_power/default.php
index 084fe6fd8..a3118edad 100644
--- a/admin/tmpl/joomla_power/default.php
+++ b/admin/tmpl/joomla_power/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('joomla_power.joomla_power_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/joomla_power/modal.php b/admin/tmpl/joomla_power/modal.php
new file mode 100644
index 000000000..3df7ddf63
--- /dev/null
+++ b/admin/tmpl/joomla_power/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_power\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/joomla_powers/default_body.php b/admin/tmpl/joomla_powers/default_body.php
index 9bf1ae8cd..5b1bb4ade 100644
--- a/admin/tmpl/joomla_powers/default_body.php
+++ b/admin/tmpl/joomla_powers/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_powers&task=joomla_po
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('joomla_power.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_power.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_powers&task=joomla_po
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('joomla_power.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_power.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,19 +67,35 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_powers&task=joomla_po
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('joomla_power.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('joomla_power.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_powers.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $this->escape($item->system_name); ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $this->escape($item->system_name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.joomla_power"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->system_name, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $this->escape($item->system_name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?><br /><small>GUID: 
 			<?php echo $this->escape($item->guid); ?><?php if(isset($item->joomla_power_key)): ?><br />JPK: <?php echo $item->joomla_power_key; ?><?php endif; ?></small>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('joomla_power.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('joomla_power.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_powers.', true, 'cb'); ?>
diff --git a/admin/tmpl/joomla_powers/default_head.php b/admin/tmpl/joomla_powers/default_head.php
index a8e9f7eb9..0b607fed6 100644
--- a/admin/tmpl/joomla_powers/default_head.php
+++ b/admin/tmpl/joomla_powers/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
@@ -33,7 +33,7 @@ defined('_JEXEC') or die;
 		</th>
 	<?php endif; ?>
 	<th class="nowrap" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_POWER_SYSTEM_NAME_LABEL', 'a.system_name', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_POWERS_NAME', 'a.system_name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
diff --git a/admin/tmpl/joomla_powers/modal.php b/admin/tmpl/joomla_powers/modal.php
new file mode 100644
index 000000000..5550a4a51
--- /dev/null
+++ b/admin/tmpl/joomla_powers/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_powers\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=joomla_powers&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="joomla_powerList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/language/default.php b/admin/tmpl/language/default.php
index 2d5b62577..a5b4c7084 100644
--- a/admin/tmpl/language/default.php
+++ b/admin/tmpl/language/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="main-card">
 
diff --git a/admin/tmpl/language/modal.php b/admin/tmpl/language/modal.php
new file mode 100644
index 000000000..8f3b1be53
--- /dev/null
+++ b/admin/tmpl/language/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Language\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/language_translation/default.php b/admin/tmpl/language_translation/default.php
index 009d9ac6c..085dba0a9 100644
--- a/admin/tmpl/language_translation/default.php
+++ b/admin/tmpl/language_translation/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="main-card">
 
diff --git a/admin/tmpl/language_translation/modal.php b/admin/tmpl/language_translation/modal.php
new file mode 100644
index 000000000..3e7615640
--- /dev/null
+++ b/admin/tmpl/language_translation/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Language_translation\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/language_translations/default_body.php b/admin/tmpl/language_translations/default_body.php
index 563dc1999..9b6e1768a 100644
--- a/admin/tmpl/language_translations/default_body.php
+++ b/admin/tmpl/language_translations/default_body.php
@@ -34,7 +34,7 @@ $edit = "index.php?option=com_componentbuilder&view=language_translations&task=l
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('language_translation.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('language_translation.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -54,7 +54,7 @@ $edit = "index.php?option=com_componentbuilder&view=language_translations&task=l
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('language_translation.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('language_translation.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -70,13 +70,29 @@ $edit = "index.php?option=com_componentbuilder&view=language_translations&task=l
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('language_translation.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('language_translation.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $item->source; ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'language_translations.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $item->source; ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $item->source; ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->source, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.language_translation"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->source, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $item->source; ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?>
 			<?php
 			$langBucket = array();
@@ -164,7 +180,7 @@ $edit = "index.php?option=com_componentbuilder&view=language_translations&task=l
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('language_translation.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('language_translation.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'language_translations.', true, 'cb'); ?>
diff --git a/admin/tmpl/language_translations/default_head.php b/admin/tmpl/language_translations/default_head.php
index 24ea90ca1..1df87f457 100644
--- a/admin/tmpl/language_translations/default_head.php
+++ b/admin/tmpl/language_translations/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/language_translations/modal.php b/admin/tmpl/language_translations/modal.php
new file mode 100644
index 000000000..c87af24ad
--- /dev/null
+++ b/admin/tmpl/language_translations/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Language_translations\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=language_translations&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="language_translationList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/languages/default_body.php b/admin/tmpl/languages/default_body.php
index 83eceee9b..d93761b3e 100644
--- a/admin/tmpl/languages/default_body.php
+++ b/admin/tmpl/languages/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=languages&task=language.edit
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('language.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('language.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=languages&task=language.edit
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('language.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('language.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=languages&task=language.edit
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('language.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('language.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'languages.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.language"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -81,7 +97,7 @@ $edit = "index.php?option=com_componentbuilder&view=languages&task=language.edit
 			<?php echo $this->escape($item->langtag); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('language.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('language.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'languages.', true, 'cb'); ?>
diff --git a/admin/tmpl/languages/default_head.php b/admin/tmpl/languages/default_head.php
index 869e71035..fd499c96b 100644
--- a/admin/tmpl/languages/default_head.php
+++ b/admin/tmpl/languages/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/languages/modal.php b/admin/tmpl/languages/modal.php
new file mode 100644
index 000000000..762c133cd
--- /dev/null
+++ b/admin/tmpl/languages/modal.php
@@ -0,0 +1,93 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Languages\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=languages&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="languageList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// languages footer script
+
+	// get page body
+	var outerBodyDiv = document.querySelector('body');
+
+	// start loading spinner
+	var loadingDiv = document.createElement('div');
+	loadingDiv.id = 'loading';
+
+	// Set CSS properties individually
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
+	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
+	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
+	loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
+	loadingDiv.style.position = 'fixed';
+	loadingDiv.style.opacity = '0.80';
+	loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	loadingDiv.style.filter = "alpha(opacity=80)";
+	loadingDiv.style.display = 'none';
+
+	// add to page body
+	outerBodyDiv.appendChild(loadingDiv);
+// when the build button is clicked
+jQuery('#toolbar').on('click',"button.button-joomla", function(e){
+	loadingDiv.style.display = 'block';
+});
+
+</script>
diff --git a/admin/tmpl/layout/default.php b/admin/tmpl/layout/default.php
index 41e455d0c..3687af84e 100644
--- a/admin/tmpl/layout/default.php
+++ b/admin/tmpl/layout/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="main-card">
 <div class="row">
diff --git a/admin/tmpl/layout/modal.php b/admin/tmpl/layout/modal.php
new file mode 100644
index 000000000..75c796ad5
--- /dev/null
+++ b/admin/tmpl/layout/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Layout\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/layouts/default_body.php b/admin/tmpl/layouts/default_body.php
index a166825f5..047ea1bb6 100644
--- a/admin/tmpl/layouts/default_body.php
+++ b/admin/tmpl/layouts/default_body.php
@@ -32,7 +32,7 @@ $edit = "index.php?option=com_componentbuilder&view=layouts&task=layout.edit";
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('core.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -52,7 +52,7 @@ $edit = "index.php?option=com_componentbuilder&view=layouts&task=layout.edit";
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('core.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -68,13 +68,29 @@ $edit = "index.php?option=com_componentbuilder&view=layouts&task=layout.edit";
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('core.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'layouts.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $this->escape($item->name); ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $this->escape($item->name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.layout"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->name, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $this->escape($item->name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?><br />
 	<code>&lt;?php echo LayoutHelper::render('<?php echo StringHelper::safe($item->alias); ?>', [?]); ?&gt;</code>
 			</div>
@@ -90,7 +106,7 @@ $edit = "index.php?option=com_componentbuilder&view=layouts&task=layout.edit";
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $item->dynamic_get_id)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $item->dynamic_get_id)): ?>
 					<a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->dynamic_get_id; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->dynamic_get_name); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->dynamic_get_name); ?>
@@ -98,7 +114,7 @@ $edit = "index.php?option=com_componentbuilder&view=layouts&task=layout.edit";
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('core.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'layouts.', true, 'cb'); ?>
diff --git a/admin/tmpl/layouts/default_head.php b/admin/tmpl/layouts/default_head.php
index 5e69aa9ab..723ac1fcf 100644
--- a/admin/tmpl/layouts/default_head.php
+++ b/admin/tmpl/layouts/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
@@ -33,10 +33,10 @@ defined('_JEXEC') or die;
 		</th>
 	<?php endif; ?>
 	<th class="nowrap" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_LAYOUT_NAME_LABEL', 'a.name', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_LAYOUTS_NAMES', 'a.name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_LABEL', 'a.description', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_LAYOUTS_DETAILS', 'a.description', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap" >
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_GET_LABEL', 'g.name', $this->listDirn, $this->listOrder); ?>
diff --git a/admin/tmpl/layouts/modal.php b/admin/tmpl/layouts/modal.php
new file mode 100644
index 000000000..0b8ae6000
--- /dev/null
+++ b/admin/tmpl/layouts/modal.php
@@ -0,0 +1,88 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Layouts\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=layouts&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="layoutList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// layouts footer script
+
+HTMLElement.prototype.selText = function() {
+    var obj = this;
+
+    // For modern browsers, handle the selection
+    var selection = window.getSelection();
+    var range = document.createRange();
+
+    // Select the content of the element
+    range.selectNodeContents(obj);
+    selection.removeAllRanges();  // Clear any previous selections
+    selection.addRange(range);    // Add the new selection range
+
+    return this;
+};
+// make sure the code bocks are active
+document.querySelectorAll("code").forEach(function(codeBlock) {
+    codeBlock.addEventListener("click", function() {
+        codeBlock.selText(); // Call the custom selText function
+        codeBlock.classList.add("selected"); // Add the "selected" class
+    });
+});
+</script>
diff --git a/admin/tmpl/libraries/default_body.php b/admin/tmpl/libraries/default_body.php
index 693e008d4..80a416dad 100644
--- a/admin/tmpl/libraries/default_body.php
+++ b/admin/tmpl/libraries/default_body.php
@@ -34,7 +34,7 @@ $edit = "index.php?option=com_componentbuilder&view=libraries&task=library.edit"
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('library.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('library.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -54,7 +54,7 @@ $edit = "index.php?option=com_componentbuilder&view=libraries&task=library.edit"
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('library.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('library.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -70,13 +70,29 @@ $edit = "index.php?option=com_componentbuilder&view=libraries&task=library.edit"
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('library.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('library.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'libraries.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $this->escape($item->name); ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $this->escape($item->name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.library"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->name, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $this->escape($item->name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?>
 			</div>
 			<?php	// setup the return path
@@ -124,7 +140,7 @@ $edit = "index.php?option=com_componentbuilder&view=libraries&task=library.edit"
 			<?php echo $this->escape($item->description); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('library.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('library.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'libraries.', true, 'cb'); ?>
diff --git a/admin/tmpl/libraries/default_head.php b/admin/tmpl/libraries/default_head.php
index 3ac87f7c4..4a8f23509 100644
--- a/admin/tmpl/libraries/default_head.php
+++ b/admin/tmpl/libraries/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/libraries/modal.php b/admin/tmpl/libraries/modal.php
new file mode 100644
index 000000000..0141cbfbb
--- /dev/null
+++ b/admin/tmpl/libraries/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Libraries\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=libraries&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="libraryList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/libraries_config/default_body.php b/admin/tmpl/libraries_config/default_body.php
index 4c5dd50f3..9a5f0888f 100644
--- a/admin/tmpl/libraries_config/default_body.php
+++ b/admin/tmpl/libraries_config/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=libraries_config&task=librar
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('library_config.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('library_config.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=libraries_config&task=librar
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('library_config.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('library_config.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=libraries_config&task=librar
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('library_config.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('library_config.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->library_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'libraries_config.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->library_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->library_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->library_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.library_config"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->library_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->library_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('library_config.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('library_config.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'libraries_config.', true, 'cb'); ?>
diff --git a/admin/tmpl/libraries_config/default_head.php b/admin/tmpl/libraries_config/default_head.php
index ec2cb4a9d..96803c658 100644
--- a/admin/tmpl/libraries_config/default_head.php
+++ b/admin/tmpl/libraries_config/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/libraries_config/modal.php b/admin/tmpl/libraries_config/modal.php
new file mode 100644
index 000000000..1ad8c8e77
--- /dev/null
+++ b/admin/tmpl/libraries_config/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Libraries_config\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=libraries_config&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="library_configList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/libraries_files_folders_urls/default_body.php b/admin/tmpl/libraries_files_folders_urls/default_body.php
index 4f4f8ec93..f923c0e93 100644
--- a/admin/tmpl/libraries_files_folders_urls/default_body.php
+++ b/admin/tmpl/libraries_files_folders_urls/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=libraries_files_folders_urls
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('library_files_folders_urls.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('library_files_folders_urls.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=libraries_files_folders_urls
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('library_files_folders_urls.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('library_files_folders_urls.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=libraries_files_folders_urls
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('library_files_folders_urls.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('library_files_folders_urls.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->library_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'libraries_files_folders_urls.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->library_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->library_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->library_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.library_files_folders_urls"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->library_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->library_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('library_files_folders_urls.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('library_files_folders_urls.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'libraries_files_folders_urls.', true, 'cb'); ?>
diff --git a/admin/tmpl/libraries_files_folders_urls/default_head.php b/admin/tmpl/libraries_files_folders_urls/default_head.php
index c96473780..48ac57809 100644
--- a/admin/tmpl/libraries_files_folders_urls/default_head.php
+++ b/admin/tmpl/libraries_files_folders_urls/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/libraries_files_folders_urls/modal.php b/admin/tmpl/libraries_files_folders_urls/modal.php
new file mode 100644
index 000000000..9492f0f3a
--- /dev/null
+++ b/admin/tmpl/libraries_files_folders_urls/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Libraries_files_folders_urls\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=libraries_files_folders_urls&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="library_files_folders_urlsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/library/default.php b/admin/tmpl/library/default.php
index 5e08f63a3..a9bdff222 100644
--- a/admin/tmpl/library/default.php
+++ b/admin/tmpl/library/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('library.behaviour_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/library/modal.php b/admin/tmpl/library/modal.php
new file mode 100644
index 000000000..023be2e56
--- /dev/null
+++ b/admin/tmpl/library/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Library\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/library_config/default.php b/admin/tmpl/library_config/default.php
index 73cc1dd4e..5d455e802 100644
--- a/admin/tmpl/library_config/default.php
+++ b/admin/tmpl/library_config/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('library_config.tweaks_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/library_config/modal.php b/admin/tmpl/library_config/modal.php
new file mode 100644
index 000000000..f642e712e
--- /dev/null
+++ b/admin/tmpl/library_config/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Library_config\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/library_files_folders_urls/default.php b/admin/tmpl/library_files_folders_urls/default.php
index c7f917d24..384f7b1cf 100644
--- a/admin/tmpl/library_files_folders_urls/default.php
+++ b/admin/tmpl/library_files_folders_urls/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('library_files_folders_urls.basic_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/library_files_folders_urls/modal.php b/admin/tmpl/library_files_folders_urls/modal.php
new file mode 100644
index 000000000..b4e2ae134
--- /dev/null
+++ b/admin/tmpl/library_files_folders_urls/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Library_files_folders_urls\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/placeholder/default.php b/admin/tmpl/placeholder/default.php
index ba5e95d17..103f2c1be 100644
--- a/admin/tmpl/placeholder/default.php
+++ b/admin/tmpl/placeholder/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="main-card">
 
diff --git a/admin/tmpl/placeholder/modal.php b/admin/tmpl/placeholder/modal.php
new file mode 100644
index 000000000..992ff780d
--- /dev/null
+++ b/admin/tmpl/placeholder/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Placeholder\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/placeholders/default_body.php b/admin/tmpl/placeholders/default_body.php
index 28137602f..b6418b258 100644
--- a/admin/tmpl/placeholders/default_body.php
+++ b/admin/tmpl/placeholders/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=placeholders&task=placeholde
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('placeholder.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('placeholder.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=placeholders&task=placeholde
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('placeholder.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('placeholder.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=placeholders&task=placeholde
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('placeholder.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('placeholder.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->target); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'placeholders.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->target); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->target); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->target, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.placeholder"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->target, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->target); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -81,7 +97,7 @@ $edit = "index.php?option=com_componentbuilder&view=placeholders&task=placeholde
 			<?php echo $this->escape($item->value); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('placeholder.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('placeholder.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'placeholders.', true, 'cb'); ?>
diff --git a/admin/tmpl/placeholders/default_head.php b/admin/tmpl/placeholders/default_head.php
index 3a6942996..412410d1e 100644
--- a/admin/tmpl/placeholders/default_head.php
+++ b/admin/tmpl/placeholders/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/placeholders/modal.php b/admin/tmpl/placeholders/modal.php
new file mode 100644
index 000000000..ed06fdee8
--- /dev/null
+++ b/admin/tmpl/placeholders/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Placeholders\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=placeholders&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="placeholderList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/power/default.php b/admin/tmpl/power/default.php
index e272e3550..68da66089 100644
--- a/admin/tmpl/power/default.php
+++ b/admin/tmpl/power/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('power.code_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/power/modal.php b/admin/tmpl/power/modal.php
new file mode 100644
index 000000000..1a4ed8f62
--- /dev/null
+++ b/admin/tmpl/power/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Power\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/powers/default_body.php b/admin/tmpl/powers/default_body.php
index 15d2ef81a..cec7449e4 100644
--- a/admin/tmpl/powers/default_body.php
+++ b/admin/tmpl/powers/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=powers&task=power.edit";
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('power.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('power.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=powers&task=power.edit";
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('power.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('power.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=powers&task=power.edit";
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('power.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('power.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'powers.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $this->escape($item->system_name); ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $this->escape($item->system_name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.power"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->system_name, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $this->escape($item->system_name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?><br /><small>GUID: 
 			<?php echo $this->escape($item->guid); ?><?php if(isset($item->super_power_key)): ?><br />SPK: <?php echo $item->super_power_key; ?><?php endif; ?></small>
 			</div>
@@ -86,7 +102,7 @@ $edit = "index.php?option=com_componentbuilder&view=powers&task=power.edit";
 		<td class="hidden-phone">
 			<div><?php echo Text::_('COM_COMPONENTBUILDER_TYPE'); ?>: 
 			<?php echo Text::_($item->type); ?><?php if (ComponentbuilderHelper::validGUID($item->extends)) : ?><br /><?php echo Text::_('COM_COMPONENTBUILDER_EXTENDS'); ?>: 
-			<?php if ($this->user->authorise('power.edit', 'com_componentbuilder.power.' . (int) $item->extends_id)): ?>
+			<?php if (!$this->isModal && $this->user->authorise('power.edit', 'com_componentbuilder.power.' . (int) $item->extends_id)): ?>
 				<a href="index.php?option=com_componentbuilder&view=powers&task=power.edit&id=<?php echo $item->extends_id; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->extends_name); ?></a>
 			<?php else: ?>
 				<?php echo $this->escape($item->extends_name); ?>
@@ -99,7 +115,7 @@ $edit = "index.php?option=com_componentbuilder&view=powers&task=power.edit";
 			<?php echo $this->escape($item->power_version); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('power.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('power.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'powers.', true, 'cb'); ?>
diff --git a/admin/tmpl/powers/default_head.php b/admin/tmpl/powers/default_head.php
index dd63ae021..d8c5cd079 100644
--- a/admin/tmpl/powers/default_head.php
+++ b/admin/tmpl/powers/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
@@ -33,13 +33,13 @@ defined('_JEXEC') or die;
 		</th>
 	<?php endif; ?>
 	<th class="nowrap" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_POWER_SYSTEM_NAME_LABEL', 'a.system_name', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_POWERS_NAME', 'a.system_name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_POWER_NAMESPACE_LABEL', 'a.namespace', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_POWER_TYPE_LABEL', 'a.type', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_POWERS_DETAILS', 'a.type', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_POWER_POWER_VERSION_LABEL', 'a.power_version', $this->listDirn, $this->listOrder); ?>
diff --git a/admin/tmpl/powers/modal.php b/admin/tmpl/powers/modal.php
new file mode 100644
index 000000000..dea0f96d0
--- /dev/null
+++ b/admin/tmpl/powers/modal.php
@@ -0,0 +1,111 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Powers\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=powers&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="powerList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// powers footer script
+
+	// get page body
+	var outerBodyDiv = document.querySelector('body');
+
+	// start loading spinner
+	var loadingDiv = document.createElement('div');
+	loadingDiv.id = 'loading';
+
+	// Set CSS properties individually
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
+	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
+	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
+	loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
+	loadingDiv.style.position = 'fixed';
+	loadingDiv.style.opacity = '0.80';
+	loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	loadingDiv.style.filter = "alpha(opacity=80)";
+	loadingDiv.style.display = 'none';
+
+	// add to page body
+	outerBodyDiv.appendChild(loadingDiv);
+// when the build button is clicked
+jQuery('#toolbar').on('click',"button.custom-button-initpowers", function(e){
+	loadingDiv.style.display = 'block';
+});
+jQuery('#toolbar').on('click',"button.custom-button-resetpowers", function(e){
+	loadingDiv.style.display = 'block';
+});
+// Function to auto-scroll to the right for all code blocks
+function scrollToRight() {
+    document.querySelectorAll(".namespace-code-container").forEach(codeBlock => {
+        codeBlock.scrollLeft = codeBlock.scrollWidth;
+    });
+}
+
+// Auto-scroll all code blocks on page load
+document.addEventListener("DOMContentLoaded", scrollToRight);
+
+// Also ensure clicking inside keeps it scrolled to the right
+document.querySelectorAll(".namespace-code-container").forEach(codeBlock => {
+    codeBlock.addEventListener("focus", function () {
+        this.scrollLeft = this.scrollWidth;
+    });
+});
+</script>
diff --git a/admin/tmpl/repositories/default_body.php b/admin/tmpl/repositories/default_body.php
index 2a56dd0a7..71cb0d7d0 100644
--- a/admin/tmpl/repositories/default_body.php
+++ b/admin/tmpl/repositories/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=repositories&task=repository
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('repository.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('repository.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=repositories&task=repository
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('repository.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('repository.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=repositories&task=repository
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('repository.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('repository.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'repositories.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.repository"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -93,7 +109,7 @@ $edit = "index.php?option=com_componentbuilder&view=repositories&task=repository
 			<?php echo $this->escape($item->base); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('repository.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('repository.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'repositories.', true, 'cb'); ?>
diff --git a/admin/tmpl/repositories/default_head.php b/admin/tmpl/repositories/default_head.php
index 936cd7670..0baa9c4f8 100644
--- a/admin/tmpl/repositories/default_head.php
+++ b/admin/tmpl/repositories/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/repositories/modal.php b/admin/tmpl/repositories/modal.php
new file mode 100644
index 000000000..d66ab1f4b
--- /dev/null
+++ b/admin/tmpl/repositories/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Repositories\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=repositories&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="repositoryList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/repository/default.php b/admin/tmpl/repository/default.php
index 011cdece6..968f002dd 100644
--- a/admin/tmpl/repository/default.php
+++ b/admin/tmpl/repository/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('repository.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/repository/modal.php b/admin/tmpl/repository/modal.php
new file mode 100644
index 000000000..b97ce8874
--- /dev/null
+++ b/admin/tmpl/repository/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Repository\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/server/default.php b/admin/tmpl/server/default.php
index 108aa2a2a..81e97ca6f 100644
--- a/admin/tmpl/server/default.php
+++ b/admin/tmpl/server/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('server.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/server/modal.php b/admin/tmpl/server/modal.php
new file mode 100644
index 000000000..24f7daad4
--- /dev/null
+++ b/admin/tmpl/server/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Server\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/servers/default_body.php b/admin/tmpl/servers/default_body.php
index 1b27e0d86..a49ccd279 100644
--- a/admin/tmpl/servers/default_body.php
+++ b/admin/tmpl/servers/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=servers&task=server.edit";
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('server.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('server.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=servers&task=server.edit";
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('server.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('server.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=servers&task=server.edit";
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('server.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('server.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'servers.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.server"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -81,7 +97,7 @@ $edit = "index.php?option=com_componentbuilder&view=servers&task=server.edit";
 			<?php echo Text::_($item->protocol); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('server.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('server.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'servers.', true, 'cb'); ?>
diff --git a/admin/tmpl/servers/default_head.php b/admin/tmpl/servers/default_head.php
index 27705f992..4317c0d77 100644
--- a/admin/tmpl/servers/default_head.php
+++ b/admin/tmpl/servers/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/servers/modal.php b/admin/tmpl/servers/modal.php
new file mode 100644
index 000000000..493b7e4c8
--- /dev/null
+++ b/admin/tmpl/servers/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Servers\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=servers&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="serverList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/site_view/default.php b/admin/tmpl/site_view/default.php
index f722e4e80..8f5d1e947 100644
--- a/admin/tmpl/site_view/default.php
+++ b/admin/tmpl/site_view/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('site_view.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/site_view/modal.php b/admin/tmpl/site_view/modal.php
new file mode 100644
index 000000000..2dfe68531
--- /dev/null
+++ b/admin/tmpl/site_view/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Site_view\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/site_views/default_body.php b/admin/tmpl/site_views/default_body.php
index f18c350da..81b6ef16e 100644
--- a/admin/tmpl/site_views/default_body.php
+++ b/admin/tmpl/site_views/default_body.php
@@ -32,7 +32,7 @@ $edit = "index.php?option=com_componentbuilder&view=site_views&task=site_view.ed
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('core.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -52,7 +52,7 @@ $edit = "index.php?option=com_componentbuilder&view=site_views&task=site_view.ed
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('core.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -68,13 +68,29 @@ $edit = "index.php?option=com_componentbuilder&view=site_views&task=site_view.ed
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('core.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'site_views.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->system_name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->system_name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.site_view"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->system_name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->system_name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -102,7 +118,7 @@ $edit = "index.php?option=com_componentbuilder&view=site_views&task=site_view.ed
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $item->main_get_id)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $item->main_get_id)): ?>
 					<a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->main_get_id; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->main_get_name); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->main_get_name); ?>
@@ -110,7 +126,7 @@ $edit = "index.php?option=com_componentbuilder&view=site_views&task=site_view.ed
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('core.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'site_views.', true, 'cb'); ?>
diff --git a/admin/tmpl/site_views/default_head.php b/admin/tmpl/site_views/default_head.php
index 66f16a2ab..7c95fe6b6 100644
--- a/admin/tmpl/site_views/default_head.php
+++ b/admin/tmpl/site_views/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
@@ -36,10 +36,10 @@ defined('_JEXEC') or die;
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_SITE_VIEW_SYSTEM_NAME_LABEL', 'a.system_name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_SITE_VIEW_NAME_LABEL', 'a.name', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_SITE_VIEWS_NAMES', 'a.name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_SITE_VIEW_DESCRIPTION_LABEL', 'a.description', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_SITE_VIEWS_DETAILS', 'a.description', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap" >
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL', 'g.name', $this->listDirn, $this->listOrder); ?>
diff --git a/admin/tmpl/site_views/modal.php b/admin/tmpl/site_views/modal.php
new file mode 100644
index 000000000..b1ae8539c
--- /dev/null
+++ b/admin/tmpl/site_views/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Site_views\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=site_views&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="site_viewList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/snippet/default.php b/admin/tmpl/snippet/default.php
index 474ed8915..2ca439eb8 100644
--- a/admin/tmpl/snippet/default.php
+++ b/admin/tmpl/snippet/default.php
@@ -25,9 +25,12 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <div id="componentbuilder_loader">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('snippet.details_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/snippet/modal.php b/admin/tmpl/snippet/modal.php
new file mode 100644
index 000000000..666c38815
--- /dev/null
+++ b/admin/tmpl/snippet/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Snippet\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/snippet_type/default.php b/admin/tmpl/snippet_type/default.php
index 1c05bb81d..72469540d 100644
--- a/admin/tmpl/snippet_type/default.php
+++ b/admin/tmpl/snippet_type/default.php
@@ -24,6 +24,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -41,7 +44,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="main-card">
 
diff --git a/admin/tmpl/snippet_type/modal.php b/admin/tmpl/snippet_type/modal.php
new file mode 100644
index 000000000..c8742923c
--- /dev/null
+++ b/admin/tmpl/snippet_type/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Snippet_type\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/snippet_types/default_body.php b/admin/tmpl/snippet_types/default_body.php
index 2cbb74475..35200e9b3 100644
--- a/admin/tmpl/snippet_types/default_body.php
+++ b/admin/tmpl/snippet_types/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=snippet_types&task=snippet_t
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('snippet_type.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('snippet_type.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=snippet_types&task=snippet_t
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('snippet_type.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('snippet_type.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=snippet_types&task=snippet_t
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('snippet_type.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('snippet_type.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'snippet_types.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.snippet_type"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -81,7 +97,7 @@ $edit = "index.php?option=com_componentbuilder&view=snippet_types&task=snippet_t
 			<?php echo $this->escape($item->description); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('snippet_type.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('snippet_type.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'snippet_types.', true, 'cb'); ?>
diff --git a/admin/tmpl/snippet_types/default_head.php b/admin/tmpl/snippet_types/default_head.php
index 89a7db645..093b77060 100644
--- a/admin/tmpl/snippet_types/default_head.php
+++ b/admin/tmpl/snippet_types/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/snippet_types/modal.php b/admin/tmpl/snippet_types/modal.php
new file mode 100644
index 000000000..4f98fef68
--- /dev/null
+++ b/admin/tmpl/snippet_types/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Snippet_types\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=snippet_types&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="snippet_typeList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/snippets/default_body.php b/admin/tmpl/snippets/default_body.php
index df2e600d7..e03073a1f 100644
--- a/admin/tmpl/snippets/default_body.php
+++ b/admin/tmpl/snippets/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=snippets&task=snippet.edit";
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('core.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=snippets&task=snippet.edit";
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('core.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=snippets&task=snippet.edit";
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('core.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'snippets.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.snippet"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -88,7 +104,7 @@ $edit = "index.php?option=com_componentbuilder&view=snippets&task=snippet.edit";
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('library.edit', 'com_componentbuilder.library.' . (int) $item->library_id)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('library.edit', 'com_componentbuilder.library.' . (int) $item->library_id)): ?>
 					<a href="index.php?option=com_componentbuilder&view=libraries&task=library.edit&id=<?php echo $item->library_id; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->library_name); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->library_name); ?>
@@ -96,7 +112,7 @@ $edit = "index.php?option=com_componentbuilder&view=snippets&task=snippet.edit";
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('core.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'snippets.', true, 'cb'); ?>
diff --git a/admin/tmpl/snippets/default_head.php b/admin/tmpl/snippets/default_head.php
index 2b4d52329..1e8536ebf 100644
--- a/admin/tmpl/snippets/default_head.php
+++ b/admin/tmpl/snippets/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/snippets/modal.php b/admin/tmpl/snippets/modal.php
new file mode 100644
index 000000000..c0625db09
--- /dev/null
+++ b/admin/tmpl/snippets/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Snippets\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=snippets&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="snippetList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/admin/tmpl/template/default.php b/admin/tmpl/template/default.php
index 908187645..b9caebb59 100644
--- a/admin/tmpl/template/default.php
+++ b/admin/tmpl/template/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="main-card">
 <div class="row">
diff --git a/admin/tmpl/template/modal.php b/admin/tmpl/template/modal.php
new file mode 100644
index 000000000..f3405f031
--- /dev/null
+++ b/admin/tmpl/template/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Template\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/templates/default_body.php b/admin/tmpl/templates/default_body.php
index 03aa254cd..fe8ce8a7c 100644
--- a/admin/tmpl/templates/default_body.php
+++ b/admin/tmpl/templates/default_body.php
@@ -32,7 +32,7 @@ $edit = "index.php?option=com_componentbuilder&view=templates&task=template.edit
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('core.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -52,7 +52,7 @@ $edit = "index.php?option=com_componentbuilder&view=templates&task=template.edit
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('core.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -68,13 +68,29 @@ $edit = "index.php?option=com_componentbuilder&view=templates&task=template.edit
 		</td>
 		<td class="nowrap">
 			<div>
-			<?php if ($canDo->get('core.edit')): ?>
+			<?php if (!$this->isModal && $canDo->get('core.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 				<?php if ($item->checked_out): ?>
 					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'templates.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
-				<?php echo $this->escape($item->name); ?>
+				<?php if (!$this->isModal): ?>
+					<?php echo $this->escape($item->name); ?>
+				<?php else: ?>
+					<?php
+						$link = "{$edit}&id={$item->id}";
+						$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+						$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+						$attribs = 'data-content-select data-content-type="com_componentbuilder.template"'
+							. ' data-id="' . $dataId . '"'
+							. ' data-title="' . $this->escape($item->name, false) . '"'
+							. ' data-uri="' . $this->escape($link, false) . '"'
+							. ' data-html="' . $this->escape($itemHtml, false) . '"';
+					?>
+					<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+						<?php echo $this->escape($item->name); ?>
+					</a>
+				<?php endif; ?>
 			<?php endif; ?><br />
 	<code>&lt;?php echo $this->loadTemplate('<?php echo StringHelper::safe($item->alias); ?>'); ?&gt;</code>
 			</div>
@@ -90,7 +106,7 @@ $edit = "index.php?option=com_componentbuilder&view=templates&task=template.edit
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $item->dynamic_get_id)): ?>
+				<?php if (!$this->isModal && $this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $item->dynamic_get_id)): ?>
 					<a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->dynamic_get_id; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->dynamic_get_name); ?></a>
 				<?php else: ?>
 					<?php echo $this->escape($item->dynamic_get_name); ?>
@@ -98,7 +114,7 @@ $edit = "index.php?option=com_componentbuilder&view=templates&task=template.edit
 			</div>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('core.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('core.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'templates.', true, 'cb'); ?>
diff --git a/admin/tmpl/templates/default_head.php b/admin/tmpl/templates/default_head.php
index 3089eb2ed..4e2185db6 100644
--- a/admin/tmpl/templates/default_head.php
+++ b/admin/tmpl/templates/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
@@ -33,10 +33,10 @@ defined('_JEXEC') or die;
 		</th>
 	<?php endif; ?>
 	<th class="nowrap" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_TEMPLATE_NAME_LABEL', 'a.name', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_TEMPLATES_NAMES', 'a.name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_LABEL', 'a.description', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_TEMPLATES_DETAILS', 'a.description', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap" >
 			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_GET_LABEL', 'g.name', $this->listDirn, $this->listOrder); ?>
diff --git a/admin/tmpl/templates/modal.php b/admin/tmpl/templates/modal.php
new file mode 100644
index 000000000..a554ed887
--- /dev/null
+++ b/admin/tmpl/templates/modal.php
@@ -0,0 +1,88 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Templates\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=templates&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="templateList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
+<script type="text/javascript">
+// templates footer script
+
+HTMLElement.prototype.selText = function() {
+    var obj = this;
+
+    // For modern browsers, handle the selection
+    var selection = window.getSelection();
+    var range = document.createRange();
+
+    // Select the content of the element
+    range.selectNodeContents(obj);
+    selection.removeAllRanges();  // Clear any previous selections
+    selection.addRange(range);    // Add the new selection range
+
+    return this;
+};
+// make sure the code bocks are active
+document.querySelectorAll("code").forEach(function(codeBlock) {
+    codeBlock.addEventListener("click", function() {
+        codeBlock.selText(); // Call the custom selText function
+        codeBlock.classList.add("selected"); // Add the "selected" class
+    });
+});
+</script>
diff --git a/admin/tmpl/validation_rule/default.php b/admin/tmpl/validation_rule/default.php
index 00f311ec4..459dc6361 100644
--- a/admin/tmpl/validation_rule/default.php
+++ b/admin/tmpl/validation_rule/default.php
@@ -25,6 +25,9 @@ Html::_('bootstrap.tooltip');
 // No direct access to this file
 defined('_JEXEC') or die;
 
+$layout  = $this->isModal ? 'modal' : 'edit';
+$tmpl    = $this->input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <script type="text/javascript">
 	// waiting spinner
@@ -42,7 +45,7 @@ defined('_JEXEC') or die;
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&&layout=' . $layout . $tmpl . '&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <?php echo LayoutHelper::render('validation_rule.extends_formrule_above', $this); ?>
 <div class="main-card">
diff --git a/admin/tmpl/validation_rule/modal.php b/admin/tmpl/validation_rule/modal.php
new file mode 100644
index 000000000..5a08ae301
--- /dev/null
+++ b/admin/tmpl/validation_rule/modal.php
@@ -0,0 +1,23 @@
+<?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;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Validation_rule\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/admin/tmpl/validation_rules/default_body.php b/admin/tmpl/validation_rules/default_body.php
index 287f5a548..d428e3d46 100644
--- a/admin/tmpl/validation_rules/default_body.php
+++ b/admin/tmpl/validation_rules/default_body.php
@@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=validation_rules&task=valida
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
 		<td class="order nowrap center hidden-phone">
-		<?php if ($canDo->get('validation_rule.edit.state')): ?>
+		<?php if (!$this->isModal && $canDo->get('validation_rule.edit.state')): ?>
 			<?php
 				$iconClass = '';
 				if (!$this->saveOrder)
@@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=validation_rules&task=valida
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center">
-		<?php if ($canDo->get('validation_rule.edit')): ?>
+		<?php if (!$this->isModal && $canDo->get('validation_rule.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('grid.id', $i, $item->id); ?>
@@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=validation_rules&task=valida
 		</td>
 		<td class="nowrap">
 			<div class="name">
-				<?php if ($canDo->get('validation_rule.edit')): ?>
+				<?php if (!$this->isModal && $canDo->get('validation_rule.edit')): ?>
 					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'validation_rules.', $canCheckin); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo $this->escape($item->name); ?>
+					<?php if (!$this->isModal): ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php else: ?>
+						<?php
+							$link = "{$edit}&id={$item->id}";
+							$dataId = $item->{$this->getModalTitleKey()} ?? 0;
+							$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->name, false) . '</a>';
+							$attribs = 'data-content-select data-content-type="com_componentbuilder.validation_rule"'
+								. ' data-id="' . $dataId . '"'
+								. ' data-title="' . $this->escape($item->name, false) . '"'
+								. ' data-uri="' . $this->escape($link, false) . '"'
+								. ' data-html="' . $this->escape($itemHtml, false) . '"';
+						?>
+						<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+							<?php echo $this->escape($item->name); ?>
+						</a>
+					<?php endif; ?>
 				<?php endif; ?>
 			</div>
 		</td>
@@ -81,7 +97,7 @@ $edit = "index.php?option=com_componentbuilder&view=validation_rules&task=valida
 			<?php echo $this->escape($item->short_description); ?>
 		</td>
 		<td class="center">
-		<?php if ($canDo->get('validation_rule.edit.state')) : ?>
+		<?php if (!$this->isModal && $canDo->get('validation_rule.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
 						<?php echo Html::_('jgrid.published', $item->published, $i, 'validation_rules.', true, 'cb'); ?>
diff --git a/admin/tmpl/validation_rules/default_head.php b/admin/tmpl/validation_rules/default_head.php
index fb33061b8..8a9d29c8c 100644
--- a/admin/tmpl/validation_rules/default_head.php
+++ b/admin/tmpl/validation_rules/default_head.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 
 ?>
 <tr>
-	<?php if ($this->canEdit&& $this->canState): ?>
+	<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
 			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
diff --git a/admin/tmpl/validation_rules/modal.php b/admin/tmpl/validation_rules/modal.php
new file mode 100644
index 000000000..ebbb69088
--- /dev/null
+++ b/admin/tmpl/validation_rules/modal.php
@@ -0,0 +1,63 @@
+<?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
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Validation_rules\HtmlView $this */
+
+$app = Factory::getApplication();
+
+if ($app->isClient('site')) {
+    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
+}
+
+// dynamic selection of title key (link in modal)
+$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('core')
+    ->useScript('multiselect')
+    ->useScript('modal-content-select');
+?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=validation_rules&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+<?php
+	// Add the trash helper layout
+	echo LayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
+<?php if (empty($this->items)): ?>
+	<div class="alert alert-no-items">
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<table class="table table-striped" id="validation_ruleList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo Html::_('form.token'); ?>
+</form>
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 861a2930d..e71a65506 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="5.0" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>4th March, 2025</creationDate>
+	<creationDate>28th March, 2025</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>5.1.1-alpha1</version>
+	<version>5.1.1-alpha2</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.5.1.1-alpha1)</h1>
+		<h1>Component Builder (v.5.1.1-alpha2)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 
@@ -111,6 +111,6 @@ Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/compo
 
 	</administration>
 	<updateservers>
-		<server type="extension" enabled="1" element="com_componentbuilder" name="Component Builder">https://git.vdm.dev/joomla/Component-Builder/raw/branch/5.x/componentbuilder_update_server.xml</server>
+		<server type="extension" enabled="1" element="com_componentbuilder" name="Component Builder">https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/refs/heads/5.x/componentbuilder_update_server.xml</server>
 	</updateservers>
 </extension>
\ No newline at end of file
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index 84b2d536a..667253e5b 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -8,7 +8,7 @@
 		<version>3.2.5</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.5.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/pkg-component-builder/archive/refs/tags/v3.2.5.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -26,7 +26,7 @@
 		<version>4.1.0</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v4.1.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/pkg-component-builder/archive/refs/tags/v4.1.0.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -44,7 +44,7 @@
 		<version>5.0.0</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/pkg-component-builder/archive/refs/tags/v5.0.0.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -62,7 +62,7 @@
 		<version>5.0.1</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/pkg-component-builder/archive/refs/tags/v5.0.1.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -80,7 +80,7 @@
 		<version>5.0.2</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.2.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/pkg-component-builder/archive/refs/tags/v5.0.2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -98,7 +98,7 @@
 		<version>5.0.3</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.3.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/pkg-component-builder/archive/refs/tags/v5.0.3.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -116,7 +116,7 @@
 		<version>5.1.0</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.1.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/pkg-component-builder/archive/refs/tags/v5.1.0.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -131,10 +131,28 @@
 		<element>pkg_component_builder</element>
 		<type>package</type>
 		<client>site</client>
-		<version>5.1.1-alpha1</version>
+		<version>5.1.1-alpha</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.1.1-alpha1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/pkg-component-builder/archive/refs/tags/v5.1.1-alpha1.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>alpha</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>https://dev.vdm.io</maintainerurl>
+		<targetplatform name="joomla" version="5\.[012]"/>
+	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>pkg_component_builder</element>
+		<type>package</type>
+		<client>site</client>
+		<version>5.1.1-alpha2</version>
+		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/pkg-component-builder/archive/refs/tags/v5.1.1-alpha2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>alpha</tag>
diff --git a/images/vdm/icon/city.png b/images/vdm/icon/city.png
new file mode 100644
index 000000000..231a966f4
Binary files /dev/null and b/images/vdm/icon/city.png differ
diff --git a/images/vdm/icon/country.png b/images/vdm/icon/country.png
new file mode 100644
index 000000000..405798714
Binary files /dev/null and b/images/vdm/icon/country.png differ
diff --git a/images/vdm/icon/region.png b/images/vdm/icon/region.png
new file mode 100644
index 000000000..be2456b09
Binary files /dev/null and b/images/vdm/icon/region.png differ
diff --git a/images/vdm/icon/state.png b/images/vdm/icon/state.png
new file mode 100644
index 000000000..04092f6ce
Binary files /dev/null and b/images/vdm/icon/state.png differ
diff --git a/images/vdm/icon/subregion.png b/images/vdm/icon/subregion.png
new file mode 100644
index 000000000..5cb54f9f6
Binary files /dev/null and b/images/vdm/icon/subregion.png differ
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Adminview/Data.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Adminview/Data.php
index 1ef14ef0a..3b6730236 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Adminview/Data.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Adminview/Data.php
@@ -315,6 +315,11 @@ class Data
 	 */
 	public function get($view): ?object
 	{
+		if (empty($view))
+		{
+			return null;
+		}
+
 		if (isset($this->index[$view]))
 		{
 			$id = $this->index[$view];
@@ -478,6 +483,13 @@ class Data
 				'jcb_ce_onBeforeModelViewData', [&$view]
 			);
 
+			// should we add sql?
+			if ($view->add_sql !== 1)
+			{
+				unset($view->addtables);
+				unset($view->sql);
+			}
+
 			// add the tables
 			$view->addtables = (isset($view->addtables) && JsonHelper::check($view->addtables))
 				? json_decode((string) $view->addtables, true)
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Component/Structuresingle.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Component/Structuresingle.php
index 3e88c3ad6..ffff5527f 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Component/Structuresingle.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Component/Structuresingle.php
@@ -397,7 +397,7 @@ final class Structuresingle
 			return false;
 		}
 		// take action based on type
-		elseif ($details->type === 'file' && !File::exists($this->currentFullPath))
+		elseif ($details->type === 'file' && !is_file($this->currentFullPath))
 		{
 			$this->app->enqueueMessage(
 				Text::_('COM_COMPONENTBUILDER_HR_HTHREEFILE_PATH_ERRORHTHREE'), 'Error'
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/Builders.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/Builders.php
index 55c7fa32f..980a185e3 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/Builders.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/Builders.php
@@ -689,6 +689,8 @@ final class Builders
 			// to identify the field
 			$this->databasetables->set($nameSingleCode . '.' . $name . '.ID',
 				$field['settings']->id);
+			$this->databasetables->set($nameSingleCode . '.' . $name . '.GUID',
+				$field['settings']->guid);
 			$this->databasetables->set($nameSingleCode . '.' . $name . '.null_switch',
 				$field['settings']->null_switch);
 			// set index types
@@ -912,6 +914,7 @@ final class Builders
 			&& $typeName != 'repeatable'
 			&& $typeName != 'subform')
 		{
+			// do not add if extends is empty
 			$this->customfield->add($nameListCode, [
 				'type'   => $typeName,
 				'code'   => $name,
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldDynamic.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldDynamic.php
index 5e18e05c4..d23ad4d56 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldDynamic.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldDynamic.php
@@ -15,6 +15,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Creator;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Name;
 use VDM\Joomla\Componentbuilder\Compiler\Field\TypeName;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Attributes;
+use VDM\Joomla\Componentbuilder\Compiler\Field\ModalSelect;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Groups;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\FieldNames;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Creator\Fieldtypeinterface as Field;
@@ -56,6 +57,14 @@ final class FieldDynamic implements Fielddynamicinterface
 	 */
 	protected Attributes $attributes;
 
+	/**
+	 * The ModalSelect Class.
+	 *
+	 * @var   ModalSelect
+	 * @since 5.2.1
+	 */
+	protected ModalSelect $modalselect;
+
 	/**
 	 * The Groups Class.
 	 *
@@ -102,6 +111,7 @@ final class FieldDynamic implements Fielddynamicinterface
 	 * @param Name         $name         The Name Class.
 	 * @param TypeName     $typename     The TypeName Class.
 	 * @param Attributes   $attributes   The Attributes Class.
+	 * @param ModalSelect  $modalselect  The ModalSelect Class.
 	 * @param Groups       $groups       The Groups Class.
 	 * @param FieldNames   $fieldnames   The FieldNames Class.
 	 * @param Field        $field        The Fieldtypeinterface Class.
@@ -111,12 +121,14 @@ final class FieldDynamic implements Fielddynamicinterface
 	 * @since 3.2.0
 	 */
 	public function __construct(Name $name, TypeName $typename,
-		Attributes $attributes, Groups $groups, FieldNames $fieldnames,
+		Attributes $attributes, ModalSelect $modalselect,
+		Groups $groups, FieldNames $fieldnames,
 		Field $field, Builders $builders, Layout $layout)
 	{
 		$this->name = $name;
 		$this->typename = $typename;
 		$this->attributes = $attributes;
+		$this->modalselect = $modalselect;
 		$this->groups = $groups;
 		$this->fieldnames = $fieldnames;
 		$this->field = $field;
@@ -172,6 +184,12 @@ final class FieldDynamic implements Fielddynamicinterface
 				// set options as null
 				$optionArray = null;
 
+				// special treatment for Modal Select
+				if ($typeName === 'ModalSelect')
+				{
+					$fieldAttributes['custom'] = $this->modalselect->extract($fieldAttributes);
+				}
+
 				if ($this->groups->check($typeName, 'option'))
 				{
 					// set options array
@@ -253,6 +271,7 @@ final class FieldDynamic implements Fielddynamicinterface
 					// set the custom array
 					$custom = $fieldAttributes['custom'];
 					unset($fieldAttributes['custom']);
+
 					// set db key
 					$custom['db'] = $dbkey;
 					// increment the db key
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldString.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldString.php
index a48bdcae3..97ff74a4c 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldString.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldString.php
@@ -19,6 +19,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Field\Groups;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Name;
 use VDM\Joomla\Componentbuilder\Compiler\Field\TypeName;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Attributes;
+use VDM\Joomla\Componentbuilder\Compiler\Field\ModalSelect;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\CustomFieldTypeFile;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
 use VDM\Joomla\Utilities\ArrayHelper;
@@ -94,6 +95,14 @@ final class FieldString implements Fieldtypeinterface
 	 */
 	protected Attributes $attributes;
 
+	/**
+	 * The ModalSelect Class.
+	 *
+	 * @var   ModalSelect
+	 * @since 5.2.1
+	 */
+	protected ModalSelect $modalselect;
+
 	/**
 	 * The CustomFieldTypeFile Class.
 	 *
@@ -120,6 +129,7 @@ final class FieldString implements Fieldtypeinterface
 	 * @param Name                  $name                  The Name Class.
 	 * @param TypeName              $typename              The TypeName Class.
 	 * @param Attributes            $attributes            The Attributes Class.
+	 * @param ModalSelect           $modalselect           The ModalSelect Class.
 	 * @param CustomFieldTypeFile   $customfieldtypefile   The CustomFieldTypeFile Class.
 	 * @param Counter               $counter               The Counter Class.
 	 *
@@ -127,7 +137,7 @@ final class FieldString implements Fieldtypeinterface
 	 */
 	public function __construct(Config $config, Language $language, Field $field,
 		Groups $groups, Name $name, TypeName $typename,
-		Attributes $attributes,
+		Attributes $attributes, ModalSelect $modalselect,
 		CustomFieldTypeFile $customfieldtypefile,
 		Counter $counter)
 	{
@@ -138,6 +148,7 @@ final class FieldString implements Fieldtypeinterface
 		$this->name = $name;
 		$this->typename = $typename;
 		$this->attributes = $attributes;
+		$this->modalselect = $modalselect;
 		$this->customfieldtypefile = $customfieldtypefile;
 		$this->counter = $counter;
 	}
@@ -591,6 +602,13 @@ final class FieldString implements Fieldtypeinterface
 							{
 								//reset options array
 								$r_optionArray = array();
+
+								// special treatment for Modal Select
+								if ($r_typeName === 'ModalSelect')
+								{
+									$r_fieldValues['custom'] = $this->modalselect->extract($r_fieldValues);
+								}
+
 								if ($this->groups->check(
 									$r_typeName, 'option'
 								))
@@ -740,7 +758,7 @@ final class FieldString implements Fieldtypeinterface
 							$fieldData['settings']
 						))
 						{
-							$r_name      = $this->name->get(
+							$r_name = $this->name->get(
 								$fieldData, $nameListCode, $_resolverKey
 							);
 							$r_typeName  = $this->typename->get($fieldData);
@@ -763,6 +781,13 @@ final class FieldString implements Fieldtypeinterface
 							{
 								//reset options array
 								$r_optionArray = array();
+
+								// special treatment for Modal Select
+								if ($r_typeName === 'ModalSelect')
+								{
+									$r_fieldValues['custom'] = $this->modalselect->extract($r_fieldValues);
+								}
+
 								if ($this->groups->check(
 									$r_typeName, 'option'
 								))
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldXML.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldXML.php
index 0c7da8818..8c90eb7d1 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldXML.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/FieldXML.php
@@ -19,6 +19,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Field\Groups;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Name;
 use VDM\Joomla\Componentbuilder\Compiler\Field\TypeName;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Attributes;
+use VDM\Joomla\Componentbuilder\Compiler\Field\ModalSelect;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Xml;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\CustomFieldTypeFile;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
@@ -93,6 +94,14 @@ final class FieldXML implements Fieldtypeinterface
 	 */
 	protected Attributes $attributes;
 
+	/**
+	 * The ModalSelect Class.
+	 *
+	 * @var   ModalSelect
+	 * @since 5.2.1
+	 */
+	protected ModalSelect $modalselect;
+
 	/**
 	 * The Xml Class.
 	 *
@@ -127,6 +136,7 @@ final class FieldXML implements Fieldtypeinterface
 	 * @param Name                  $name                  The Name Class.
 	 * @param TypeName              $typename              The TypeName Class.
 	 * @param Attributes            $attributes            The Attributes Class.
+	 * @param ModalSelect           $modalselect           The ModalSelect Class.
 	 * @param Xml                   $xml                   The Xml Class.
 	 * @param CustomFieldTypeFile   $customfieldtypefile   The CustomFieldTypeFile Class.
 	 * @param Counter               $counter               The Counter Class.
@@ -135,8 +145,8 @@ final class FieldXML implements Fieldtypeinterface
 	 */
 	public function __construct(Config $config, Language $language, Field $field,
 		Groups $groups, Name $name, TypeName $typename,
-		Attributes $attributes, Xml $xml,
-		CustomFieldTypeFile $customfieldtypefile,
+		Attributes $attributes, ModalSelect $modalselect,
+		Xml $xml, CustomFieldTypeFile $customfieldtypefile,
 		Counter $counter)
 	{
 		$this->config = $config;
@@ -146,6 +156,7 @@ final class FieldXML implements Fieldtypeinterface
 		$this->name = $name;
 		$this->typename = $typename;
 		$this->attributes = $attributes;
+		$this->modalselect = $modalselect;
 		$this->xml = $xml;
 		$this->customfieldtypefile = $customfieldtypefile;
 		$this->counter = $counter;
@@ -571,6 +582,13 @@ final class FieldXML implements Fieldtypeinterface
 							{
 								//reset options array
 								$r_optionArray = array();
+
+								// special treatment for Modal Select
+								if ($r_typeName === 'ModalSelect')
+								{
+									$r_fieldValues['custom'] = $this->modalselect->extract($r_fieldValues);
+								}
+
 								if ($this->groups->check(
 									$r_typeName, 'option'
 								))
@@ -735,7 +753,7 @@ final class FieldXML implements Fieldtypeinterface
 								$fieldData['settings']
 							))
 							{
-								$r_name      = $this->name->get(
+								$r_name = $this->name->get(
 									$fieldData, $nameListCode, $_resolverKey
 								);
 								$r_typeName  = $this->typename->get($fieldData);
@@ -756,6 +774,13 @@ final class FieldXML implements Fieldtypeinterface
 								{
 									//reset options array
 									$r_optionArray = array();
+
+									// special treatment for Modal Select
+									if ($r_typeName === 'ModalSelect')
+									{
+										$r_fieldValues['custom'] = $this->modalselect->extract($r_fieldValues);
+									}
+
 									if ($this->groups->check(
 										$r_typeName, 'option'
 									))
@@ -763,11 +788,11 @@ final class FieldXML implements Fieldtypeinterface
 										// now add to the field set
 										$this->xml->append(
 											$form, $this->get(
-											'option', $r_fieldValues, $r_name,
-											$r_typeName, $langView,
-											$nameSingleCode, $nameListCode,
-											$placeholders, $r_optionArray
-										)
+												'option', $r_fieldValues, $r_name,
+												$r_typeName, $langView,
+												$nameSingleCode, $nameListCode,
+												$placeholders, $r_optionArray
+											)
 										);
 									}
 									elseif ($r_typeName === 'subform')
@@ -789,12 +814,12 @@ final class FieldXML implements Fieldtypeinterface
 											// now add to the field set
 											$this->xml->append(
 												$form, $this->get(
-												'special', $r_fieldValues,
-												$r_name, $r_typeName, $langView,
-												$nameSingleCode,
-												$nameListCode, $placeholders,
-												$r_optionArray
-											)
+													'special', $r_fieldValues,
+													$r_name, $r_typeName, $langView,
+													$nameSingleCode,
+													$nameListCode, $placeholders,
+													$r_optionArray
+												)
 											);
 										}
 
@@ -810,11 +835,11 @@ final class FieldXML implements Fieldtypeinterface
 										// now add to the field set
 										$this->xml->append(
 											$form, $this->get(
-											'custom', $r_fieldValues, $r_name,
-											$r_typeName, $langView,
-											$nameSingleCode, $nameListCode,
-											$placeholders, $r_optionArray
-										)
+												'custom', $r_fieldValues, $r_name,
+												$r_typeName, $langView,
+												$nameSingleCode, $nameListCode,
+												$placeholders, $r_optionArray
+											)
 										);
 										// set lang (just incase)
 										$r_listLangName = $langView . '_'
@@ -851,11 +876,11 @@ final class FieldXML implements Fieldtypeinterface
 										// now add to the field set
 										$this->xml->append(
 											$form, $this->get(
-											'plain', $r_fieldValues, $r_name,
-											$r_typeName, $langView,
-											$nameSingleCode, $nameListCode,
-											$placeholders, $r_optionArray
-										)
+												'plain', $r_fieldValues, $r_name,
+												$r_typeName, $langView,
+												$nameSingleCode, $nameListCode,
+												$placeholders, $r_optionArray
+											)
 										);
 									}
 								}
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/Data.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/Data.php
index c7a9559e7..85dc0a94e 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/Data.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/Data.php
@@ -151,6 +151,11 @@ class Data
 	 */
 	public function get($field, ?string $singleViewName = null, ?string $listViewName = null): ?object
 	{
+		if (empty($field))
+		{
+			return null;
+		}
+
 		if (isset($this->index[$field]))
 		{
 			$id = $this->index[$field];
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/ModalSelect.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/ModalSelect.php
new file mode 100644
index 000000000..b1bef028a
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/ModalSelect.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September, 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace VDM\Joomla\Componentbuilder\Compiler\Field;
+
+
+use VDM\Joomla\Componentbuilder\Compiler\Utilities\Structure;
+use VDM\Joomla\Componentbuilder\Compiler\Builder\ContentMulti;
+
+
+/**
+ * Compiler Field Modal Select
+ * 
+ * @since 5.2.1
+ */
+final class ModalSelect
+{
+	/**
+	 * The Structure Class.
+	 *
+	 * @var   Structure
+	 * @since 5.2.1
+	 */
+	protected Structure $structure;
+
+	/**
+	 * The ContentMulti Class.
+	 *
+	 * @var   ContentMulti
+	 * @since 5.2.1
+	 */
+	protected ContentMulti $contentmulti;
+
+	/**
+	 * The switch to ensure the fix is just added once
+	 *
+	 * @var    bool
+	 * @since 5.2.1
+	 */
+	protected bool $addedFix = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Structure      $structure      The Structure Class.
+	 * @param ContentMulti   $contentmulti   The ContentMulti Class.
+	 *
+	 * @since 5.2.1
+	 */
+	public function __construct(Structure $structure, ContentMulti $contentmulti)
+	{
+		$this->structure = $structure;
+		$this->contentmulti = $contentmulti;
+	}
+
+	/**
+	 * Extracts component and view details from field attributes for a Modal Select field.
+	 *
+	 * @param array  $fieldAttributes The field attributes containing URLs and SQL table details.
+	 *
+	 * @return array An associative array with extracted component, view, views, table, id, and text.
+	 * @since  5.1.2
+	 */
+	public function extract(array $fieldAttributes): array
+	{
+		$component = null;
+		$views = null;
+		$view = null;
+
+		// Extract parameters from the given URL
+		$extractParams = function ($url) {
+			if (empty($url)) {
+				return ['option' => null, 'view' => null];
+			}
+			$query = parse_url($url, PHP_URL_QUERY);
+			parse_str($query, $params);
+			return [
+				'option' => $params['option'] ?? $params['amp;option'] ?? null,
+				'view' => $params['view'] ?? $params['amp;view'] ?? null,
+			];
+		};
+
+		// Process URL attributes
+		foreach (['urlSelect', 'urlEdit', 'urlNew'] as $urlKey)
+		{
+			$params = $extractParams($fieldAttributes[$urlKey] ?? '');
+			$component ??= $params['option'];
+			if ($urlKey === 'urlSelect')
+			{
+				$views ??= $params['view'];
+			}
+			else
+			{
+				$view ??= $params['view'];
+			}
+		}
+
+		// Determine the target table and extract the view name
+		$field_target_table = $fieldAttributes['sql_title_table'] ?? '';
+		if (!$view && !empty($field_target_table))
+		{
+			$clean_table = str_replace('__', '', $field_target_table);
+			$view = substr($clean_table, strpos($clean_table, '_') + 1);
+		}
+
+		$sql_title_key = $fieldAttributes['sql_title_key'] ?? 'id';
+
+		// if one field is not id, we add an override to the ModalSelectField as a FIX
+		if (!$this->addedFix && $sql_title_key !== 'id')
+		{
+			$this->structure->build(
+				['admin' => 'fieldmodalselect_override'],
+				'fieldmodalselect_override'
+			);
+			$this->structure->build(
+				['site' => 'fieldmodalselect_override'],
+				'fieldmodalselect_override'
+			);
+			// to make sure the file is updated TODO
+			$this->contentmulti->set('fieldmodalselect_override|BLABLA', 'blabla');
+
+			$this->addedFix = true;
+		}
+
+		return [
+			'modal_select' => true,
+			'urlSelect' => $fieldAttributes['urlSelect'] ?? '',
+			'hint' => $fieldAttributes['hint'] ?? '',
+			'titleSelect' => $fieldAttributes['titleSelect'] ?? '',
+			'iconSelect' => $fieldAttributes['iconSelect'] ?? '',
+			'table' => $field_target_table,
+			'id' => $sql_title_key,
+			'text' => $fieldAttributes['sql_title_column'] ?? '',
+			'component' => $component ?? 'error',
+			'view' => $view ?? 'error',
+			'views' => $views ?? 'error',
+			'button' => false,
+			'extends' => ''
+		];
+	}
+}
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Compiler.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Compiler.php
index 5dff677e0..d9ed2f8cc 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Compiler.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Compiler.php
@@ -418,7 +418,7 @@ class Compiler extends Infusion
 			// first we do the static files
 			foreach (CFactory::_('Utilities.Files')->get('static') as $static)
 			{
-				if (File::exists($static['path']))
+				if (is_file($static['path']))
 				{
 					$this->setFileContent(
 						$static['name'], $static['path'], $bom
@@ -434,7 +434,7 @@ class Compiler extends Infusion
 					{
 						if ($file['view'] == $view)
 						{
-							if (File::exists($file['path']))
+							if (is_file($file['path']))
 							{
 								$this->setFileContent(
 									$file['name'], $file['path'], $bom,
@@ -513,7 +513,7 @@ class Compiler extends Infusion
 						// update the module files
 						foreach (CFactory::_('Utilities.Files')->get($module->key) as $module_file)
 						{
-							if (File::exists($module_file['path']))
+							if (is_file($module_file['path']))
 							{
 								$this->setFileContent(
 									$module_file['name'], $module_file['path'],
@@ -591,7 +591,7 @@ class Compiler extends Infusion
 						// update the plugin files
 						foreach (CFactory::_('Utilities.Files')->get($plugin->key) as $plugin_file)
 						{
-							if (File::exists($plugin_file['path']))
+							if (is_file($plugin_file['path']))
 							{
 								$this->setFileContent(
 									$plugin_file['name'], $plugin_file['path'],
@@ -625,7 +625,7 @@ class Compiler extends Infusion
 						// update the power files
 						foreach (CFactory::_('Utilities.Files')->get($power->key) as $power_file)
 						{
-							if (File::exists($power_file['path']))
+							if (is_file($power_file['path']))
 							{
 								$this->setFileContent(
 									$power_file['name'], $power_file['path'],
@@ -650,7 +650,7 @@ class Compiler extends Infusion
 						// update the power files
 						foreach (CFactory::_('Utilities.Files')->get($key) as $power_file)
 						{
-							if (File::exists($power_file['path']))
+							if (is_file($power_file['path']))
 							{
 								$this->setFileContent(
 									$power_file['name'], $power_file['path'],
@@ -775,7 +775,7 @@ class Compiler extends Infusion
 			$update_server_xml_path = CFactory::_('Utilities.Paths')->component_path . '/'
 				. $this->updateServerFileName . '.xml';
 			// make sure we have the correct file
-			if (File::exists($update_server_xml_path)
+			if (is_file($update_server_xml_path)
 				&& ($update_server = CFactory::_('Component')->get('update_server')) !== null)
 			{
 				// move to server
@@ -811,7 +811,7 @@ class Compiler extends Infusion
 					&& is_numeric($module->update_server)
 					&& $module->update_server > 0
 					&& isset($module->update_server_xml_path)
-					&& File::exists($module->update_server_xml_path)
+					&& is_file($module->update_server_xml_path)
 					&& isset($module->update_server_xml_file_name)
 					&& StringHelper::check(
 						$module->update_server_xml_file_name
@@ -852,7 +852,7 @@ class Compiler extends Infusion
 					&& is_numeric($plugin->update_server)
 					&& $plugin->update_server > 0
 					&& isset($plugin->update_server_xml_path)
-					&& File::exists($plugin->update_server_xml_path)
+					&& is_file($plugin->update_server_xml_path)
 					&& isset($plugin->update_server_xml_file_name)
 					&& StringHelper::check(
 						$plugin->update_server_xml_file_name
@@ -952,7 +952,7 @@ class Compiler extends Infusion
 			if (('README.md' === $static['name']
 					|| 'README.txt' === $static['name'])
 				&& CFactory::_('Component')->get('addreadme')
-				&& File::exists($static['path']))
+				&& is_file($static['path']))
 			{
 				$this->setReadMe($static['path']);
 				$two++;
@@ -1467,7 +1467,7 @@ class Compiler extends Infusion
 				}
 				$counter = 0;
 				// check if file exist			
-				if (File::exists($file))
+				if (is_file($file))
 				{
 					foreach (
 						new \SplFileObject($file) as $lineNumber => $lineContent
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Fields.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Fields.php
index 01323d7aa..5f2e8efd5 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Fields.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Fields.php
@@ -1326,6 +1326,30 @@ class Fields extends Structure
 								. $filter['type'] . '"';
 							// set css classname of this field
 							$filter_class = ucfirst((string) $filter['type']);
+
+							// if this is a modal_select field
+							$modal_select = $filter['custom']['modal_select'] ?? null;
+							if ($modal_select)
+							{
+								$field_filter_sets[] = Indent::_(3) . 'sql_title_table="'
+									. $filter['custom']['table'] . '"';
+								$field_filter_sets[] = Indent::_(3) . 'sql_title_column="'
+									. $filter['custom']['text'] . '"';
+								$field_filter_sets[] = Indent::_(3) . 'sql_title_key="'
+									. $filter['custom']['id'] . '"';
+								$field_filter_sets[] = Indent::_(3) . 'urlSelect="'
+									. $filter['custom']['urlSelect'] . '"';
+								$field_filter_sets[] = Indent::_(3) . 'hint="'
+									. $filter['custom']['hint'] . '"';
+								$field_filter_sets[] = Indent::_(3) . 'titleSelect="'
+									. $filter['custom']['titleSelect'] . '"';
+								$field_filter_sets[] = Indent::_(3) . 'iconSelect="'
+									. $filter['custom']['iconSelect'] . '"';
+								$field_filter_sets[] = Indent::_(3) . 'select="true"';
+								$field_filter_sets[] = Indent::_(3) . 'edit="false"';
+								$field_filter_sets[] = Indent::_(3) . 'clear="true"';
+								$field_filter_sets[] = Indent::_(3) . 'onchange="form.submit()"';
+							}
 						}
 						else
 						{
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
index b02581f6f..ae7b75480 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
@@ -445,6 +445,11 @@ class Infusion extends Interpretation
 						$this->setAddToolBar($view)
 					);
 
+					// ADDMODALTOOLBAR <<<DYNAMIC>>>
+					CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|ADDMODALTOOLBAR',
+						$this->setAddModalToolBar($view)
+					);
+
 					// set the script for this view
 					$this->buildTheViewScript($view);
 
@@ -945,6 +950,14 @@ class Infusion extends Interpretation
 						)
 					);
 
+					// VIEWS_MODAL_BODY <<<DYNAMIC>>>
+					CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|VIEWS_MODAL_BODY',
+						$this->setModalViewsBody(
+							$nameSingleCode,
+							$nameListCode
+						)
+					);
+
 					// LISTHEAD <<<DYNAMIC>>>
 					CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|LISTHEAD',
 						$this->setListHead(
@@ -1046,6 +1059,13 @@ class Infusion extends Interpretation
 						)
 					);
 
+					// ADMIN_VIEWS_MODAL_HEADER <<<DYNAMIC>>> add the header details for the views
+					CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|ADMIN_VIEWS_MODAL_HEADER',
+						CFactory::_('Header')->get(
+							'admin.views.modal', $nameListCode
+						)
+					);
+
 					// API_VIEWS_CONTROLLER_HEADER <<<DYNAMIC>>> add the header details for the controller
 					CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|API_VIEWS_CONTROLLER_HEADER',
 						CFactory::_('Header')->get(
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
index 5a2399336..93dab3a94 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
@@ -352,7 +352,7 @@ class Interpretation extends Fields
 				CFactory::_('Compiler.Builder.Content.One')->set('LICENSE_LOCKED_INT', $this->setInitLicenseLock($_WHMCS));
 				CFactory::_('Compiler.Builder.Content.One')->set('LICENSE_LOCKED_DEFINED',
 					PHP_EOL . PHP_EOL . 'defined(\'' . $_WHMCS
-					. '\') or die(Text:' . ':_(\'NIE_REG_NIE\'));');
+					. '\') or die(Joomla__'.'_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_(\'NIE_REG_NIE\'));');
 			}
 		}
 		else
@@ -415,7 +415,7 @@ class Interpretation extends Fields
 		$statment[] = PHP_EOL . Indent::_(2) . "if (!" . $thIIS . "->"
 			. $boolMethod . "())";
 		$statment[] = Indent::_(2) . "{";
-		$statment[] = Indent::_(3) . "\$app = Factory::getApplication();";
+		$statment[] = Indent::_(3) . "\$app = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();";
 		$statment[] = Indent::_(3) . "\$app->enqueueMessage(Text:"
 			. ":_('NIE_REG_NIE'), 'error');";
 		$statment[] = Indent::_(3) . "\$app->redirect('index.php');";
@@ -579,7 +579,7 @@ class Interpretation extends Fields
 				$encrypt[] = Indent::_(1) . "{";
 				$encrypt[] = Indent::_(2) . "// get the session";
 				$encrypt[] = Indent::_(2)
-					. "\$session = Factory::getSession();";
+					. "\$session = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getSession();";
 				$encrypt[] = Indent::_(2)
 					. "\$V2uekt2wcgwk = \$session->get(\$Vk5smi0wjnjb, null);";
 				$encrypt[] = Indent::_(2)
@@ -999,7 +999,7 @@ class Interpretation extends Fields
 				$function[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 					. " Set the error message.";
 				$function[] = Indent::_(3)
-					. "Factory::getApplication()->enqueueMessage(Text:" . ":_('"
+					. "Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->enqueueMessage(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 					. CFactory::_('Config')->lang_prefix
 					. "_CONFIG_MEDIUM_KEY_PATH_ERROR'), 'Error');";
 				$function[] = Indent::_(3) . "return false;";
@@ -1030,7 +1030,7 @@ class Interpretation extends Fields
 				$function[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 					. " Set the error message.";
 				$function[] = Indent::_(3)
-					. "Factory::getApplication()->enqueueMessage(Text:" . ":_('"
+					. "Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->enqueueMessage(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 					. CFactory::_('Config')->lang_prefix
 					. "_CONFIG_MEDIUM_KEY_PATH_ERROR'), 'Error');";
 				$function[] = Indent::_(3) . "return false;";
@@ -1049,7 +1049,7 @@ class Interpretation extends Fields
 				$function[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 					. " Set the error message.";
 				$function[] = Indent::_(3)
-					. "Factory::getApplication()->enqueueMessage(Text:" . ":_('"
+					. "Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->enqueueMessage(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 					. CFactory::_('Config')->lang_prefix
 					. "_CONFIG_MEDIUM_KEY_PATH_ERROR'), 'Error');";
 				$function[] = Indent::_(3) . "return false;";
@@ -1183,14 +1183,16 @@ class Interpretation extends Fields
 			if (CFactory::_('Component')->get('version_update_id', 0)  > 0)
 			{
 				$newU['id'] = (int) CFactory::_('Component')->get('version_update_id', 0);
+				$key = 'id';
 			}
 			else
 			{
-				$newU['joomla_component'] = (int) CFactory::_('Config')->component_id;
+				$newU['joomla_component'] = (string) CFactory::_('Config')->component_guid;
+				$key = 'guid';
 			}
 			$newU['version_update'] = $buket;
 			// update the component with the new dynamic SQL
-			CFactory::_('Data.Item')->table('component_updates')->set((object) $newU, 'id'); // <-- to insure the history is also updated
+			CFactory::_('Data.Item')->table('component_updates')->set((object) $newU, $key); // <-- to insure the history is also updated
 		}
 	}
 
@@ -1303,9 +1305,9 @@ class Interpretation extends Fields
 		if ($update['version'] != CFactory::_('Component')->get('component_version'))
 		{
 			$name   = StringHelper::safe($update['version']);
-			$target = array('admin' => $name);
-			CFactory::_('Utilities.Structure')->build($target, 'sql_update', $update['version']);
+			$target = ['admin' => $name];
 			$_name = preg_replace('/[\.]+/', '_', (string) $update['version']);
+			CFactory::_('Utilities.Structure')->build($target, 'sql_update', $_name);
 			CFactory::_('Compiler.Builder.Content.Multi')->set($name . '_' . $_name . '|UPDATE_VERSION_MYSQL',
 				$update['mysql']
 			);
@@ -1324,7 +1326,7 @@ class Interpretation extends Fields
 			$u_element = 'com_' . CFactory::_('Config')->component_code_name;
 			$u_server_type = 'component';
 			$u_state = 'stable';
-			$u_target_version = '3.*';
+			$u_target_version = '5.*';
 			$u_client = null;
 			// check if we have advance options set
 			if (isset($update['update_server_adv']) && $update['update_server_adv'])
@@ -1445,20 +1447,20 @@ class Interpretation extends Fields
 		$help[] = Indent::_(1) . "{";
 		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 		{
-			$help[] = Indent::_(2) . "\$user	= Factory::getUser();";
+			$help[] = Indent::_(2) . "\$user	= Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 		}
 		else
 		{
-			$help[] = Indent::_(2) . "\$user	= Factory::getApplication()->getIdentity();";
+			$help[] = Indent::_(2) . "\$user	= Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 		}
 		$help[] = Indent::_(2) . "\$groups = \$user->get('groups');";
 		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 		{
-			$help[] = Indent::_(2) . "\$db	= Factory::getDbo();";
+			$help[] = Indent::_(2) . "\$db	= Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 		}
 		else
 		{
-			$help[] = Indent::_(2) . "\$db	= Factory::getContainer()->get(DatabaseInterface::class);";
+			$help[] = Indent::_(2) . "\$db	= Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(DatabaseInterface::class);";
 		}
 		$help[] = Indent::_(2) . "\$query	= \$db->getQuery(true);";
 		$help[] = Indent::_(2)
@@ -1560,18 +1562,18 @@ class Interpretation extends Fields
 				. " set the user";
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
-				$exel[] = Indent::_(2) . "\$user = Factory::getUser();";
+				$exel[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 			}
 			else
 			{
-				$help[] = Indent::_(2) . "\$user = Factory::getApplication()->getIdentity();";
+				$help[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 			}
 			$exel[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
 				. " set fileName if not set";
 			$exel[] = Indent::_(2) . "if (!\$fileName)";
 			$exel[] = Indent::_(2) . "{";
 			$exel[] = Indent::_(3)
-				. "\$fileName = 'exported_'.Factory::getDate()->format('jS_F_Y');";
+				. "\$fileName = 'exported_' . Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDate()->format('jS_F_Y');";
 			$exel[] = Indent::_(2) . "}";
 			$exel[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
 				. " set modified if not set";
@@ -1759,7 +1761,7 @@ class Interpretation extends Fields
 				. "self::composerAutoload('phpspreadsheet');";
 			$exel[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
 				. " get session object";
-			$exel[] = Indent::_(2) . "\$session = Factory::getSession();";
+			$exel[] = Indent::_(2) . "\$session = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getSession();";
 			$exel[] = Indent::_(2)
 				. "\$package = \$session->get('package', null);";
 			$exel[] = Indent::_(2)
@@ -2600,7 +2602,7 @@ class Interpretation extends Fields
 					$runplugins .= PHP_EOL . $tab . Indent::_(1)
 						. "PluginHelper::importPlugin('content');";
 					$runplugins .= PHP_EOL . $tab . Indent::_(1)
-						. '$this->_dispatcher = Factory::getApplication();';
+						. '$this->_dispatcher = Joomla__'.'_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();';
 				}
 				if (!$params)
 				{
@@ -3221,7 +3223,7 @@ class Interpretation extends Fields
 						__LINE__,__CLASS__
 					)
 					. " redirect away to the default view if no access allowed.";
-				$redirectString  = "Route::_('index.php?option=com_"
+				$redirectString  = "Joomla__"."_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_"
 					. CFactory::_('Config')->component_code_name . "&view="
 					. CFactory::_('Compiler.Builder.Content.One')->get('SITE_DEFAULT_VIEW') . "')";
 			}
@@ -3240,7 +3242,7 @@ class Interpretation extends Fields
 				. ".access', 'com_" . CFactory::_('Config')->component_code_name . "'))";
 			$accessCheck[] = Indent::_(2) . "{";
 			$accessCheck[] = Indent::_(3)
-				. "\$app = Factory::getApplication();";
+				. "\$app = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();";
 			// set lang
 			$langKeyWord = CFactory::_('Config')->lang_prefix . '_'
 				. StringHelper::safe(
@@ -3303,7 +3305,7 @@ class Interpretation extends Fields
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
 				$getItem .= PHP_EOL . Indent::_(1) . $tab . Indent::_(1)
-					. "\$db = Factory::getDbo();";
+					. "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 			}
 			else
 			{
@@ -3386,7 +3388,7 @@ class Interpretation extends Fields
 			if ($type === 'main')
 			{
 				$getItem      .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2)
-					. "\$app = Factory::getApplication();";
+					. "\$app = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();";
 				$langKeyWoord = CFactory::_('Config')->lang_prefix . '_'
 					. StringHelper::safe(
 						'Not found or access denied', 'U'
@@ -3398,7 +3400,7 @@ class Interpretation extends Fields
 					. Line::_(__Line__, __Class__)
 					. " If no data is found redirect to default page and show warning.";
 				$getItem .= PHP_EOL . Indent::_(1) . $tab . Indent::_(2)
-					. "\$app->enqueueMessage(Text:" . ":_('" . $langKeyWoord
+					. "\$app->enqueueMessage(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $langKeyWoord
 					. "'), 'warning');";
 				if ('site' === CFactory::_('Config')->build_target)
 				{
@@ -3406,7 +3408,7 @@ class Interpretation extends Fields
 					if (CFactory::_('Compiler.Builder.Content.One')->exists('SITE_DEFAULT_VIEW')
 						&& CFactory::_('Compiler.Builder.Content.One')->get('SITE_DEFAULT_VIEW') != $code)
 					{
-						$redirectString = "Route::_('index.php?option=com_"
+						$redirectString = "Joomla__"."_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_"
 							. CFactory::_('Config')->component_code_name . "&view="
 							. CFactory::_('Compiler.Builder.Content.One')->get('SITE_DEFAULT_VIEW') . "')";
 					}
@@ -3636,7 +3638,7 @@ class Interpretation extends Fields
 							. "if (!isset(\$this->initSet) || !\$this->initSet)";
 						$main .= PHP_EOL . Indent::_(2) . "{";
 						$main .= PHP_EOL . Indent::_(3)
-							. "\$this->user = Factory::getUser();";
+							. "\$this->user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 						$main .= PHP_EOL . Indent::_(3)
 							. "\$this->userId = \$this->user->get('id');";
 						$main .= PHP_EOL . Indent::_(3)
@@ -3664,7 +3666,7 @@ class Interpretation extends Fields
 							. "if (!isset(\$this->initSet) || !\$this->initSet)";
 						$main .= PHP_EOL . Indent::_(2) . "{";
 						$main .= PHP_EOL . Indent::_(3)
-							. "\$this->user = Factory::getUser();";
+							. "\$this->user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 						$main .= PHP_EOL . Indent::_(3)
 							. "\$this->userId = \$this->user->get('id');";
 						$main .= PHP_EOL . Indent::_(3)
@@ -3983,7 +3985,7 @@ class Interpretation extends Fields
 						if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 						{
 							$methods .= PHP_EOL . Indent::_(2)
-								. "\$db = Factory::getDbo();";
+								. "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 						}
 						else
 						{
@@ -4348,7 +4350,7 @@ class Interpretation extends Fields
 			}
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
-				$getItem .= PHP_EOL . Indent::_(2) . "\$db = Factory::getDbo();";
+				$getItem .= PHP_EOL . Indent::_(2) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 			}
 			else
 			{
@@ -4910,7 +4912,7 @@ class Interpretation extends Fields
 			$addModule[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " this is where you want to load your module position";
 			$addModule[] = Indent::_(3)
-				. "\$modules = ModuleHelper::getModules(\$position);";
+				. "\$modules = Joomla__"."_f15d556d_33dd_4ee3_a0f7_0653e4a7a1e4___Power::getModules(\$position);";
 			$addModule[] = Indent::_(3) . "if ("
 				. "Super_" . "__0a59c65c_9daf_4bc9_baf4_e063ff9e6a8a___Power::check(\$modules, true))";
 			$addModule[] = Indent::_(3) . "{";
@@ -4921,7 +4923,7 @@ class Interpretation extends Fields
 			$addModule[] = Indent::_(4) . "foreach(\$modules as \$module)";
 			$addModule[] = Indent::_(4) . "{";
 			$addModule[] = Indent::_(5)
-				. "\$this->setModules[\$position][] = ModuleHelper::renderModule(\$module);";
+				. "\$this->setModules[\$position][] = Joomla__"."_f15d556d_33dd_4ee3_a0f7_0653e4a7a1e4___Power::renderModule(\$module);";
 			$addModule[] = Indent::_(4) . "}";
 			$addModule[] = Indent::_(4) . "\$found = true;";
 			$addModule[] = Indent::_(3) . "}";
@@ -5096,7 +5098,7 @@ class Interpretation extends Fields
 				$buttons[] = $tab . Indent::_(2)
 					. "//" . Line::_(__Line__, __Class__) . " add cpanel button";
 				$buttons[] = $tab . Indent::_(2)
-					. "ToolbarHelper::custom('" . $viewCodeName . "."
+					. "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('" . $viewCodeName . "."
 					. "dashboard', 'grid-2', '', 'COM_"
 					. CFactory::_('Compiler.Builder.Content.One')->get('COMPONENT')
 					. "_DASH', false);";
@@ -5153,7 +5155,7 @@ class Interpretation extends Fields
 							. Line::_(__Line__, __Class__) . " add "
 							. $custom_button['name'] . " button.";
 						$buttons[] = Indent::_(1) . $tab . Indent::_(2)
-							. "ToolbarHelper::custom('" . $viewCodeName . "."
+							. "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('" . $viewCodeName . "."
 							. $custom_button['method'] . "', '"
 							. $custom_button['icomoon'] . " custom-button-"
 							. strtolower((string) $custom_button['method']) . "', '', '"
@@ -5194,7 +5196,7 @@ class Interpretation extends Fields
 								= Indent::_(
 									1
 								) . $tab . Indent::_(1)
-								. "ToolbarHelper::custom('" . $viewsCodeName
+								. "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('" . $viewsCodeName
 								. "."
 								. $custom_button['method'] . "', '"
 								. $custom_button['icomoon'] . " custom-button-"
@@ -5219,7 +5221,7 @@ class Interpretation extends Fields
 								. "//" . Line::_(__Line__, __Class__) . " add "
 								. $custom_button['name'] . " button.";
 							$buttons[] = Indent::_(1) . $tab . Indent::_(2)
-								. "ToolbarHelper::custom('" . $viewsCodeName
+								. "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('" . $viewsCodeName
 								. "."
 								. $custom_button['method'] . "', '"
 								. $custom_button['icomoon'] . " custom-button-"
@@ -6630,7 +6632,7 @@ class Interpretation extends Fields
 					// top
 					if ('site' === CFactory::_('Config')->build_target)
 					{
-						return '<form action="<?php echo Route::_(\'index.php?option=com_'
+						return '<form action="<?php echo Joomla__'.'_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(\'index.php?option=com_'
 							. CFactory::_('Config')->component_code_name
 							. '\'); ?>" method="post" name="adminForm" id="adminForm">'
 							. PHP_EOL;
@@ -6639,14 +6641,14 @@ class Interpretation extends Fields
 					{
 						if ($gettype == 2)
 						{
-							return '<form action="<?php echo Route::_(\'index.php?option=com_'
+							return '<form action="<?php echo Joomla__'.'_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(\'index.php?option=com_'
 								. CFactory::_('Config')->component_code_name . '&view=' . $view
 								. '\'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">'
 								. PHP_EOL;
 						}
 						else
 						{
-							return '<form action="<?php echo Route::_(\'index.php?option=com_'
+							return '<form action="<?php echo Joomla__'.'_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_(\'index.php?option=com_'
 								. CFactory::_('Config')->component_code_name . '&view=' . $view
 								. '\' . $urlId); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">'
 								. PHP_EOL;
@@ -7134,14 +7136,14 @@ class Interpretation extends Fields
 						if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 						{
 							$script .= PHP_EOL . Indent::_(3)
-								. "&& Factory::getUser()->authorise('" . $view
+								. "&& Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser()->authorise('" . $view
 								. "." . $permission_option . "." . $jsonItem
 								. "', 'com_" . $component . "')";
 						}
 						else
 						{
 							$script .= PHP_EOL . Indent::_(3)
-								. "&& Factory::getApplication()->getIdentity()->authorise('" . $view
+								. "&& Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity()->authorise('" . $view
 								. "." . $permission_option . "." . $jsonItem
 								. "', 'com_" . $component . "')";
 						}
@@ -7279,7 +7281,7 @@ class Interpretation extends Fields
 			$oserver .= PHP_EOL . PHP_EOL . Indent::_(2) . "//"
 				. Line::_(__Line__, __Class__) . " Adding Tag Options";
 			$oserver .= PHP_EOL . Indent::_(2)
-				. "TableObserverTags::createObserver(\$this, array('typeAlias' => 'com_"
+				. "Joomla__"."_fe63add8_0a40_4b3d_b548_f735fa6072fb___Power::createObserver(\$this, array('typeAlias' => 'com_"
 				. $component . "." . $view . "'));";
 		}
 		// add the history/version observer
@@ -7288,7 +7290,7 @@ class Interpretation extends Fields
 			$oserver .= PHP_EOL . PHP_EOL . Indent::_(2) . "//"
 				. Line::_(__Line__, __Class__) . " Adding History Options";
 			$oserver .= PHP_EOL . Indent::_(2)
-				. "TableObserverContenthistory::createObserver(\$this, array('typeAlias' => 'com_"
+				. "Joomla__"."_9ac794c2_f96d_4522_8acf_b8d48c4f51c5___Power::createObserver(\$this, array('typeAlias' => 'com_"
 				. $component . "." . $view . "'));";
 		}
 
@@ -7372,7 +7374,7 @@ class Interpretation extends Fields
 			$script .= PHP_EOL . PHP_EOL . Indent::_(3) . "//"
 				. Line::_(__Line__, __Class__) . " Get The Database object";
 			$script .= PHP_EOL . Indent::_(3)
-				. "\$db = Factory::getDbo();";
+				. "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 			foreach ($dbStuff as $name => $tables)
 			{
 				if (ArrayHelper::check($tables))
@@ -7567,7 +7569,7 @@ class Interpretation extends Fields
 						__LINE__,__CLASS__
 					) . " Install the global extension assets permission.";
 				$script .= PHP_EOL . Indent::_(3)
-					. "\$db = Factory::getDbo();";
+					. "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 			}
 			$script .= PHP_EOL . Indent::_(3)
 				. "\$query = \$db->getQuery(true);";
@@ -7608,7 +7610,7 @@ class Interpretation extends Fields
 						__LINE__,__CLASS__
 					) . " Install the global extension params.";
 				$script .= PHP_EOL . Indent::_(3)
-					. "\$db = Factory::getDbo();";
+					. "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 			}
 			$script .= PHP_EOL . Indent::_(3)
 				. "\$query = \$db->getQuery(true);";
@@ -7726,11 +7728,11 @@ class Interpretation extends Fields
 			$script .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
 				. " Get Application object";
 			$script .= PHP_EOL . Indent::_(2)
-				. "\$app = Factory::getApplication();";
+				. "\$app = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();";
 			$script .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
 					__LINE__,__CLASS__
 				) . " Get The Database object";
-			$script .= PHP_EOL . Indent::_(2) . "\$db = Factory::getDbo();";
+			$script .= PHP_EOL . Indent::_(2) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 
 			foreach (
 				$this->uninstallScriptBuilder as $viewsCodeName => $typeAlias
@@ -8003,7 +8005,7 @@ class Interpretation extends Fields
 					. " add queued success message.";
 				// TODO lang is not translated
 				$script .= PHP_EOL . Indent::_(4)
-					. "\$app->enqueueMessage(Text:" . ":_('The (" . $typeAlias
+					. "\$app->enqueueMessage(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('The (" . $typeAlias
 					. ") type alias was removed from the <b>#__content_type</b> table'));";
 				$script .= PHP_EOL . Indent::_(3) . "}";
 
@@ -8038,7 +8040,7 @@ class Interpretation extends Fields
 					. " add queued success message.";
 				// TODO lang is not translated
 				$script .= PHP_EOL . Indent::_(4)
-					. "\$app->enqueueMessage(Text:" . ":_('The (" . $typeAlias
+					. "\$app->enqueueMessage(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('The (" . $typeAlias
 					. ") type alias was removed from the <b>#__contentitem_tag_map</b> table'));";
 				$script .= PHP_EOL . Indent::_(3) . "}";
 
@@ -8073,7 +8075,7 @@ class Interpretation extends Fields
 					. " add queued success message.";
 				// TODO lang is not translated
 				$script .= PHP_EOL . Indent::_(4)
-					. "\$app->enqueueMessage(Text:" . ":_('The (" . $typeAlias
+					. "\$app->enqueueMessage(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('The (" . $typeAlias
 					. ") type alias was removed from the <b>#__ucm_content</b> table'));";
 				$script .= PHP_EOL . Indent::_(3) . "}";
 
@@ -8182,11 +8184,11 @@ class Interpretation extends Fields
 			$script .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
 				. " Get Application object";
 			$script .= PHP_EOL . Indent::_(2)
-				. "\$app = Factory::getApplication();";
+				. "\$app = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();";
 			$script .= PHP_EOL . PHP_EOL . Indent::_(2) . "//" . Line::_(
 					__LINE__,__CLASS__
 				) . " Get The Database object";
-			$script .= PHP_EOL . Indent::_(2) . "\$db = Factory::getDbo();";
+			$script .= PHP_EOL . Indent::_(2) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 		}
 		// add the Intelligent Reversal script if needed
 		$script .= $this->getAssetsTableIntelligentUninstall();
@@ -8301,7 +8303,7 @@ class Interpretation extends Fields
 			$codeA    = implode(PHP_EOL, $script);
 			// fixed message
 			$messageA = Indent::_(5)
-				. "\$app->enqueueMessage(Text:" . ":_('The <b>#__assets</b> table rules column was resized to the "
+				. "\$app->enqueueMessage(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('The <b>#__assets</b> table rules column was resized to the "
 				. $data_type
 				. " datatype for the components possible large permission rules.'));";
 			// do nothing
@@ -8356,7 +8358,7 @@ class Interpretation extends Fields
 			$codeB = "";
 			// not reverted message
 			$messageB = Indent::_(4)
-				. "\$app->enqueueMessage(Text:" . ":_('Could not revert the <b>#__assets</b> table rules column back to its default size of varchar(5120), since there is still one or more components that still requires the column to be larger.'));";
+				. "\$app->enqueueMessage(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('Could not revert the <b>#__assets</b> table rules column back to its default size of varchar(5120), since there is still one or more components that still requires the column to be larger.'));";
 
 			// done
 			return $this->getAssetsTableIntelligentCode(
@@ -9018,12 +9020,12 @@ class Interpretation extends Fields
 		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 		{
 			$batchmove[] = Indent::_(3)
-				. "\$this->user		= Factory::getUser();";
+				. "\$this->user		= Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 		}
 		else
 		{
 			$batchmove[] = Indent::_(3)
-				. "\$this->user		= Factory::getApplication()->getIdentity();";
+				. "\$this->user		= Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 		}
 		$batchmove[] = Indent::_(3)
 			. "\$this->table		= \$this->getTable();";
@@ -9244,12 +9246,12 @@ class Interpretation extends Fields
 		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 		{
 			$batchcopy[] = Indent::_(3)
-				. "\$this->user 		= Factory::getUser();";
+				. "\$this->user 		= Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 		}
 		else
 		{
 			$batchcopy[] = Indent::_(3)
-				. "\$this->user 		= Factory::getApplication()->getIdentity();";
+				. "\$this->user 		= Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 		}
 		$batchcopy[] = Indent::_(3)
 			. "\$this->table 		= \$this->getTable();";
@@ -9619,7 +9621,7 @@ class Interpretation extends Fields
 				. "'] == null || empty(\$data['" . $alias . "']))";
 			$fixUnique[] = Indent::_(3) . "{";
 			$fixUnique[] = Indent::_(4)
-				. "if (Factory::getConfig()->get('unicodeslugs') == 1)";
+				. "if (Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig()->get('unicodeslugs') == 1)";
 			$fixUnique[] = Indent::_(4) . "{";
 			$fixUnique[] = Indent::_(5) . "\$data['" . $alias
 				. "'] = OutputFilter::stringURLUnicodeSlug(" . implode(
@@ -9642,7 +9644,7 @@ class Interpretation extends Fields
 					. $alias . "'], '" . $category . "' => \$data['" . $category
 					. "']]) && (\$table->id != \$data['id'] || \$data['id'] == 0))";
 				$fixUnique[] = Indent::_(4) . "{";
-				$fixUnique[] = Indent::_(5) . "\$msg = Text:" . ":_('COM_"
+				$fixUnique[] = Indent::_(5) . "\$msg = Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_"
 					. CFactory::_('Compiler.Builder.Content.One')->get('COMPONENT') . "_" . $VIEW . "_SAVE_WARNING');";
 				$fixUnique[] = Indent::_(4) . "}";
 				$fixUnique[] = PHP_EOL . Indent::_(4) . "list(" . implode(
@@ -9661,7 +9663,7 @@ class Interpretation extends Fields
 					. $alias
 					. "'])) && (\$table->id != \$data['id'] || \$data['id'] == 0))";
 				$fixUnique[] = Indent::_(4) . "{";
-				$fixUnique[] = Indent::_(5) . "\$msg = Text:" . ":_('COM_"
+				$fixUnique[] = Indent::_(5) . "\$msg = Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_"
 					. CFactory::_('Compiler.Builder.Content.One')->get('COMPONENT') . "_" . $VIEW . "_SAVE_WARNING');";
 				$fixUnique[] = Indent::_(4) . "}";
 				$fixUnique[] = PHP_EOL . Indent::_(4) . "\$data['" . $alias
@@ -9671,7 +9673,7 @@ class Interpretation extends Fields
 			$fixUnique[] = PHP_EOL . Indent::_(4) . "if (isset(\$msg))";
 			$fixUnique[] = Indent::_(4) . "{";
 			$fixUnique[] = Indent::_(5)
-				. "Factory::getApplication()->enqueueMessage(\$msg, 'warning');";
+				. "Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->enqueueMessage(\$msg, 'warning');";
 			$fixUnique[] = Indent::_(4) . "}";
 			$fixUnique[] = Indent::_(3) . "}";
 			$fixUnique[] = Indent::_(2) . "}";
@@ -9679,7 +9681,7 @@ class Interpretation extends Fields
 //			$fixUnique[] = PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__) . " Update alias if still empty at this point";
 //			$fixUnique[] = Indent::_(2) . "if (\$data['" . $alias . "'] == null || empty(\$data['" . $alias . "']))";
 //			$fixUnique[] = Indent::_(2) . "{";
-//			$fixUnique[] = Indent::_(3) . "if (Factory::getConfig()->get('unicodeslugs') == 1)";
+//			$fixUnique[] = Indent::_(3) . "if (Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getConfig()->get('unicodeslugs') == 1)";
 //			$fixUnique[] = Indent::_(3) . "{";
 //			$fixUnique[] = Indent::_(4) . "\$data['" . $alias . "'] = OutputFilter::stringURLUnicodeSlug(" . implode(' . " " . ', $titleData) . ");";
 //			$fixUnique[] = Indent::_(3) . "}";
@@ -9881,7 +9883,7 @@ class Interpretation extends Fields
 				. "if (trim(str_replace('-', '', \$this->alias)) == '')";
 			$newFunction[] = Indent::_(2) . "{";
 			$newFunction[] = Indent::_(3)
-				. "\$this->alias = Factory::getDate()->format('Y-m-d-H-i-s');";
+				. "\$this->alias = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDate()->format('Y-m-d-H-i-s');";
 			$newFunction[] = Indent::_(2) . "}";
 			$newFunction[] = PHP_EOL . Indent::_(2) . "return \$this->alias;";
 			$newFunction[] = Indent::_(1) . "}";
@@ -9999,7 +10001,7 @@ class Interpretation extends Fields
 						. $data['type'] . $length . " " . $default . ",";
 					// check if this a new field that should be added via SQL update
 					if (CFactory::_('Registry')->
-						get('builder.add_sql.field.' . $view . '.' . $data['ID'], null))
+						get('builder.add_sql.field.' . $view . '.' . $data['GUID'], null))
 					{
 						// to soon....
 						// $key_ = "ALTERTABLE`#__" . $component . "_" . $view . "`ADDCOLUMNIFNOTEXISTS`" . $field . "`";
@@ -11108,16 +11110,30 @@ class Interpretation extends Fields
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
 				$body .= PHP_EOL . Indent::_(2)
-					. "\$userChkOut = Factory::getUser(\$item->checked_out);";
+					. "\$userChkOut = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser(\$item->checked_out);";
+
+				$allowSortingWhen = "<?php if (\$canDo->get('"
+					. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit.state') . "')): ?>";
+				$allowSelectionWhen =  "<?php if (\$canDo->get('"
+					. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit') . "')): ?>";
+				$allowPublishedWhen =  "<?php if (\$canDo->get('"
+					. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit.state') . "')) : ?>";
 			}
 			else
 			{
 				$body .= PHP_EOL . Indent::_(2)
-					. "\$userChkOut = Factory::getContainer()->";
+					. "\$userChkOut = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->";
 				$body .= PHP_EOL . Indent::_(3)
 					. "get(Joomla__"."_c2980d12_c3ef_4e23_b4a2_e6af1f5900a9___Power::class)->";
 				$body .= PHP_EOL . Indent::_(4)
 					. "loadUserById(\$item->checked_out ?? 0);";
+
+				$allowSortingWhen = "<?php if (!\$this->isModal && \$canDo->get('"
+					. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit.state') . "')): ?>";
+				$allowSelectionWhen =  "<?php if (!\$this->isModal && \$canDo->get('"
+					. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit') . "')): ?>";
+				$allowPublishedWhen =  "<?php if (!\$this->isModal && \$canDo->get('"
+					. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit.state') . "')) : ?>";
 			}
 			$body .= PHP_EOL . Indent::_(2) . "\$canDo = " . $Helper
 				. "::getActions('" . $nameSingleCode . "',\$item,'"
@@ -11131,8 +11147,7 @@ class Interpretation extends Fields
 				$body .= PHP_EOL . Indent::_(2)
 					. '<td class="order nowrap center hidden-phone">';
 				// check if the item has permissions.
-				$body .= PHP_EOL . Indent::_(2) . "<?php if (\$canDo->get('"
-						. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit.state') . "')): ?>";
+				$body .= PHP_EOL . Indent::_(2) . $allowSortingWhen;
 				$body .= PHP_EOL . Indent::_(3) . "<?php";
 				$body .= PHP_EOL . Indent::_(4) . "\$iconClass = '';";
 				$body .= PHP_EOL . Indent::_(4) . "if (!\$this->saveOrder)";
@@ -11161,8 +11176,7 @@ class Interpretation extends Fields
 			}
 			$body .= PHP_EOL . Indent::_(2) . '<td class="nowrap center">';
 			// check if the item has permissions.
-			$body .= PHP_EOL . Indent::_(2) . "<?php if (\$canDo->get('"
-					. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit') . "')): ?>";
+			$body .= PHP_EOL . Indent::_(2) . $allowSelectionWhen;
 			$body .= PHP_EOL . Indent::_(4)
 				. "<?php if (\$item->checked_out) : ?>";
 			$body .= PHP_EOL . Indent::_(5) . "<?php if (\$canCheckin) : ?>";
@@ -11223,8 +11237,7 @@ class Interpretation extends Fields
 			{
 				$body .= PHP_EOL . Indent::_(2) . '<td class="center">';
 				// check if the item has permissions.
-				$body .= PHP_EOL . Indent::_(2) . "<?php if (\$canDo->get('"
-					. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit.state') . "')) : ?>";
+				$body .= PHP_EOL . Indent::_(2) . $allowPublishedWhen;
 				$body .= PHP_EOL . Indent::_(4)
 					. "<?php if (\$item->checked_out) : ?>";
 				$body .= PHP_EOL . Indent::_(5)
@@ -11279,7 +11292,7 @@ class Interpretation extends Fields
 	 * @param   bool    $doNotEscape     The do not escape global switch
 	 * @param   bool    $class           The dive class adding switch
 	 * @param   string  $ref             The link referral string
-	 * @param   string  $escape          The escape code name
+	 * @param   string  $classPointer          The class pointer (this or displaydata)
 	 * @param   string  $user            The user code name
 	 * @param   string  $refview         The override of the referral view code name
 	 *
@@ -11288,7 +11301,7 @@ class Interpretation extends Fields
 	 */
 	protected function getListItemBuilder($item, $nameSingleCode,
 	                                      $nameListCode, &$itemClass, $doNotEscape,
-	                                      $class = true, $ref = null, $escape = '$this->escape',
+	                                      $class = true, $ref = null, $classPointer = '$this->',
 	                                      $user = '$this->user', $refview = null
 	)
 	{
@@ -11310,7 +11323,7 @@ class Interpretation extends Fields
 			// load the main list view field
 			$field_list_item = $this->getListItem(
 				$item, $nameSingleCode, $nameListCode, $itemClass,
-				$doNotEscape,false, $ref, $escape, $user,
+				$doNotEscape, false, $ref, $classPointer, $user,
 				$refview
 			);
 			$field['[field=' . (int) $item['id'] . ']'] = $field_list_item;
@@ -11336,7 +11349,7 @@ class Interpretation extends Fields
 						$join_field_list_item = $this->getListItem(
 							$join_item, $nameSingleCode, $nameListCode, $blankClass,
 							$doNotEscape, false, $ref,
-							$escape, $user, $refview
+							$classPointer, $user, $refview
 						);
 						$field['[field=' . (int) $join_id . ']'] = $join_field_list_item;
 						$field['[field=' . (string) $join . ']'] = $join_field_list_item;
@@ -11380,7 +11393,7 @@ class Interpretation extends Fields
 
 		return $this->getListItem(
 			$item, $nameSingleCode, $nameListCode, $itemClass, $doNotEscape,
-			$class, $ref, $escape, $user, $refview
+			$class, $ref, $classPointer, $user, $refview
 		);
 	}
 
@@ -11394,7 +11407,7 @@ class Interpretation extends Fields
 	 * @param   bool    $doNotEscape     The do not escape global switch
 	 * @param   bool    $class           The dive class adding switch
 	 * @param   string  $ref             The link referral string
-	 * @param   string  $escape          The escape code name
+	 * @param   string  $classPointer          The class pointer
 	 * @param   string  $user            The user code name
 	 * @param   string  $refview         The override of the referral view code name
 	 *
@@ -11402,20 +11415,17 @@ class Interpretation extends Fields
 	 *
 	 */
 	protected function getListItem($item, $nameSingleCode, $nameListCode,
-	                               &$itemClass, $doNotEscape, $class = true, $ref = null,
-	                               $escape = '$this->escape', $user = '$this->user', $refview = null
-	)
+		&$itemClass, $doNotEscape, $class = true, $ref = null,
+		$classPointer = '$this->', $user = '$this->user', $refview = null)
 	{
 		// get list item code
 		$itemCode = $this->getListItemCode(
-			$item, $nameListCode, $doNotEscape, $escape
+			$item, $nameListCode, $doNotEscape, $classPointer
 		);
 		// add default links
 		$defaultLink = true;
-		if (StringHelper::check($refview)
-			&& isset($item['custom'])
-			&& isset($item['custom']['view'])
-			&& $refview === $item['custom']['view'])
+		if (StringHelper::check($refview) && isset($item['custom'])
+			&& isset($item['custom']['view']) && $refview === $item['custom']['view'])
 		{
 			$defaultLink = false;
 		}
@@ -11433,13 +11443,13 @@ class Interpretation extends Fields
 			);
 			// get list item link authority
 			$itemLinkAuthority = $this->getListItemLinkAuthority(
-				$item, $nameSingleCode, $nameListCode, $user
+				$item, $nameSingleCode, $nameListCode, $classPointer, $user
 			);
 
 			// set item row
 			return $this->getListItemLinkLogic(
-				$itemCode, $itemLink, $itemLinkAuthority, $nameListCode,
-				$checkoutTriger, $class
+				$item, $itemCode, $itemLink, $itemLinkAuthority, $nameSingleCode,
+				$nameListCode, $classPointer, $checkoutTriger, $class
 			);
 		}
 
@@ -11450,20 +11460,24 @@ class Interpretation extends Fields
 	/**
 	 * Get the list item link logic
 	 *
+	 * @param   array  $item               The item
 	 * @param   string  $itemCode           The item code string
 	 * @param   string  $itemLink           The item link string
 	 * @param   string  $itemLinkAuthority  The link authority string
+	 * @param   string  $nameSingleCode     The single view code name
 	 * @param   string  $nameListCode       The list view code name
 	 * @param   bool    $checkoutTriger     The check out trigger
+	 * @param   string  $classPointer       The class pointer
 	 * @param   bool    $class              The dive class adding switch
 	 *
 	 * @return  string of the complete link logic of row item
 	 *
 	 */
-	protected function getListItemLinkLogic($itemCode, $itemLink,
-	                                        $itemLinkAuthority, $nameListCode, $checkoutTriger, $class = true
-	)
+	protected function getListItemLinkLogic($item, $itemCode, $itemLink,
+		$itemLinkAuthority, $nameSingleCode, $nameListCode, $classPointer, $checkoutTriger, $class = true)
 	{
+		// set some local values
+		$code = $item['code'];
 		// build link
 		$link = '';
 		// add class
@@ -11478,6 +11492,7 @@ class Interpretation extends Fields
 			. $itemLinkAuthority . "): ?>";
 		$link .= PHP_EOL . $tab . Indent::_(4) . '<a href="' . $itemLink
 			. '"><?php echo ' . $itemCode . '; ?></a>';
+		$addModalFix = false;
 		if ($checkoutTriger)
 		{
 			$link .= PHP_EOL . $tab . Indent::_(4)
@@ -11486,10 +11501,36 @@ class Interpretation extends Fields
 				. "<?php echo Html::_('jgrid.checkedout', \$i, \$userChkOut->name, \$item->checked_out_time, '"
 				. $nameListCode . ".', \$canCheckin); ?>";
 			$link .= PHP_EOL . $tab . Indent::_(4) . "<?php endif; ?>";
+			if (CFactory::_('Config')->get('joomla_version', 3) !== 3)
+			{
+				$addModalFix = true;
+			}
 		}
 		$link .= PHP_EOL . $tab . Indent::_(3) . "<?php else: ?>";
-		$link .= PHP_EOL . $tab . Indent::_(4) . "<?php echo " . $itemCode
-			. "; ?>";
+		if ($addModalFix)
+		{
+			$link .= PHP_EOL . $tab . Indent::_(4) . "<?php if (!{$classPointer}isModal): ?>";
+			$link .= PHP_EOL . $tab . Indent::_(5) . "<?php echo " . $itemCode . "; ?>";
+			$link .= PHP_EOL . $tab . Indent::_(4) . "<?php else: ?>";
+			$link .= PHP_EOL . $tab . Indent::_(5) . "<?php";
+			$link .= PHP_EOL . $tab . Indent::_(6) . "\$link = \"{\$edit}&id={\$item->id}\";";
+			$link .= PHP_EOL . $tab . Indent::_(6) . "\$dataId = \$item->{{$classPointer}getModalTitleKey()} ?? 0;";
+			$link .= PHP_EOL . $tab . Indent::_(6) . "\$itemHtml = '<a href=\"' . {$classPointer}escape(\$link, false) . '\">' . {$classPointer}escape(\$item->{$code}, false) . '</a>';";
+			$link .= PHP_EOL . $tab . Indent::_(6) . "\$attribs = 'data-content-select data-content-type=\"com_" . CFactory::_('Config')->component_code_name . ".". $nameSingleCode . "\"'";
+			$link .= PHP_EOL . $tab . Indent::_(7) . ". ' data-id=\"' . \$dataId . '\"'";
+			$link .= PHP_EOL . $tab . Indent::_(7) . ". ' data-title=\"' . {$classPointer}escape(\$item->{$code}, false) . '\"'";
+			$link .= PHP_EOL . $tab . Indent::_(7) . ". ' data-uri=\"' . {$classPointer}escape(\$link, false) . '\"'";
+			$link .= PHP_EOL . $tab . Indent::_(7) . ". ' data-html=\"' . {$classPointer}escape(\$itemHtml, false) . '\"';";
+			$link .= PHP_EOL . $tab . Indent::_(5) . "?>";
+			$link .= PHP_EOL . $tab . Indent::_(5) . "<a class=\"select-link\" href=\"javascript:void(0)\" <?php echo \$attribs; ?>>";
+			$link .= PHP_EOL . $tab . Indent::_(6) . "<?php echo " . $itemCode . "; ?>";
+			$link .= PHP_EOL . $tab . Indent::_(5) . "</a>";
+			$link .= PHP_EOL . $tab . Indent::_(4) . "<?php endif; ?>";
+		}
+		else
+		{
+			$link .= PHP_EOL . $tab . Indent::_(4) . "<?php echo " . $itemCode . "; ?>";
+		}
 		$link .= PHP_EOL . $tab . Indent::_(3) . "<?php endif; ?>";
 		// add class
 		if ($class)
@@ -11534,7 +11575,7 @@ class Interpretation extends Fields
 					. '<a class="hasTooltip btn btn-mini" href="index.php?option=com_'
 					. CFactory::_('Config')->component_code_name . '&view='
 					. $customLinkView['link'] . '&id=<?php echo $item->id; ?>'
-					. $ref . '" title="<?php echo Text:' . ':_(' . "'COM_"
+					. $ref . '" title="<?php echo Joomla__'.'_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_(' . "'COM_"
 					. CFactory::_('Compiler.Builder.Content.One')->get('COMPONENT') . '_' . $customLinkView['NAME'] . "'"
 					. '); ?>" ><span class="icon-' . $customLinkView['icon']
 					. '"></span></a>';
@@ -11560,14 +11601,12 @@ class Interpretation extends Fields
 	 * @param   array   $item          The item array
 	 * @param   string  $nameListCode  The list view code name
 	 * @param   bool    $doNotEscape   The do not escape global switch
-	 * @param   string  $escape        The escape code name
+	 * @param   string  $classPointer        The class pointer
 	 *
 	 * @return  string of the single item code
 	 *
 	 */
-	protected function getListItemCode(&$item, $nameListCode, $doNotEscape,
-	                                   $escape = '$this->escape'
-	)
+	protected function getListItemCode(&$item, $nameListCode, $doNotEscape, $classPointer = '$this->')
 	{
 		// first update the code id needed
 		if (isset($item['custom'])
@@ -11589,18 +11628,18 @@ class Interpretation extends Fields
 		// check if category
 		if ($item['type'] === 'category' && !$item['title'])
 		{
-			return $escape . '($item->category_title)';
+			return $classPointer .  'escape($item->category_title)';
 		}
 		// check if user
 		elseif ($item['type'] === 'user')
 		{
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
-				return 'Factory::getUser((int)$item->' . $item['code'] . ')->name';
+				return 'Joomla__'.'_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser((int)$item->' . $item['code'] . ')->name';
 			}
 			else
 			{
-				return 'Factory::getContainer()->'
+				return 'Joomla__'.'_39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->'
 					. 'get(Joomla__'.'_c2980d12_c3ef_4e23_b4a2_e6af1f5900a9___Power::class)->'
 					. 'loadUserById((int) $item->' . $item['code'] . ' ?? 0)->name';
 			}
@@ -11613,11 +11652,11 @@ class Interpretation extends Fields
 		{
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
-				return 'Factory::getUser((int)$item->' . $item['id_code'] . ')->name';
+				return 'Joomla__'.'_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser((int)$item->' . $item['id_code'] . ')->name';
 			}
 			else
 			{
-				return 'Factory::getContainer()->'
+				return 'Joomla__'.'_39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->'
 					. 'get(Joomla__'.'_c2980d12_c3ef_4e23_b4a2_e6af1f5900a9___Power::class)->'
 					. 'loadUserById((int) $item->' . $item['id_code'] . ' ?? 0)->name';
 			}
@@ -11626,7 +11665,7 @@ class Interpretation extends Fields
 		elseif (CFactory::_('Compiler.Builder.Selection.Translation')->
 			exists($nameListCode . '.' . $item['code']))
 		{
-			return 'Text:' . ':_($item->' . $item['code'] . ')';
+			return 'Joomla__'.'_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_($item->' . $item['code'] . ')';
 		}
 		elseif (isset($item['custom'])
 			&& ArrayHelper::check($item['custom'])
@@ -11634,11 +11673,11 @@ class Interpretation extends Fields
 		{
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
-				return 'Factory::getUser((int)$item->' . $item['code'] . ')->name';
+				return 'Joomla__'.'_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser((int)$item->' . $item['code'] . ')->name';
 			}
 			else
 			{
-				return 'Factory::getContainer()->'
+				return 'Joomla__'.'_39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->'
 					. 'get(Joomla__'.'_c2980d12_c3ef_4e23_b4a2_e6af1f5900a9___Power::class)->'
 					. 'loadUserById((int) $item->' . $item['code'] . ' ?? 0)->name';
 			}
@@ -11652,7 +11691,7 @@ class Interpretation extends Fields
 		}
 
 		// default
-		return $escape . '($item->' . $item['code'] . ')';
+		return $classPointer .  'escape($item->' . $item['code'] . ')';
 	}
 
 	/**
@@ -11668,8 +11707,7 @@ class Interpretation extends Fields
 	 *
 	 */
 	protected function getListItemLink($item, &$checkoutTriger,
-	                                   $nameSingleCode, $nameListCode, $ref = null
-	)
+		$nameSingleCode, $nameListCode, $ref = null)
 	{
 		// set referal if not set
 		$referal = '';
@@ -11744,14 +11782,20 @@ class Interpretation extends Fields
 	 * @param   array   $item            The item array
 	 * @param   string  $nameSingleCode  The single view code name
 	 * @param   string  $nameListCode    The list view code name
+	 * @param   string  $classPointer          The class pointer
 	 * @param   string  $user            The user code name
 	 *
 	 * @return  string of the single item link authority
 	 *
 	 */
-	protected function getListItemLinkAuthority($item, $nameSingleCode, $nameListCode, $user = '$this->user'
-	)
+	protected function getListItemLinkAuthority($item, $nameSingleCode, $nameListCode, $classPointer= '$this->', $user = '$this->user')
 	{
+		// add modal fix
+		$isModal = '';
+		if (CFactory::_('Config')->get('joomla_version', 3) !== 3)
+		{
+			$isModal = "!{$classPointer}isModal && ";
+		}
 		// if to be linked
 		if ($item['type'] === 'category' && !$item['title'])
 		{
@@ -11759,14 +11803,14 @@ class Interpretation extends Fields
 			$otherView = CFactory::_('Compiler.Builder.Category.Code')->getString("{$nameSingleCode}.view", 'error');
 
 			// return the authority to category
-			return $user . "->authorise('core.edit', 'com_"
+			return $isModal . $user . "->authorise('core.edit', 'com_"
 				. CFactory::_('Config')->component_code_name . "." . $otherView
 				. ".category.' . (int)\$item->" . $item['code'] . ")";
 		}
 		elseif ($item['type'] === 'user' && !$item['title'])
 		{
 			// return user authority
-			return $user . "->authorise('core.edit', 'com_users')";
+			return $isModal . $user . "->authorise('core.edit', 'com_users')";
 		}
 		elseif (isset($item['custom'])
 			&& ArrayHelper::check(
@@ -11779,13 +11823,13 @@ class Interpretation extends Fields
 			// do this with GUID
 			if (isset($item['custom']['id']) && $item['custom']['id'] !== 'id')
 			{
-				return $user . "->authorise('" . CFactory::_('Compiler.Creator.Permission')->getAction($item['custom']['view'], 'core.edit')
+				return $isModal . $user . "->authorise('" . CFactory::_('Compiler.Creator.Permission')->getAction($item['custom']['view'], 'core.edit')
 					. "', 'com_" . CFactory::_('Config')->component_code_name . "."
 					. $item['custom']['view'] . ".' . (int) \$item->" . $item['id_code'] . "_id)";
 			}
 			else
 			{
-				return $user . "->authorise('" . CFactory::_('Compiler.Creator.Permission')->getAction($item['custom']['view'], 'core.edit')
+				return $isModal . $user . "->authorise('" . CFactory::_('Compiler.Creator.Permission')->getAction($item['custom']['view'], 'core.edit')
 					. "', 'com_" . CFactory::_('Config')->component_code_name . "."
 					. $item['custom']['view'] . ".' . (int) \$item->" . $item['id_code'] . ")";
 			}
@@ -11799,11 +11843,11 @@ class Interpretation extends Fields
 			&& isset($item['id_code']))
 		{
 			// return user link
-			return $user . "->authorise('core.edit', 'com_users')";
+			return $isModal . $user . "->authorise('core.edit', 'com_users')";
 		}
 
 		// set core permissions.
-		return "\$canDo->get('" . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit') . "')";
+		return $isModal . "\$canDo->get('" . CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit') . "')";
 	}
 
 	/**
@@ -11869,7 +11913,7 @@ class Interpretation extends Fields
 		CFactory::_('Event')->trigger(
 			'jcb_ce_onSetDefaultViewsBodyTop', [&$body, &$nameSingleCode, &$nameListCode]
 		);
-		$body[] = "<form action=\"<?php echo Route::_('index.php?option=com_"
+		$body[] = "<form action=\"<?php echo Joomla__"."_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_"
 			. $component . "&view=" . $nameListCode
 			. "'); ?>\" method=\"post\" name=\"adminForm\" id=\"adminForm\">";
 		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
@@ -11900,7 +11944,7 @@ class Interpretation extends Fields
 			$body[] = "<?php";
 			// build code to add the trash helper layout
 			$addTrashHelper = Indent::_(1)
-				. "echo LayoutHelper::render('trashhelper', \$this);";
+				. "echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('trashhelper', \$this);";
 			// add the trash helper layout if found in JCB
 			if (CFactory::_('Templatelayout.Data')->set($addTrashHelper, $nameListCode))
 			{
@@ -11914,7 +11958,7 @@ class Interpretation extends Fields
 					__LINE__,__CLASS__
 				) . " Add the searchtools";
 			$body[] = Indent::_(1)
-				. "echo LayoutHelper::render('joomla.searchtools.default', array('view' => \$this));";
+				. "echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('joomla.searchtools.default', array('view' => \$this));";
 			$body[] = "?>";
 		}
 		$body[] = "<?php if (empty(\$this->items)): ?>";
@@ -11927,7 +11971,7 @@ class Interpretation extends Fields
 		$body[] = Indent::_(1)
 			. "<div class=\"alert alert-no-items\">";
 		$body[] = Indent::_(2)
-			. "<?php echo Text:" . ":_('JGLOBAL_NO_MATCHING_RESULTS'); ?>";
+			. "<?php echo Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>";
 		$body[] = Indent::_(1) . "</div>";
 		$body[] = "<?php else : ?>";
 		// check if the filter type is sidebar (1 = sidebar)
@@ -11956,7 +12000,7 @@ class Interpretation extends Fields
 			$body[] = Indent::_(3) . "'bootstrap.renderModal',";
 			$body[] = Indent::_(3) . "'collapseModal',";
 			$body[] = Indent::_(3) . "array(";
-			$body[] = Indent::_(4) . "'title' => Text:" . ":_('COM_" . $COMPONENT . "_"
+			$body[] = Indent::_(4) . "'title' => Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_" . $COMPONENT . "_"
 				. $VIEWS
 				. "_BATCH_OPTIONS'),";
 			$body[] = Indent::_(4)
@@ -11994,6 +12038,96 @@ class Interpretation extends Fields
 		return implode(PHP_EOL, $body);
 	}
 
+	/**
+	 * set the modal views body
+	 *
+	 * @param   string  $nameSingleCode
+	 * @param   string  $nameListCode
+	 *
+	 * @return string
+	 */
+	public function setModalViewsBody(string $nameSingleCode, string $nameListCode): string
+	{
+		// set component name
+		$component = CFactory::_('Config')->component_code_name;
+		$Component = ucfirst((string) $component);
+		$COMPONENT = strtoupper((string) $component);
+		// set uppercase view
+		$VIEWS = strtoupper($nameListCode);
+		// build the body
+		$body = [];
+		// Trigger Event: jcb_ce_onSetModalViewsBodyTop
+		CFactory::_('Event')->trigger(
+			'jcb_ce_onSetModalViewsBodyTop', [&$body, &$nameSingleCode, &$nameListCode]
+		);
+		$body[] = "<form action=\"<?php echo Joomla__"."_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_"
+			. $component . "&view=" . $nameListCode
+			. "&layout=modal&tmpl=component&titleKey=' . \$this->getModalTitleKey()); ?>\" method=\"post\" name=\"adminForm\" id=\"adminForm\">";
+		$body[] = Indent::_(1)
+			. "<div id=\"j-main-container\">";
+		// Trigger Event: jcb_ce_onSetModalViewsFormTop
+		CFactory::_('Event')->trigger(
+			'jcb_ce_onSetModalViewsFormTop', [&$body, &$nameSingleCode, &$nameListCode]
+		);
+		// check if the filter type is sidebar (2 = topbar)
+		if (CFactory::_('Compiler.Builder.Admin.Filter.Type')->get($nameListCode, 1) == 2)
+		{
+			$body[] = "<?php";
+			// build code to add the trash helper layout
+			$addTrashHelper = Indent::_(1)
+				. "echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('trashhelper', \$this);";
+			// add the trash helper layout if found in JCB
+			if (CFactory::_('Templatelayout.Data')->set($addTrashHelper, $nameListCode))
+			{
+				$body[] = Indent::_(1) . "//" . Line::_(
+						__LINE__,__CLASS__
+					) . " Add the trash helper layout";
+				$body[] = $addTrashHelper;
+			}
+			// add the new search toolbar ;)
+			$body[] = Indent::_(1) . "//" . Line::_(
+					__LINE__,__CLASS__
+				) . " Add the searchtools";
+			$body[] = Indent::_(1)
+				. "echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('joomla.searchtools.default', array('view' => \$this));";
+			$body[] = "?>";
+		}
+		$body[] = "<?php if (empty(\$this->items)): ?>";
+		$body[] = Indent::_(1)
+			. "<div class=\"alert alert-no-items\">";
+		$body[] = Indent::_(2)
+			. "<?php echo Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>";
+		$body[] = Indent::_(1) . "</div>";
+		$body[] = "<?php else : ?>";
+		$body[] = Indent::_(1) . "<table class=\"table table-striped\" id=\""
+			. $nameSingleCode . "List\">";
+		$body[] = Indent::_(2)
+			. "<thead><?php echo \$this->loadTemplate('head');?></thead>";
+		$body[] = Indent::_(2)
+			. "<tfoot><?php echo \$this->loadTemplate('foot');?></tfoot>";
+		$body[] = Indent::_(2)
+			. "<tbody><?php echo \$this->loadTemplate('body');?></tbody>";
+		$body[] = Indent::_(1) . "</table>";
+		$body[] = Indent::_(1)
+			. "<input type=\"hidden\" name=\"boxchecked\" value=\"0\" />";
+		$body[] = Indent::_(1) . "</div>";
+		$body[] = "<?php endif; ?>";
+		$body[] = Indent::_(1)
+			. "<input type=\"hidden\" name=\"task\" value=\"\" />";
+		$body[] = Indent::_(1) . "<?php echo Html::_('form.token'); ?>";
+		// Trigger Event: jcb_ce_onSetDefaultViewsFormBottom
+		CFactory::_('Event')->trigger(
+			'jcb_ce_onSetModalViewsFormBottom', [&$body, &$nameSingleCode, &$nameListCode]
+		);
+		$body[] = "</form>";
+		// Trigger Event: jcb_ce_onSetModalViewsBodyBottom
+		CFactory::_('Event')->trigger(
+			'jcb_ce_onSetDefaultViewsBodyBottom', [&$body, &$nameSingleCode, &$nameListCode]
+		);
+
+		return implode(PHP_EOL, $body);
+	}
+
 	/**
 	 * set the list body table head
 	 *
@@ -12017,6 +12151,12 @@ class Interpretation extends Fields
 				$jhtml_sort_icon   = "";
 				$jhtml_sort_icon_2 = ", 'icon-menu-2'";
 			}
+			// Target the J5+
+			$allowSortingWhen = "<?php if (\$this->canEdit && \$this->canState): ?>";
+			if (CFactory::_('Config')->get('joomla_version', 3) !== 3)
+			{
+				$allowSortingWhen = "<?php if (!\$this->isModal && \$this->canEdit && \$this->canState): ?>";
+			}
 			// main lang prefix
 			$langView = CFactory::_('Config')->lang_prefix . '_'
 				. StringHelper::safe($nameSingleCode, 'U');
@@ -12030,8 +12170,7 @@ class Interpretation extends Fields
 			CFactory::_('Language')->set(CFactory::_('Config')->lang_target, $idLangName, 'Id');
 			// set default
 			$head = '<tr>';
-			$head .= PHP_EOL . Indent::_(1)
-				. "<?php if (\$this->canEdit&& \$this->canState): ?>";
+			$head .= PHP_EOL . Indent::_(1) . $allowSortingWhen;
 			if (!CFactory::_('Compiler.Builder.Field.Names')->isString($nameSingleCode . '.ordering'))
 			{
 				$head .= PHP_EOL . Indent::_(2)
@@ -12068,7 +12207,7 @@ class Interpretation extends Fields
 				{
 					// check if we have an over-ride
 					if (($list_head_override = CFactory::_('Compiler.Builder.List.Head.Override')->
-						get($nameListCode . '.' . (int) $item['id'])) !== null)
+						get($nameListCode . '.' . $item['guid'])) !== null)
 					{
 						$item['lang'] = $list_head_override;
 					}
@@ -12096,26 +12235,22 @@ class Interpretation extends Fields
 						{
 							// keep an eye on this
 							$title = "<?php echo Html::_('" . $jhtml_sort
-								. "', '"
-								. $item['lang'] . "', '" . $item['custom']['db']
+								. "', '" . $item['lang'] . "', '" . $item['custom']['db']
 								. "." . $item['custom']['text']
 								. "', \$this->listDirn, \$this->listOrder); ?>";
 						}
 						else
 						{
 							$title = "<?php echo Html::_('" . $jhtml_sort
-								. "', '"
-								. $item['lang'] . "', 'a." . $item['code']
+								. "', '" . $item['lang'] . "', 'a." . $item['code']
 								. "', \$this->listDirn, \$this->listOrder); ?>";
 						}
 					}
 					else
 					{
-						$title = "<?php echo Text:" . ":_('" . $item['lang']
-							. "'); ?>";
+						$title = "<?php echo Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $item['lang'] . "'); ?>";
 					}
-					$head .= PHP_EOL . Indent::_(1) . '<th class="' . $class
-						. '" >';
+					$head .= PHP_EOL . Indent::_(1) . '<th class="' . $class . '" >';
 					$head .= PHP_EOL . Indent::_(3) . $title;
 					$head .= PHP_EOL . Indent::_(1) . "</th>";
 					$this->listColnrBuilder[$nameListCode]++;
@@ -12136,7 +12271,7 @@ class Interpretation extends Fields
 				$head .= PHP_EOL . Indent::_(1) . "<?php else: ?>";
 				$head .= PHP_EOL . Indent::_(2)
 					. '<th width="10" class="nowrap center" >';
-				$head .= PHP_EOL . Indent::_(3) . "<?php echo Text:" . ":_('"
+				$head .= PHP_EOL . Indent::_(3) . "<?php echo Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 					. $statusLangName . "'); ?>";
 				$head .= PHP_EOL . Indent::_(2) . "</th>";
 				$head .= PHP_EOL . Indent::_(1) . "<?php endif; ?>";
@@ -12205,8 +12340,7 @@ class Interpretation extends Fields
 					// add the alignemnt key
 					$alignmentArray[] = PHP_EOL . Indent::_(3) . "'"
 						. $this->alignmentOptions[$alignment] . "' => array("
-						. implode(',', $fieldArray) . PHP_EOL . Indent::_(3)
-						. ")";
+						. implode(',', $fieldArray) . PHP_EOL . Indent::_(3) . ")";
 				}
 				// add the layout key
 				$layoutArray[] = PHP_EOL . Indent::_(2) . "'"
@@ -12396,7 +12530,7 @@ class Interpretation extends Fields
 			$body .= PHP_EOL . Indent::_(1) . "<?php \$this->tab_name = '"
 				. $nameSingleCode . "Tab'; ?>";
 			$body .= PHP_EOL . Indent::_(1)
-				. "<?php echo LayoutHelper::render('joomla.edit.params', \$this); ?>";
+				. "<?php echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('joomla.edit.params', \$this); ?>";
 			// add the publish and meta data tabs
 			$body .= $this->getEditBodyPublishMetaTabs(
 				$nameSingleCode, $langView
@@ -12635,7 +12769,7 @@ class Interpretation extends Fields
 							{
 								$tabs[$tabCodeName][(int) $alignment] = '';
 							}
-							$tabs[$tabCodeName][(int) $alignment] .= "<?php echo LayoutHelper::render('"
+							$tabs[$tabCodeName][(int) $alignment] .= "<?php echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('"
 								. $nameSingleCode . "." . $layoutCodeName
 								. "', \$this); ?>";
 							break;
@@ -12652,7 +12786,7 @@ class Interpretation extends Fields
 							{
 								$tabs[$tabCodeName][(int) $alignment] = '';
 							}
-							$tabs[$tabCodeName][(int) $alignment] .= "<?php echo LayoutHelper::render('"
+							$tabs[$tabCodeName][(int) $alignment] .= "<?php echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('"
 								. $nameSingleCode . "." . $layoutCodeName
 								. "', \$this); ?>";
 							break;
@@ -12664,7 +12798,7 @@ class Interpretation extends Fields
 							);
 							// load to header
 							$header .= PHP_EOL
-								. "<?php echo LayoutHelper::render('"
+								. "<?php echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('"
 								. $nameSingleCode . "." . $layoutCodeName
 								. "', \$this); ?>";
 							break;
@@ -12677,7 +12811,7 @@ class Interpretation extends Fields
 							// load to footer
 							$footer .= PHP_EOL . PHP_EOL
 								. "<div class=\"clearfix\"></div>" . PHP_EOL
-								. "<?php echo LayoutHelper::render('"
+								. "<?php echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('"
 								. $nameSingleCode . "." . $layoutCodeName
 								. "', \$this); ?>";
 							break;
@@ -12690,7 +12824,7 @@ class Interpretation extends Fields
 							);
 							// load the body
 							$leftside .= PHP_EOL . Indent::_(2)
-								. "<?php echo LayoutHelper::render('"
+								. "<?php echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('"
 								. $nameSingleCode . "." . $layoutCodeName
 								. "', \$this); ?>";
 							break;
@@ -12703,7 +12837,7 @@ class Interpretation extends Fields
 							);
 							// load the body
 							$rightside .= PHP_EOL . Indent::_(2)
-								. "<?php echo LayoutHelper::render('"
+								. "<?php echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('"
 								. $nameSingleCode . "." . $layoutCodeName
 								. "', \$this); ?>";
 							break;
@@ -12741,7 +12875,7 @@ class Interpretation extends Fields
 				{
 					$tabs[$tabCodeName][3] = '';
 				}
-				$tabs[$tabCodeName][3] .= "<?php echo LayoutHelper::render('"
+				$tabs[$tabCodeName][3] .= "<?php echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('"
 					. $nameSingleCode . "." . $layoutCodeName
 					. "', \$this); ?>";
 			}
@@ -13079,7 +13213,7 @@ class Interpretation extends Fields
 				$tabs .= PHP_EOL . Indent::_(3) . '<div class="' . $classs
 					. '">';
 				$tabs .= PHP_EOL . Indent::_(4)
-					. "<?php echo LayoutHelper::render('" . $nameSingleCode
+					. "<?php echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('" . $nameSingleCode
 					. "." . $tabCodeNameLeft . "', \$this); ?>";
 				$tabs .= PHP_EOL . Indent::_(3) . "</div>";
 			}
@@ -13088,7 +13222,7 @@ class Interpretation extends Fields
 				$tabs .= PHP_EOL . Indent::_(3) . '<div class="' . $classs
 					. '">';
 				$tabs .= PHP_EOL . Indent::_(4)
-					. "<?php echo LayoutHelper::render('" . $nameSingleCode
+					. "<?php echo Joomla__"."_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('" . $nameSingleCode
 					. "." . $tabCodeNameRight . "', \$this); ?>";
 				$tabs .= PHP_EOL . Indent::_(3) . "</div>";
 			}
@@ -13462,7 +13596,7 @@ class Interpretation extends Fields
 			$headerscript .= PHP_EOL . '//' . Line::_(__Line__, __Class__)
 				. ' check for a return value';
 			$headerscript .= PHP_EOL
-				. '$jinput = Factory::getApplication()->input;';
+				. '$jinput = Joomla__'.'_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input;';
 			$headerscript .= PHP_EOL
 				. "if (\$_return = \$jinput->get('return', null, 'base64'))";
 			$headerscript .= PHP_EOL . '{';
@@ -13742,12 +13876,12 @@ class Interpretation extends Fields
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
 				$body .= PHP_EOL . Indent::_(2)
-					. "\$userChkOut = Factory::getUser(\$item->checked_out);";
+					. "\$userChkOut = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser(\$item->checked_out);";
 			}
 			else
 			{
 				$body .= PHP_EOL . Indent::_(2)
-					. "\$userChkOut = Factory::getContainer()->";
+					. "\$userChkOut = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->";
 				$body .= PHP_EOL . Indent::_(3)
 					. "get(Joomla__"."_c2980d12_c3ef_4e23_b4a2_e6af1f5900a9___Power::class)->";
 				$body .= PHP_EOL . Indent::_(4)
@@ -13778,7 +13912,7 @@ class Interpretation extends Fields
 					$itemRow = $this->getListItemBuilder(
 						$item, $nameSingleCode, $nameListCode, $itemClass,
 						$doNotEscape, false, $ref,
-						'$displayData->escape', '$user', $refview
+						'$displayData->', '$user', $refview
 					);
 					// check if buttons was aready added
 					if ($firstTimeBeingAdded) // TODO we must improve this to allow more items to be targeted instead of just the first item :)
@@ -13816,7 +13950,7 @@ class Interpretation extends Fields
 					. '<span class="status-metro status-published" title="<?php echo Text:'
 					. ':_(' . "'" . CFactory::_('Config')->lang_prefix . "_PUBLISHED'"
 					. ');  ?>">';
-				$body .= PHP_EOL . Indent::_(5) . '<?php echo Text:' . ':_('
+				$body .= PHP_EOL . Indent::_(5) . '<?php echo Joomla__'.'_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('
 					. "'"
 					. CFactory::_('Config')->lang_prefix . "_PUBLISHED'" . '); ?>';
 				$body .= PHP_EOL . Indent::_(4) . '</span>';
@@ -13830,7 +13964,7 @@ class Interpretation extends Fields
 					. '<span class="status-metro status-inactive" title="<?php echo Text:'
 					. ':_(' . "'" . CFactory::_('Config')->lang_prefix . "_INACTIVE'"
 					. ');  ?>">';
-				$body .= PHP_EOL . Indent::_(5) . '<?php echo Text:' . ':_('
+				$body .= PHP_EOL . Indent::_(5) . '<?php echo Joomla__'.'_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('
 					. "'"
 					. CFactory::_('Config')->lang_prefix . "_INACTIVE'" . '); ?>';
 				$body .= PHP_EOL . Indent::_(4) . '</span>';
@@ -13844,7 +13978,7 @@ class Interpretation extends Fields
 					. '<span class="status-metro status-archived" title="<?php echo Text:'
 					. ':_(' . "'" . CFactory::_('Config')->lang_prefix . "_ARCHIVED'"
 					. ');  ?>">';
-				$body .= PHP_EOL . Indent::_(5) . '<?php echo Text:' . ':_('
+				$body .= PHP_EOL . Indent::_(5) . '<?php echo Joomla__'.'_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('
 					. "'"
 					. CFactory::_('Config')->lang_prefix . "_ARCHIVED'" . '); ?>';
 				$body .= PHP_EOL . Indent::_(4) . '</span>';
@@ -13858,7 +13992,7 @@ class Interpretation extends Fields
 					. '<span class="status-metro status-trashed" title="<?php echo Text:'
 					. ':_(' . "'" . CFactory::_('Config')->lang_prefix . "_TRASHED'"
 					. ');  ?>">';
-				$body .= PHP_EOL . Indent::_(5) . '<?php echo Text:' . ':_('
+				$body .= PHP_EOL . Indent::_(5) . '<?php echo Joomla__'.'_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('
 					. "'"
 					. CFactory::_('Config')->lang_prefix . "_TRASHED'" . '); ?>';
 				$body .= PHP_EOL . Indent::_(4) . '</span>';
@@ -13894,7 +14028,7 @@ class Interpretation extends Fields
 			$body .= PHP_EOL . '<?php else: ?>';
 			$body .= PHP_EOL . Indent::_(1)
 				. '<div class="alert alert-no-items">';
-			$body .= PHP_EOL . Indent::_(2) . '<?php echo Text:' . ':_('
+			$body .= PHP_EOL . Indent::_(2) . '<?php echo Joomla__'.'_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('
 				. "'JGLOBAL_NO_MATCHING_RESULTS'" . '); ?>';
 			$body .= PHP_EOL . Indent::_(1) . '</div>';
 			$body .= PHP_EOL . '<?php endif; ?>';
@@ -14010,7 +14144,7 @@ class Interpretation extends Fields
 				{
 					// check if we have an over-ride
 					if (($list_head_override = CFactory::_('Compiler.Builder.List.Head.Override')->
-						get($nameListCode . '.' . (int) $item['id'])) !== null)
+						get($nameListCode . '.' . $item['guid'])) !== null)
 					{
 						$item['lang'] = $list_head_override;
 					}
@@ -14051,7 +14185,7 @@ class Interpretation extends Fields
 			{
 				$head .= PHP_EOL . Indent::_(2) . '<th width="10" ' . $data_hide
 					. '>';
-				$head .= PHP_EOL . Indent::_(3) . "<?php echo Text:" . ":_('"
+				$head .= PHP_EOL . Indent::_(3) . "<?php echo Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 					. $statusLangName . "'); ?>";
 				$head .= PHP_EOL . Indent::_(2) . "</th>";
 			}
@@ -14118,17 +14252,17 @@ class Interpretation extends Fields
 			. " Get the user object.";
 		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 		{
-			$query .= PHP_EOL . Indent::_(2) . "\$user = Factory::getUser();";
+			$query .= PHP_EOL . Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 		}
 		else
 		{
-			$query .= PHP_EOL . Indent::_(2) . "\$user = Factory::getApplication()->getIdentity();";
+			$query .= PHP_EOL . Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 		}
 		$query .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
 			. " Create a new query object.";
 		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 		{
-			$query .= PHP_EOL . Indent::_(2) . "\$db = Factory::getDBO();";
+			$query .= PHP_EOL . Indent::_(2) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDBO();";
 		}
 		else
 		{
@@ -14633,7 +14767,7 @@ class Interpretation extends Fields
 				$buttons[] = Indent::_(2) . "{";
 				$buttons[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 					. " add " . $custom_button['name'] . " button.";
-				$buttons[] = Indent::_(3) . "ToolbarHelper::custom('"
+				$buttons[] = Indent::_(3) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('"
 					. $nameListCode . ".redirectTo"
 					. StringHelper::safe(
 						$custom_button['link'], 'F'
@@ -14685,11 +14819,11 @@ class Interpretation extends Fields
 					. " check if export is allowed for this user.";
 				if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 				{
-					$method[] = Indent::_(2) . "\$user = Factory::getUser();";
+					$method[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 				}
 				else
 				{
-					$method[] = Indent::_(2) . "\$user = Factory::getApplication()->getIdentity();";
+					$method[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 				}
 				$method[] = Indent::_(2) . "if (\$user->authorise('"
 					. $custom_button['link'] . ".access', 'com_"
@@ -14698,7 +14832,7 @@ class Interpretation extends Fields
 				$method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 					. " Get the input";
 				$method[] = Indent::_(3)
-					. "\$input = Factory::getApplication()->input;";
+					. "\$input = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input;";
 				$method[] = Indent::_(3)
 					. "\$pks = \$input->post->get('cid', array(), 'array');";
 				$method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
@@ -14709,18 +14843,18 @@ class Interpretation extends Fields
 					. " convert to string";
 				$method[] = Indent::_(3) . "\$ids = implode('_', \$pks);";
 				$method[] = Indent::_(3)
-					. "\$this->setRedirect(Route::_('index.php?option=com_"
+					. "\$this->setRedirect(Joomla__"."_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_"
 					. CFactory::_('Config')->component_code_name . "&view="
 					. $custom_button['link'] . "&cid='.\$ids, false));";
 				$method[] = Indent::_(3) . "return;";
 				$method[] = Indent::_(2) . "}";
 				$method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
 					. " Redirect to the list screen with error.";
-				$method[] = Indent::_(2) . "\$message = Text:" . ":_('"
+				$method[] = Indent::_(2) . "\$message = Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 					. CFactory::_('Config')->lang_prefix . "_ACCESS_TO_" . $custom_button['NAME']
 					. "_FAILED');";
 				$method[] = Indent::_(2)
-					. "\$this->setRedirect(Route::_('index.php?option=com_"
+					. "\$this->setRedirect(Joomla__"."_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_"
 					. CFactory::_('Config')->component_code_name . "&view=" . $nameListCode
 					. "', false), \$message, 'error');";
 				$method[] = Indent::_(2) . "return;";
@@ -14796,7 +14930,7 @@ class Interpretation extends Fields
 			$query .= PHP_EOL . Indent::_(3) . "{";
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
-				$query .= PHP_EOL . Indent::_(4) . "\$user = Factory::getUser();";
+				$query .= PHP_EOL . Indent::_(4) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 			}
 			else
 			{
@@ -14807,7 +14941,7 @@ class Interpretation extends Fields
 				. " Create a new query object.";
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
-				$query .= PHP_EOL . Indent::_(3) . "\$db = Factory::getDBO();";
+				$query .= PHP_EOL . Indent::_(3) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDBO();";
 			}
 			else
 			{
@@ -15039,11 +15173,11 @@ class Interpretation extends Fields
 				. " check if export is allowed for this user.";
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
-				$method[] = Indent::_(2) . "\$user = Factory::getUser();";
+				$method[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 			}
 			else
 			{
-				$method[] = Indent::_(2) . "\$user = Factory::getApplication()->getIdentity();";
+				$method[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 			}
 			$method[] = Indent::_(2) . "if (\$user->authorise('"
 				. $nameSingleCode . ".export', 'com_"
@@ -15054,7 +15188,7 @@ class Interpretation extends Fields
 			$method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " Get the input";
 			$method[] = Indent::_(3)
-				. "\$input = Factory::getApplication()->input;";
+				. "\$input = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input;";
 			$method[] = Indent::_(3)
 				. "\$pks = \$input->post->get('cid', array(), 'array');";
 			$method[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
@@ -15074,7 +15208,7 @@ class Interpretation extends Fields
 			$method[] = Indent::_(3) . "{";
 			$method[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 				. " now set the data to the spreadsheet";
-			$method[] = Indent::_(4) . "\$date = Factory::getDate();";
+			$method[] = Indent::_(4) . "\$date = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDate();";
 			$method[] = Indent::_(4) . CFactory::_('Compiler.Builder.Content.One')->get('Component') . "Helper::xls(\$data,'"
 				. StringHelper::safe($nameListCode, 'F')
 				. "_'.\$date->format('jS_F_Y'),'"
@@ -15086,10 +15220,10 @@ class Interpretation extends Fields
 			$method[] = Indent::_(2) . "}";
 			$method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
 				. " Redirect to the list screen with error.";
-			$method[] = Indent::_(2) . "\$message = Text:" . ":_('"
+			$method[] = Indent::_(2) . "\$message = Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 				. CFactory::_('Config')->lang_prefix . "_EXPORT_FAILED');";
 			$method[] = Indent::_(2)
-				. "\$this->setRedirect(Route::_('index.php?option=com_"
+				. "\$this->setRedirect(Joomla__"."_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_"
 				. CFactory::_('Config')->component_code_name . "&view=" . $nameListCode
 				. "', false), \$message, 'error');";
 			$method[] = Indent::_(2) . "return;";
@@ -15107,11 +15241,11 @@ class Interpretation extends Fields
 				. " check if import is allowed for this user.";
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
-				$method[] = Indent::_(2) . "\$user = Factory::getUser();";
+				$method[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 			}
 			else
 			{
-				$method[] = Indent::_(2) . "\$user = Factory::getApplication()->getIdentity();";
+				$method[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 			}
 			$method[] = Indent::_(2) . "if (\$user->authorise('"
 				. $nameSingleCode . ".import', 'com_"
@@ -15133,7 +15267,7 @@ class Interpretation extends Fields
 			$method[] = Indent::_(3) . "{";
 			$method[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 				. " Load headers to session.";
-			$method[] = Indent::_(4) . "\$session = Factory::getSession();";
+			$method[] = Indent::_(4) . "\$session = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getSession();";
 			$method[] = Indent::_(4) . "\$headers = json_encode(\$headers);";
 			$method[] = Indent::_(4) . "\$session->set('" . $nameSingleCode
 				. "_VDM_IMPORTHEADERS', \$headers);";
@@ -15152,21 +15286,21 @@ class Interpretation extends Fields
 				CFactory::_('Config')->lang_target, $selectImportFileNote,
 				'Select the file to import data to ' . $nameListCode . '.'
 			);
-			$method[] = Indent::_(4) . "\$message = Text:" . ":_('"
+			$method[] = Indent::_(4) . "\$message = Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 				. $selectImportFileNote . "');";
 			// if this view has custom script it must have as custom import (model, veiw, controller)
 			if (isset($this->importCustomScripts[$nameListCode])
 				&& $this->importCustomScripts[$nameListCode])
 			{
 				$method[] = Indent::_(4)
-					. "\$this->setRedirect(Route::_('index.php?option=com_"
+					. "\$this->setRedirect(Joomla__"."_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_"
 					. CFactory::_('Config')->component_code_name . "&view=import_"
 					. $nameListCode . "', false), \$message);";
 			}
 			else
 			{
 				$method[] = Indent::_(4)
-					. "\$this->setRedirect(Route::_('index.php?option=com_"
+					. "\$this->setRedirect(Joomla__"."_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_"
 					. CFactory::_('Config')->component_code_name
 					. "&view=import', false), \$message);";
 			}
@@ -15175,10 +15309,10 @@ class Interpretation extends Fields
 			$method[] = Indent::_(2) . "}";
 			$method[] = Indent::_(2) . "//" . Line::_(__Line__, __Class__)
 				. " Redirect to the list screen with error.";
-			$method[] = Indent::_(2) . "\$message = Text:" . ":_('"
+			$method[] = Indent::_(2) . "\$message = Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 				. CFactory::_('Config')->lang_prefix . "_IMPORT_FAILED');";
 			$method[] = Indent::_(2)
-				. "\$this->setRedirect(Route::_('index.php?option=com_"
+				. "\$this->setRedirect(Joomla__"."_d4c76099_4c32_408a_8701_d0a724484dfd___Power::_('index.php?option=com_"
 				. CFactory::_('Config')->component_code_name . "&view=" . $nameListCode
 				. "', false), \$message, 'error');";
 			$method[] = Indent::_(2) . "return;";
@@ -15207,7 +15341,7 @@ class Interpretation extends Fields
 				. "if (\$this->canDo->get('core.export') && \$this->canDo->get('"
 				. $nameSingleCode . ".export'))";
 			$button[] = Indent::_(3) . "{";
-			$button[] = Indent::_(4) . "ToolbarHelper::custom('"
+			$button[] = Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('"
 				. $nameListCode . ".exportData', 'download', '', '"
 				. $langExport . "', true);";
 			$button[] = Indent::_(3) . "}";
@@ -15235,7 +15369,7 @@ class Interpretation extends Fields
 				. "if (\$this->canDo->get('core.import') && \$this->canDo->get('"
 				. $nameSingleCode . ".import'))";
 			$button[] = Indent::_(2) . "{";
-			$button[] = Indent::_(3) . "ToolbarHelper::custom('"
+			$button[] = Indent::_(3) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('"
 				. $nameListCode . ".importData', 'upload', '', '"
 				. $langImport
 				. "', false);";
@@ -15328,7 +15462,7 @@ class Interpretation extends Fields
 		$query = "//" . Line::_(__Line__, __Class__) . " Get the user object.";
 		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 		{
-			$query .= PHP_EOL . Indent::_(2) . "\$user = Factory::getUser();";
+			$query .= PHP_EOL . Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 		}
 		else
 		{
@@ -15338,7 +15472,7 @@ class Interpretation extends Fields
 			. " Create a new query object.";
 		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 		{
-			$query .= PHP_EOL . Indent::_(2) . "\$db = Factory::getDBO();";
+			$query .= PHP_EOL . Indent::_(2) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDBO();";
 		}
 		else
 		{
@@ -17651,11 +17785,11 @@ class Interpretation extends Fields
 						. " Get a db connection.";
 					if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 					{
-						$function[] = Indent::_(2) . "\$db = Factory::getDbo();";
+						$function[] = Indent::_(2) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 					}
 					else
 					{
-						$function[] = Indent::_(2) . "\$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);";
+						$function[] = Indent::_(2) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(\Joomla\Database\DatabaseInterface::class);";
 					}
 					$function[] = PHP_EOL . Indent::_(2) . "//"
 						. Line::_(__Line__, __Class__)
@@ -17723,7 +17857,7 @@ class Interpretation extends Fields
 					  $function[] = PHP_EOL.Indent::_(1) . "protected function getThe".$filter['function'].StringHelper::safe($filter['custom']['text'],'F')."Selections()";
 					  $function[] = Indent::_(1) . "{";
 					  $function[] = Indent::_(2) . "//".Line::_(__Line__, __Class__)." Get a db connection.";
-					  $function[] = Indent::_(2) . "\$db = Factory::getDbo();";
+					  $function[] = Indent::_(2) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 					  $function[] = PHP_EOL.Indent::_(2) . "//".Line::_(__Line__, __Class__)." Select the text.";
 					  $function[] = Indent::_(2) . "\$query = \$db->getQuery(true);";
 					  $function[] = PHP_EOL.Indent::_(2) . "//".Line::_(__Line__, __Class__)." Select the text.";
@@ -17742,8 +17876,8 @@ class Interpretation extends Fields
 					  $function[] = Indent::_(3) . "{";
 					  if ($filter['custom']['text'] === 'user')
 					  {
-					  $function[] = Indent::_(4) . "\$filter[] = Html::_('select.option', \$result->".$filter['custom']['text'].", Factory::getUser(\$result->".$filter['custom']['text'].")->name);";
-					  $function[] = Indent::_(4) . "\$batch[] = Html::_('select.option', \$result->".$filter['custom']['id'].", Factory::getUser(\$result->".$filter['custom']['text'].")->name);";
+					  $function[] = Indent::_(4) . "\$filter[] = Html::_('select.option', \$result->".$filter['custom']['text'].", Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser(\$result->".$filter['custom']['text'].")->name);";
+					  $function[] = Indent::_(4) . "\$batch[] = Html::_('select.option', \$result->".$filter['custom']['id'].", Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser(\$result->".$filter['custom']['text'].")->name);";
 					  }
 					  else
 					  {
@@ -17785,11 +17919,11 @@ class Interpretation extends Fields
 					}
 					if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 					{
-						$function[] = Indent::_(2) . "\$db = Factory::getDbo();";
+						$function[] = Indent::_(2) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 					}
 					else
 					{
-						$function[] = Indent::_(2) . "\$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);";
+						$function[] = Indent::_(2) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(\Joomla\Database\DatabaseInterface::class);";
 					}
 					$function[] = PHP_EOL . Indent::_(2) . "//"
 						. Line::_(__Line__, __Class__)
@@ -17900,7 +18034,7 @@ class Interpretation extends Fields
 							. " and its text to the options array";
 						$function[] = Indent::_(4)
 							. "\$_filter[] = Html::_('select.option', \$"
-							. $filter['code'] . ", Text:" . ":_(\$_text));";
+							. $filter['code'] . ", Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_(\$_text));";
 					}
 					elseif ($filter['type'] === 'user')
 					{
@@ -17912,7 +18046,7 @@ class Interpretation extends Fields
 						{
 							$function[] = Indent::_(4)
 								. "\$_filter[] = Html::_('select.option', \$"
-								. $filter['code'] . ", Factory::getUser(\$"
+								. $filter['code'] . ", Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser(\$"
 								. $filter['code'] . ")->name);";
 						}
 						else
@@ -17921,7 +18055,7 @@ class Interpretation extends Fields
 								. "\$_filter[] = Html::_('select.option', \$"
 								. $filter['code'] . ",";
 							$function[] = Indent::_(5)
-								. "Factory::getContainer()->";
+								. "Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->";
 								$function[] = Indent::_(5)
 									. "get(Joomla__"."_c2980d12_c3ef_4e23_b4a2_e6af1f5900a9___Power::class)->";
 								$function[] = Indent::_(5)
@@ -18516,7 +18650,7 @@ class Interpretation extends Fields
 			. "if (\$this->canState && \$this->canBatch)";
 		$batch[] = Indent::_(2) . "{";
 		$batch[] = Indent::_(3) . "JHtmlBatch_::addListSelection(";
-		$batch[] = Indent::_(4) . "Text:" . ":_('COM_" . $COPMONENT
+		$batch[] = Indent::_(4) . "Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_" . $COPMONENT
 			. "_KEEP_ORIGINAL_STATE'),";
 		$batch[] = Indent::_(4) . "'batch[published]',";
 		$batch[] = Indent::_(4)
@@ -18534,7 +18668,7 @@ class Interpretation extends Fields
 				. "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)";
 			$batch[] = Indent::_(2) . "{";
 			$batch[] = Indent::_(3) . "JHtmlBatch_::addListSelection(";
-			$batch[] = Indent::_(4) . "Text:" . ":_('COM_" . $COPMONENT
+			$batch[] = Indent::_(4) . "Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_" . $COPMONENT
 				. "_KEEP_ORIGINAL_ACCESS'),";
 			$batch[] = Indent::_(4) . "'batch[access]',";
 			$batch[] = Indent::_(4)
@@ -18567,7 +18701,7 @@ class Interpretation extends Fields
 			$batch[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " Category Batch selection.";
 			$batch[] = Indent::_(3) . "JHtmlBatch_::addListSelection(";
-			$batch[] = Indent::_(4) . "Text:" . ":_('COM_" . $COPMONENT
+			$batch[] = Indent::_(4) . "Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('COM_" . $COPMONENT
 				. "_KEEP_ORIGINAL_CATEGORY'),";
 			$batch[] = Indent::_(4) . "'batch[category]',";
 			$batch[] = Indent::_(4)
@@ -18728,7 +18862,7 @@ class Interpretation extends Fields
 				get($nameListCode . '.view', $nameSingleCode);
 			// setup the category script
 			$getForm[] = PHP_EOL . Indent::_(2)
-				. "\$jinput = Factory::getApplication()->input;";
+				. "\$jinput = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input;";
 			$getForm[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
 					__LINE__,__CLASS__
 				)
@@ -18782,12 +18916,12 @@ class Interpretation extends Fields
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
 				$getForm[] = PHP_EOL . Indent::_(2)
-					. "\$user = Factory::getUser();";
+					. "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 			}
 			else
 			{
 				$getForm[] = PHP_EOL . Indent::_(2)
-					. "\$user = Factory::getApplication()->getIdentity();";
+					. "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 			}
 			$getForm[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
 					__LINE__,__CLASS__
@@ -18829,7 +18963,7 @@ class Interpretation extends Fields
 		else
 		{
 			$getForm[] = PHP_EOL . Indent::_(2)
-				. "\$jinput = Factory::getApplication()->input;";
+				. "\$jinput = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input;";
 			$getForm[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
 					__LINE__,__CLASS__
 				)
@@ -18848,12 +18982,12 @@ class Interpretation extends Fields
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
 				$getForm[] = PHP_EOL . Indent::_(2)
-					. "\$user = Factory::getUser();";
+					. "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 			}
 			else
 			{
 				$getForm[] = PHP_EOL . Indent::_(2)
-					. "\$user = Factory::getApplication()->getIdentity();";
+					. "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 			}
 			$getForm[] = PHP_EOL . Indent::_(2) . "//" . Line::_(
 					__LINE__,__CLASS__
@@ -19236,11 +19370,11 @@ class Interpretation extends Fields
 				. " Check specific edit permission then general edit permission.";
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
-				$allow[] = Indent::_(2) . "\$user = Factory::getUser();";
+				$allow[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 			}
 			else
 			{
-				$allow[] = Indent::_(2) . "\$user = Factory::getApplication()->getIdentity();";
+				$allow[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 			}
 			// load custom permission script
 			$allow[] = $customAllow;
@@ -19259,11 +19393,11 @@ class Interpretation extends Fields
 			{
 				if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 				{
-					$allow[] = Indent::_(2) . "\$user = Factory::getUser();";
+					$allow[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 				}
 				else
 				{
-					$allow[] = Indent::_(2) . "\$user = Factory::getApplication()->getIdentity();";
+					$allow[] = Indent::_(2) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 				}
 			}
 			// load custom permission script
@@ -19271,14 +19405,14 @@ class Interpretation extends Fields
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
 				$allow[] = Indent::_(2)
-					. "return Factory::getUser()->authorise('core.edit', 'com_"
+					. "return Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser()->authorise('core.edit', 'com_"
 					. $component . "." . $nameSingleCode
 					. ".'. ((int) isset(\$data[\$key]) ? \$data[\$key] : 0)) or parent::allowEdit(\$data, \$key);";
 			}
 			else
 			{
 				$allow[] = Indent::_(2)
-					. "return Factory::getApplication()->getIdentity()->authorise('core.edit', 'com_"
+					. "return Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity()->authorise('core.edit', 'com_"
 					. $component . "." . $nameSingleCode
 					. ".'. ((int) isset(\$data[\$key]) ? \$data[\$key] : 0)) or parent::allowEdit(\$data, \$key);";
 			}
@@ -19758,11 +19892,11 @@ class Interpretation extends Fields
 
 			// build toolbar
 			$toolBar
-				= "Factory::getApplication()->input->set('hidemainmenu', true);";
-			$toolBar .= PHP_EOL . Indent::_(2) . "ToolbarHelper::title(Text:"
+				= "Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input->set('hidemainmenu', true);";
+			$toolBar .= PHP_EOL . Indent::_(2) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::title(Text:"
 				. ":_('" . $viewNameLang_readonly . "'), '" . $nameSingleCode
 				. "');";
-			$toolBar .= PHP_EOL . Indent::_(2) . "ToolbarHelper::cancel('"
+			$toolBar .= PHP_EOL . Indent::_(2) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::cancel('"
 				. $nameSingleCode . ".cancel', 'JTOOLBAR_CLOSE');";
 		}
 		else
@@ -19787,22 +19921,22 @@ class Interpretation extends Fields
 			);
 			// build toolbar
 			$toolBar
-				= "Factory::getApplication()->input->set('hidemainmenu', true);";
+				= "Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input->set('hidemainmenu', true);";
 			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 			{
 				$toolBar .= PHP_EOL . Indent::_(2)
-					. "\$user = Factory::getUser();";
+					. "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 			}
 			else
 			{
 				$toolBar .= PHP_EOL . Indent::_(2)
-					. "\$user = Factory::getApplication()->getIdentity();";
+					. "\$user = \$this->getCurrentUser();";
 			}
 			$toolBar .= PHP_EOL . Indent::_(2) . "\$userId	= \$user->id;";
 			$toolBar .= PHP_EOL . Indent::_(2)
 				. "\$isNew = \$this->item->id == 0;";
 			$toolBar .= PHP_EOL . PHP_EOL . Indent::_(2)
-				. "ToolbarHelper::title( Text:" . ":_(\$isNew ? '"
+				. "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::title( Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_(\$isNew ? '"
 				. $viewNameLang_new . "' : '" . $viewNameLang_edit
 				. "'), 'pencil-2 article-add');";
 			$toolBar .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
@@ -19815,7 +19949,7 @@ class Interpretation extends Fields
 			$toolBar .= PHP_EOL . Indent::_(3) . "{";
 			$toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 				. " We can create the record.";
-			$toolBar .= PHP_EOL . Indent::_(4) . "ToolbarHelper::save('"
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::save('"
 				. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
 			$toolBar .= PHP_EOL . Indent::_(3) . "}";
 			$toolBar .= PHP_EOL . Indent::_(3)
@@ -19825,21 +19959,21 @@ class Interpretation extends Fields
 			$toolBar .= PHP_EOL . Indent::_(3) . "{";
 			$toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 				. " We can save the record.";
-			$toolBar .= PHP_EOL . Indent::_(4) . "ToolbarHelper::save('"
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::save('"
 				. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
 			$toolBar .= PHP_EOL . Indent::_(3) . "}";
 			$toolBar .= PHP_EOL . Indent::_(3) . "if (\$isNew)";
 			$toolBar .= PHP_EOL . Indent::_(3) . "{";
 			$toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 				. " Do not creat but cancel.";
-			$toolBar .= PHP_EOL . Indent::_(4) . "ToolbarHelper::cancel('"
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::cancel('"
 				. $nameSingleCode . ".cancel', 'JTOOLBAR_CANCEL');";
 			$toolBar .= PHP_EOL . Indent::_(3) . "}";
 			$toolBar .= PHP_EOL . Indent::_(3) . "else";
 			$toolBar .= PHP_EOL . Indent::_(3) . "{";
 			$toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 				. " We can close it.";
-			$toolBar .= PHP_EOL . Indent::_(4) . "ToolbarHelper::cancel('"
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::cancel('"
 				. $nameSingleCode . ".cancel', 'JTOOLBAR_CLOSE');";
 			$toolBar .= PHP_EOL . Indent::_(3) . "}";
 			$toolBar .= PHP_EOL . Indent::_(2) . "}";
@@ -19852,15 +19986,15 @@ class Interpretation extends Fields
 			$toolBar .= PHP_EOL . Indent::_(4) . "if (\$this->canDo->get('"
 				. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "'))";
 			$toolBar .= PHP_EOL . Indent::_(4) . "{";
-			$toolBar .= PHP_EOL . Indent::_(5) . "ToolbarHelper::apply('"
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::apply('"
 				. $nameSingleCode . ".apply', 'JTOOLBAR_APPLY');";
-			$toolBar .= PHP_EOL . Indent::_(5) . "ToolbarHelper::save('"
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::save('"
 				. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
-			$toolBar .= PHP_EOL . Indent::_(5) . "ToolbarHelper::custom('"
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('"
 				. $nameSingleCode
 				. ".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);";
 			$toolBar .= PHP_EOL . Indent::_(4) . "};";
-			$toolBar .= PHP_EOL . Indent::_(4) . "ToolbarHelper::cancel('"
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::cancel('"
 				. $nameSingleCode . ".cancel', 'JTOOLBAR_CANCEL');";
 			$toolBar .= PHP_EOL . Indent::_(3) . "}";
 			$toolBar .= PHP_EOL . Indent::_(3) . "else";
@@ -19870,9 +20004,9 @@ class Interpretation extends Fields
 			$toolBar .= PHP_EOL . Indent::_(4) . "{";
 			$toolBar .= PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
 				. " We can save the new record";
-			$toolBar .= PHP_EOL . Indent::_(5) . "ToolbarHelper::apply('"
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::apply('"
 				. $nameSingleCode . ".apply', 'JTOOLBAR_APPLY');";
-			$toolBar .= PHP_EOL . Indent::_(5) . "ToolbarHelper::save('"
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::save('"
 				. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
 			$toolBar .= PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
 				. " We can save this record, but check the create permission to see";
@@ -19881,7 +20015,7 @@ class Interpretation extends Fields
 			$toolBar .= PHP_EOL . Indent::_(5) . "if (\$this->canDo->get('"
 				. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "'))";
 			$toolBar .= PHP_EOL . Indent::_(5) . "{";
-			$toolBar .= PHP_EOL . Indent::_(6) . "ToolbarHelper::custom('"
+			$toolBar .= PHP_EOL . Indent::_(6) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('"
 				. $nameSingleCode
 				. ".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);";
 			$toolBar .= PHP_EOL . Indent::_(5) . "}";
@@ -19900,7 +20034,7 @@ class Interpretation extends Fields
 						. "') && \$canVersion)";
 					$toolBar .= PHP_EOL . Indent::_(4) . "{";
 					$toolBar .= PHP_EOL . Indent::_(5)
-						. "ToolbarHelper::versions('com_"
+						. "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::versions('com_"
 						. CFactory::_('Config')->component_code_name . "." . $nameSingleCode
 						. "', \$this->item->id);";
 					$toolBar .= PHP_EOL . Indent::_(4) . "}";
@@ -19917,7 +20051,7 @@ class Interpretation extends Fields
 						. "if (\$this->state->params->get('save_history', 1) && \$this->canDo->get('core.edit') && \$canVersion)";
 					$toolBar .= PHP_EOL . Indent::_(4) . "{";
 					$toolBar .= PHP_EOL . Indent::_(5)
-						. "ToolbarHelper::versions('com_"
+						. "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::versions('com_"
 						. CFactory::_('Config')->component_code_name . "." . $nameSingleCode
 						. "', \$this->item->id);";
 					$toolBar .= PHP_EOL . Indent::_(4) . "}";
@@ -19926,20 +20060,20 @@ class Interpretation extends Fields
 			$toolBar .= PHP_EOL . Indent::_(4) . "if (\$this->canDo->get('"
 				. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "'))";
 			$toolBar .= PHP_EOL . Indent::_(4) . "{";
-			$toolBar .= PHP_EOL . Indent::_(5) . "ToolbarHelper::custom('"
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('"
 				. $nameSingleCode
 				. ".save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);";
 			$toolBar .= PHP_EOL . Indent::_(4) . "}";
 			// add custom buttons
 			$toolBar .= $this->setCustomButtons($view, 2, Indent::_(2));
-			$toolBar .= PHP_EOL . Indent::_(4) . "ToolbarHelper::cancel('"
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::cancel('"
 				. $nameSingleCode . ".cancel', 'JTOOLBAR_CLOSE');";
 			$toolBar .= PHP_EOL . Indent::_(3) . "}";
 			$toolBar .= PHP_EOL . Indent::_(2) . "}";
-			$toolBar .= PHP_EOL . Indent::_(2) . "ToolbarHelper::divider();";
+			$toolBar .= PHP_EOL . Indent::_(2) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::divider();";
 			if (CFactory::_('Config')->get('joomla_version', 3) != 3)
 			{
-				$toolBar .= PHP_EOL . Indent::_(2) . "ToolbarHelper::inlinehelp();";
+				$toolBar .= PHP_EOL . Indent::_(2) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::inlinehelp();";
 			}
 			$toolBar .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
 				. " set help url for this view if found";
@@ -19949,7 +20083,7 @@ class Interpretation extends Fields
 			$toolBar .= PHP_EOL . Indent::_(2) . "if ("
 				. "Super_" . "__1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check(\$this->help_url))";
 			$toolBar .= PHP_EOL . Indent::_(2) . "{";
-			$toolBar .= PHP_EOL . Indent::_(3) . "ToolbarHelper::help('"
+			$toolBar .= PHP_EOL . Indent::_(3) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::help('"
 				. CFactory::_('Config')->lang_prefix . "_HELP_MANAGER', false, \$this->help_url);";
 			$toolBar .= PHP_EOL . Indent::_(2) . "}";
 		}
@@ -19957,6 +20091,180 @@ class Interpretation extends Fields
 		return $toolBar;
 	}
 
+	public function setAddModalToolBar(&$view)
+	{
+		// set view name
+		$nameSingleCode = $view['settings']->name_single_code;
+		if (CFactory::_('Config')->get('joomla_version', 3) != 3)
+		{
+			$langViews = CFactory::_('Config')->lang_prefix . '_'
+				. StringHelper::safe(
+					$view['settings']->name_list_code, 'U'
+				);
+			$name_list = strtolower($view['settings']->name_list);
+			$name_single = strtolower($view['settings']->name_single);
+			// add empty title
+			CFactory::_('Language')->set(
+				CFactory::_('Config')->lang_target,
+				$langViews . '_EMPTYSTATE_TITLE',
+				'No ' . $name_list . ' have been created yet.'
+			);
+			// add empty content
+			CFactory::_('Language')->set(
+				CFactory::_('Config')->lang_target,
+				$langViews . '_EMPTYSTATE_CONTENT',
+				$view['settings']->description
+			);
+			// add empty button add
+			CFactory::_('Language')->set(
+				CFactory::_('Config')->lang_target,
+				$langViews . '_EMPTYSTATE_BUTTON_ADD',
+				'Add your first ' . $name_single
+			);
+		}
+		// check type
+		if ($view['settings']->type == 2)
+		{
+			// set lang strings
+			$viewNameLang_readonly = CFactory::_('Config')->lang_prefix . '_'
+				. StringHelper::safe(
+					$view['settings']->name_single . ' readonly', 'U'
+				);
+			// load to lang
+			CFactory::_('Language')->set(
+				CFactory::_('Config')->lang_target, $viewNameLang_readonly,
+				$view['settings']->name_single . ' :: Readonly'
+			);
+
+			// build toolbar
+			$toolBar
+				= "Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input->set('hidemainmenu', true);";
+			$toolBar .= PHP_EOL . Indent::_(2) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::title(Text:"
+				. ":_('" . $viewNameLang_readonly . "'), '" . $nameSingleCode
+				. "');";
+			$toolBar .= PHP_EOL . Indent::_(2) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::cancel('"
+				. $nameSingleCode . ".cancel', 'JTOOLBAR_CLOSE');";
+		}
+		else
+		{
+			// set lang strings
+			$viewNameLang_new  = CFactory::_('Config')->lang_prefix . '_'
+				. StringHelper::safe(
+					$view['settings']->name_single . ' New', 'U'
+				);
+			$viewNameLang_edit = CFactory::_('Config')->lang_prefix . '_'
+				. StringHelper::safe(
+					$view['settings']->name_single . ' Edit', 'U'
+				);
+			// load to lang
+			CFactory::_('Language')->set(
+				CFactory::_('Config')->lang_target, $viewNameLang_new,
+				'A New ' . $view['settings']->name_single
+			);
+			CFactory::_('Language')->set(
+				CFactory::_('Config')->lang_target, $viewNameLang_edit,
+				'Editing the ' . $view['settings']->name_single
+			);
+			// build toolbar
+			$toolBar
+				= "Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->input->set('hidemainmenu', true);";
+			if (CFactory::_('Config')->get('joomla_version', 3) == 3)
+			{
+				$toolBar .= PHP_EOL . Indent::_(2)
+					. "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
+			}
+			else
+			{
+				$toolBar .= PHP_EOL . Indent::_(2)
+					. "\$user = \$this->getCurrentUser();";
+			}
+			$toolBar .= PHP_EOL . Indent::_(2) . "\$userId	= \$user->id;";
+			$toolBar .= PHP_EOL . Indent::_(2)
+				. "\$isNew = \$this->item->id == 0;";
+			$toolBar .= PHP_EOL . PHP_EOL . Indent::_(2)
+				. "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::title( Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_(\$isNew ? '"
+				. $viewNameLang_new . "' : '" . $viewNameLang_edit
+				. "'), 'pencil-2 article-add');";
+			$toolBar .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
+				. " Built the actions for new and existing records.";
+			$toolBar .= PHP_EOL . Indent::_(2) . "if ("
+				. "Super_" . "__1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check(\$this->referral))";
+			$toolBar .= PHP_EOL . Indent::_(2) . "{";
+			$toolBar .= PHP_EOL . Indent::_(3) . "if (\$this->canDo->get('"
+				. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "') && \$isNew)";
+			$toolBar .= PHP_EOL . Indent::_(3) . "{";
+			$toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
+				. " We can create the record.";
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::save('"
+				. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
+			$toolBar .= PHP_EOL . Indent::_(3) . "}";
+			$toolBar .= PHP_EOL . Indent::_(3)
+				. "elseif (\$this->canDo->get('"
+				. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit')
+				. "'))";
+			$toolBar .= PHP_EOL . Indent::_(3) . "{";
+			$toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
+				. " We can save the record.";
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::save('"
+				. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
+			$toolBar .= PHP_EOL . Indent::_(3) . "}";
+			$toolBar .= PHP_EOL . Indent::_(3) . "if (\$isNew)";
+			$toolBar .= PHP_EOL . Indent::_(3) . "{";
+			$toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
+				. " Do not creat but cancel.";
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::cancel('"
+				. $nameSingleCode . ".cancel', 'JTOOLBAR_CANCEL');";
+			$toolBar .= PHP_EOL . Indent::_(3) . "}";
+			$toolBar .= PHP_EOL . Indent::_(3) . "else";
+			$toolBar .= PHP_EOL . Indent::_(3) . "{";
+			$toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
+				. " We can close it.";
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::cancel('"
+				. $nameSingleCode . ".cancel', 'JTOOLBAR_CLOSE');";
+			$toolBar .= PHP_EOL . Indent::_(3) . "}";
+			$toolBar .= PHP_EOL . Indent::_(2) . "}";
+			$toolBar .= PHP_EOL . Indent::_(2) . "else";
+			$toolBar .= PHP_EOL . Indent::_(2) . "{";
+			$toolBar .= PHP_EOL . Indent::_(3) . "if (\$isNew)";
+			$toolBar .= PHP_EOL . Indent::_(3) . "{";
+			$toolBar .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
+				. " For new records, check the create permission.";
+			$toolBar .= PHP_EOL . Indent::_(4) . "if (\$this->canDo->get('"
+				. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.create') . "'))";
+			$toolBar .= PHP_EOL . Indent::_(4) . "{";
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::apply('"
+				. $nameSingleCode . ".apply', 'JTOOLBAR_APPLY');";
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::save('"
+				. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::custom('"
+				. $nameSingleCode
+				. ".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);";
+			$toolBar .= PHP_EOL . Indent::_(4) . "};";
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::cancel('"
+				. $nameSingleCode . ".cancel', 'JTOOLBAR_CANCEL');";
+			$toolBar .= PHP_EOL . Indent::_(3) . "}";
+			$toolBar .= PHP_EOL . Indent::_(3) . "else";
+			$toolBar .= PHP_EOL . Indent::_(3) . "{";
+			$toolBar .= PHP_EOL . Indent::_(4) . "if (\$this->canDo->get('"
+				. CFactory::_('Compiler.Creator.Permission')->getGlobal($nameSingleCode, 'core.edit') . "'))";
+			$toolBar .= PHP_EOL . Indent::_(4) . "{";
+			$toolBar .= PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
+				. " We can save the new record";
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::apply('"
+				. $nameSingleCode . ".apply', 'JTOOLBAR_APPLY');";
+			$toolBar .= PHP_EOL . Indent::_(5) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::save('"
+				. $nameSingleCode . ".save', 'JTOOLBAR_SAVE');";
+			$toolBar .= PHP_EOL . Indent::_(4) . "}";
+			$toolBar .= $this->setCustomButtons($view, 2, Indent::_(2));
+			$toolBar .= PHP_EOL . Indent::_(4) . "Joomla__"."_0c1a176a_304f_433a_8233_37d01ff87815___Power::cancel('"
+				. $nameSingleCode . ".cancel', 'JTOOLBAR_CLOSE');";
+			$toolBar .= PHP_EOL . Indent::_(3) . "}";
+			$toolBar .= PHP_EOL . Indent::_(2) . "}";
+		}
+
+		return $toolBar;
+	}
+
 	/**
 	 * set the populate state code
 	 *
@@ -20160,7 +20468,7 @@ class Interpretation extends Fields
 					if ($filter['type'] === 'category')
 					{
 						$fields .= "," . PHP_EOL . Indent::_(3)
-							. "'category_title' => Text:" . ":_('"
+							. "'category_title' => Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 							. $filter['lang'] . "')";
 					}
 					elseif (ArrayHelper::check(
@@ -20169,13 +20477,13 @@ class Interpretation extends Fields
 					{
 						$fields .= "," . PHP_EOL . Indent::_(3) . "'"
 							. $filter['custom']['db'] . "."
-							. $filter['custom']['text'] . "' => Text:" . ":_('"
+							. $filter['custom']['text'] . "' => Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 							. $filter['lang'] . "')";
 					}
 					else
 					{
 						$fields .= "," . PHP_EOL . Indent::_(3) . "'a."
-							. $filter['code'] . "' => Text:" . ":_('"
+							. $filter['code'] . "' => Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 							. $filter['lang'] . "')";
 					}
 				}
@@ -20221,7 +20529,7 @@ class Interpretation extends Fields
 			) . " Get a db connection.";
 		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 		{
-			$checkin .= PHP_EOL . Indent::_(3) . "\$db = Factory::getDbo();";
+			$checkin .= PHP_EOL . Indent::_(3) . "\$db = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDbo();";
 		}
 		else
 		{
@@ -20247,7 +20555,7 @@ class Interpretation extends Fields
 		$checkin .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 			. " Get Yesterdays date.";
 		$checkin .= PHP_EOL . Indent::_(4)
-			. "\$date = Factory::getDate()->modify(\$time)->toSql();";
+			. "\$date = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getDate()->modify(\$time)->toSql();";
 		$checkin .= PHP_EOL . Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 			. " Reset query.";
 		$checkin .= PHP_EOL . Indent::_(4) . "\$query = \$db->getQuery(true);";
@@ -20762,7 +21070,7 @@ class Interpretation extends Fields
 				if (CFactory::_('Config')->get('joomla_version', 3) == 3)
 				{
 					$forEachStart .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3)
-						. "\$user = Factory::getUser();";
+						. "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getUser();";
 				}
 				else
 				{
@@ -21580,7 +21888,7 @@ class Interpretation extends Fields
 				$alias        = StringHelper::safe($tabname);
 				$display[]    = PHP_EOL . Indent::_(2)
 					. "<?php echo Html::_('{$uitab}.addTab', 'cpanel_tab', '"
-					. $alias . "', Text:" . ":_('" . $tabname
+					. $alias . "', Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $tabname
 					. "', true)); ?>";
 				$display[]    = Indent::_(2) . '<div class="' . $row_class . '">';
 				$display[]    = $tab . '<div class="' . $width_class . '12">';
@@ -21615,9 +21923,9 @@ class Interpretation extends Fields
 					$TARGET = StringHelper::safe(
 						CFactory::_('Config')->build_target, 'U'
 					);
-					// SITE_TEMPLATE_BODY <<<DYNAMIC>>>
+					// CUSTOM_ADMIN_TEMPLATE_BODY <<<DYNAMIC>>>
 					CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '_' . $tempName . '|CUSTOM_ADMIN_TEMPLATE_BODY', PHP_EOL . $html);
-					// SITE_TEMPLATE_CODE_BODY <<<DYNAMIC>>>
+					// CUSTOM_ADMIN_TEMPLATE_CODE_BODY <<<DYNAMIC>>>
 					CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '_' . $tempName . '|CUSTOM_ADMIN_TEMPLATE_CODE_BODY', '');
 				}
 				$display[] = $tab . Indent::_(1)
@@ -21706,7 +22014,7 @@ class Interpretation extends Fields
 				$alias        = StringHelper::safe($tabname);
 				$display[]    = PHP_EOL . Indent::_(2)
 					. "<?php echo Html::_('{$uitab}.addTab', 'cpanel_tab', '"
-					. $alias . "', Text:" . ":_('" . $tabname
+					. $alias . "', Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $tabname
 					. "', true)); ?>";
 				$display[]    = Indent::_(2) . '<div class="' . $row_class . '">';
 				$display[]    = $tab . '<div class="' . $width_class . '12">';
@@ -21955,7 +22263,7 @@ class Interpretation extends Fields
 			// set default dashboard
 			if (!CFactory::_('Registry')->get('build.dashboard'))
 			{
-				$menus .= "\JHtmlSidebar::addEntry(Text:" . ":_('" . $lang
+				$menus .= "\JHtmlSidebar::addEntry(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $lang
 					. "_DASHBOARD'), 'index.php?option=com_" . $codeName
 					. "&view=" . $codeName . "', \$submenu === '" . $codeName
 					. "');";
@@ -21997,7 +22305,7 @@ class Interpretation extends Fields
 						$has_permissions = true;
 					}
 					$menus .= PHP_EOL . Indent::_(2) . $tab
-						. "\JHtmlSidebar::addEntry(Text:" . ":_('" . $lang . "_"
+						. "\JHtmlSidebar::addEntry(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $lang . "_"
 						. $nameUpper . "'), 'index.php?option=com_" . $codeName
 						. "&view=" . $nameListCode . "', \$submenu === '"
 						. $nameListCode . "');";
@@ -22030,7 +22338,7 @@ class Interpretation extends Fields
 						}
 						// now load the menus
 						$menus .= PHP_EOL . Indent::_(2) . $tab
-							. "\JHtmlSidebar::addEntry(Text:" . ":_('"
+							. "\JHtmlSidebar::addEntry(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('"
 							. CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.name", 'error')
 							. "'), 'index.php?option=com_categories&view=categories&extension="
 							. CFactory::_('Compiler.Builder.Category')->get("{$nameListCode}.extension")
@@ -22052,13 +22360,13 @@ class Interpretation extends Fields
 						. "if (ComponentHelper::isEnabled('com_fields'))";
 					$menus .= PHP_EOL . Indent::_(2) . "{";
 					$menus .= PHP_EOL . Indent::_(3)
-						. "\JHtmlSidebar::addEntry(Text:" . ":_('" . $lang . "_"
+						. "\JHtmlSidebar::addEntry(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $lang . "_"
 						. $nameUpper
 						. "_FIELDS'), 'index.php?option=com_fields&context=com_"
 						. $codeName . "." . $nameSingleCode
 						. "', \$submenu === 'fields.fields');";
 					$menus .= PHP_EOL . Indent::_(3)
-						. "\JHtmlSidebar::addEntry(Text:" . ":_('" . $lang . "_"
+						. "\JHtmlSidebar::addEntry(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $lang . "_"
 						. $nameUpper
 						. "_FIELDS_GROUPS'), 'index.php?option=com_fields&view=groups&context=com_"
 						. $codeName . "." . $nameSingleCode
@@ -22192,7 +22500,7 @@ class Interpretation extends Fields
 				);
 				// add custom menu
 				$custom .= PHP_EOL . Indent::_(2) . $tab
-					. "\JHtmlSidebar::addEntry(Text:" . ":_('" . $lang . "_"
+					. "\JHtmlSidebar::addEntry(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $lang . "_"
 					. $nameUpper . "'), '" . $menu['link']
 					. "', \$submenu === '" . $nameList . "');";
 			}
@@ -22203,7 +22511,7 @@ class Interpretation extends Fields
 				);
 				// add custom menu
 				$custom .= PHP_EOL . Indent::_(2) . $tab
-					. "\JHtmlSidebar::addEntry(Text:" . ":_('" . $lang . "_"
+					. "\JHtmlSidebar::addEntry(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $lang . "_"
 					. $nameUpper . "'), 'index.php?option=com_" . $codeName
 					. "&view=" . $nameList . "', \$submenu === '" . $nameList
 					. "');";
@@ -22250,7 +22558,7 @@ class Interpretation extends Fields
 				);
 				// add custom menu
 				$this->lastCustomSubMenu[$nr] .= PHP_EOL . Indent::_(2) . $tab
-					. "\JHtmlSidebar::addEntry(Text:" . ":_('" . $lang . "_"
+					. "\JHtmlSidebar::addEntry(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $lang . "_"
 					. $nameUpper . "'), '" . $menu['link']
 					. "', \$submenu === '" . $nameList . "');";
 			}
@@ -22261,7 +22569,7 @@ class Interpretation extends Fields
 				);
 				// add custom menu
 				$this->lastCustomSubMenu[$nr] .= PHP_EOL . Indent::_(2) . $tab
-					. "\JHtmlSidebar::addEntry(Text:" . ":_('" . $lang . "_"
+					. "\JHtmlSidebar::addEntry(Joomla__"."_ba6326ef_cb79_4348_80f4_ab086082e3c5___Power::_('" . $lang . "_"
 					. $nameUpper . "'), 'index.php?option=com_" . $codeName
 					. "&view=" . $nameList . "', \$submenu === '" . $nameList
 					. "');";
@@ -22849,7 +23157,7 @@ class Interpretation extends Fields
 		{
 			$setter .= '//' . Line::_(__Line__, __Class__)
 				. 'get the document object';
-			$setter .= PHP_EOL . '$document = Factory::getDocument();';
+			$setter .= PHP_EOL . '$document = Joomla__'.'_39403062_84fb_46e0_bac4_0023f766e827___Power::getDocument();';
 			foreach ($data_ as $id => $true)
 			{
 				// get the library
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Structure.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Structure.php
index 8e05da03b..04a8a3a54 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Structure.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Structure.php
@@ -679,7 +679,7 @@ class Structure extends Get
 					!isset($this->extentionTrackingFilesMoved[$check]))
 				{
 					// check files exist
-					if (File::exists(
+					if (is_file(
 						CFactory::_('Utilities.Paths')->component_path . '/admin/models/fields/'
 						. $field['type_name'] . '.php'
 					))
@@ -707,7 +707,7 @@ class Structure extends Get
 					!isset($this->extentionTrackingFilesMoved[$check]))
 				{
 					// check files exist
-					if (File::exists(
+					if (is_file(
 						CFactory::_('Utilities.Paths')->component_path . '/admin/models/rules/'
 						. CFactory::_('Registry')->get('validation.linked.' . $field['field'])
 						. '.php'
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFive/Header.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFive/Header.php
index 58576bb7c..3ac606cf4 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFive/Header.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFive/Header.php
@@ -426,6 +426,8 @@ final class Header implements HeaderInterface
 				$headers[] = 'use Joomla\Input\Input;';
 				break;
 
+			case 'admin.views.modal':
+				$headers[] = 'use Joomla\CMS\Session\Session;';
 			case 'admin.views':
 				$headers[] = 'use Joomla\CMS\HTML\HTMLHelper as Html;';
 				$headers[] = 'use Joomla\CMS\Layout\LayoutHelper;';
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFour/Header.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFour/Header.php
index 5c24e8f90..239adff9c 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFour/Header.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFour/Header.php
@@ -426,6 +426,8 @@ final class Header implements HeaderInterface
 				$headers[] = 'use Joomla\Input\Input;';
 				break;
 
+			case 'admin.views.modal':
+				$headers[] = 'use Joomla\CMS\Session\Session;';
 			case 'admin.views':
 				$headers[] = 'use Joomla\CMS\HTML\HTMLHelper as Html;';
 				$headers[] = 'use Joomla\CMS\Layout\LayoutHelper;';
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Sql.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Sql.php
index cf365b518..37709190d 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Sql.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Sql.php
@@ -63,9 +63,9 @@ class Sql
 	 */
 	public function set(object &$item)
 	{
-		if (isset($item->add_sql) && $item->add_sql == 1 && isset($item->source))
+		if (isset($item->add_sql) && (int) $item->add_sql === 1 && isset($item->source))
 		{
-			if ($item->source == 1 && isset($item->tables) &&
+			if ((int) $item->source === 1 && isset($item->tables) &&
 				($string = $this->dump->get(
 					$item->tables, $item->name_single_code, $item->guid
 				)) !== null)
@@ -77,7 +77,7 @@ class Sql
 				$this->dispenser->hub['sql'][$item->name_single_code]
 					= $string;
 			}
-			elseif ($item->source == 2 && isset($item->sql))
+			elseif ((int) $item->source === 2 && isset($item->sql))
 			{
 				// add the SQL dump string
 				$this->dispenser->set(
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Sqldump.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Sqldump.php
index 48836a57a..91c11c13e 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Sqldump.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Sqldump.php
@@ -199,82 +199,88 @@ class Sqldump
 				else
 				{
 					// see where
-					// var_dump($view);
-					// jexit();
+					// var_dump($view, $view_guid);
+					// exit;
 				}
 			}
 
 			// check if we should run query
 			if ($run_query)
 			{
-				// now get the data
-				$this->db->setQuery($query);
-				$this->db->execute();
-				if ($this->db->getNumRows())
-				{
-					// get the data
-					$data = $this->db->loadObjectList();
-
-					// start building the MySql dump
-					$dump = "--";
-					$dump .= PHP_EOL . "-- Dumping data for table `#__"
-						. Placefix::_("component") . "_" . $view
-						. "`";
-					$dump .= PHP_EOL . "--";
-					$dump .= PHP_EOL . PHP_EOL . "INSERT INTO `#__" . Placefix::_("component") . "_" . $view . "` (";
-					foreach ($data as $line)
+				try{
+					// now get the data
+					$this->db->setQuery($query);
+					$this->db->execute();
+					if ($this->db->getNumRows())
 					{
-						$comaSet = 0;
-						foreach ($line as $fieldName => $fieldValue)
+						// get the data
+						$data = $this->db->loadObjectList();
+
+						// start building the MySql dump
+						$dump = "--";
+						$dump .= PHP_EOL . "-- Dumping data for table `#__"
+							. Placefix::_("component") . "_" . $view
+							. "`";
+						$dump .= PHP_EOL . "--";
+						$dump .= PHP_EOL . PHP_EOL . "INSERT INTO `#__" . Placefix::_("component") . "_" . $view . "` (";
+						foreach ($data as $line)
 						{
-							if ($comaSet == 0)
+							$comaSet = 0;
+							foreach ($line as $fieldName => $fieldValue)
 							{
-								$dump .= $this->db->quoteName($fieldName);
+								if ($comaSet == 0)
+								{
+									$dump .= $this->db->quoteName($fieldName);
+								}
+								else
+								{
+									$dump .= ", " . $this->db->quoteName(
+											$fieldName
+										);
+								}
+								$comaSet++;
+							}
+							break;
+						}
+						$dump .= ") VALUES";
+						$coma = 0;
+						foreach ($data as $line)
+						{
+							if ($coma == 0)
+							{
+								$dump .= PHP_EOL . "(";
 							}
 							else
 							{
-								$dump .= ", " . $this->db->quoteName(
-										$fieldName
-									);
+								$dump .= "," . PHP_EOL . "(";
 							}
-							$comaSet++;
-						}
-						break;
-					}
-					$dump .= ") VALUES";
-					$coma = 0;
-					foreach ($data as $line)
-					{
-						if ($coma == 0)
-						{
-							$dump .= PHP_EOL . "(";
-						}
-						else
-						{
-							$dump .= "," . PHP_EOL . "(";
-						}
-						$comaSet = 0;
-						foreach ($line as $fieldName => $fieldValue)
-						{
-							if ($comaSet == 0)
+							$comaSet = 0;
+							foreach ($line as $fieldName => $fieldValue)
 							{
-								$dump .= $this->escape($fieldValue);
+								if ($comaSet == 0)
+								{
+									$dump .= $this->escape($fieldValue);
+								}
+								else
+								{
+									$dump .= ", " . $this->escape(
+											$fieldValue
+										);
+								}
+								$comaSet++;
 							}
-							else
-							{
-								$dump .= ", " . $this->escape(
-										$fieldValue
-									);
-							}
-							$comaSet++;
+							$dump .= ")";
+							$coma++;
 						}
-						$dump .= ")";
-						$coma++;
-					}
-					$dump .= ";";
+						$dump .= ";";
 
-					// return build dump query
-					return $dump;
+						// return build dump query
+						return $dump;
+					}
+				} catch (\Throwable $e) {
+					// see where
+					// var_dump($view, $view_guid);
+					// exit;
 				}
 			}
 		}
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Updatesql.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Updatesql.php
index f7d5af498..aa0cb9d6b 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Updatesql.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Updatesql.php
@@ -78,13 +78,13 @@ class Updatesql
 				{
 					$newItem = true;
 
-					// check if this is an id to ignore
+					// check if this is an id/guid to ignore
 					if (ArrayHelper::check($ignore)
 						&& in_array(
 							$item, $ignore
 						))
 					{
-						// don't add ignored ids
+						// don't add ignored ids/guids
 						$newItem = false;
 					}
 					// check if this is old repeatable field
@@ -142,11 +142,11 @@ class Updatesql
 						// search to see if this is a new value
 						$newItem = true;
 
-						// check if this is an id to ignore
+						// check if this is an id/guid to ignore
 						if (ArrayHelper::check($ignore)
 							&& in_array($item[$type], $ignore))
 						{
-							// don't add ignored ids
+							// don't add ignored ids/guids
 							$newItem = false;
 						}
 						// check if this is old repeatable field
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Creator.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Creator.php
index 6cebf37e4..e35ca3c38 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Creator.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Creator.php
@@ -773,6 +773,7 @@ class Creator implements ServiceProviderInterface
 			$container->get('Field.Name'),
 			$container->get('Field.Type.Name'),
 			$container->get('Field.Attributes'),
+			$container->get('Field.ModalSelect'),
 			$container->get('Utilities.Xml'),
 			$container->get('Compiler.Creator.Custom.Field.Type.File'),
 			$container->get('Utilities.Counter')
@@ -797,6 +798,7 @@ class Creator implements ServiceProviderInterface
 			$container->get('Field.Name'),
 			$container->get('Field.Type.Name'),
 			$container->get('Field.Attributes'),
+			$container->get('Field.ModalSelect'),
 			$container->get('Compiler.Creator.Custom.Field.Type.File'),
 			$container->get('Utilities.Counter')
 		);
@@ -816,6 +818,7 @@ class Creator implements ServiceProviderInterface
 			$container->get('Field.Name'),
 			$container->get('Field.Type.Name'),
 			$container->get('Field.Attributes'),
+			$container->get('Field.ModalSelect'),
 			$container->get('Field.Groups'),
 			$container->get('Compiler.Builder.Field.Names'),
 			$container->get('Compiler.Creator.Field.Type'),
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Field.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Field.php
index 1db4eac27..b4fa47979 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Field.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Field.php
@@ -20,6 +20,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Field\Data;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Groups;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Attributes;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Name;
+use VDM\Joomla\Componentbuilder\Compiler\Field\ModalSelect;
 use VDM\Joomla\Componentbuilder\Compiler\Field\TypeName;
 use VDM\Joomla\Componentbuilder\Compiler\Field\UniqueName;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Rule;
@@ -83,6 +84,9 @@ class Field implements ServiceProviderInterface
 		$container->alias(Name::class, 'Field.Name')
 			->share('Field.Name', [$this, 'getName'], true);
 
+		$container->alias(ModalSelect::class, 'Field.ModalSelect')
+			->share('Field.ModalSelect', [$this, 'getModalSelect'], true);
+
 		$container->alias(TypeName::class, 'Field.Type.Name')
 			->share('Field.Type.Name', [$this, 'getTypeName'], true);
 
@@ -214,6 +218,22 @@ class Field implements ServiceProviderInterface
 		);
 	}
 
+	/**
+	 * Get The ModalSelect Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  ModalSelect
+	 * @since   5.2.1
+	 */
+	public function getModalSelect(Container $container): ModalSelect
+	{
+		return new ModalSelect(
+			$container->get('Utilities.Structure'),
+			$container->get('Compiler.Builder.Content.Multi')
+		);
+	}
+
 	/**
 	 * Get The TypeName Class.
 	 *
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/RowDataArray.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/RowDataArray.php
index 618d6c936..4a44e574b 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/RowDataArray.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/RowDataArray.php
@@ -50,7 +50,7 @@ final class RowDataArray implements RowDataProcessorInterface
 
 		foreach ($cellIterator as $cell)
 		{
-			$rowData['values'][$cell->getColumn()] = $cell->getValueString();
+			$rowData['values'][$cell->getColumn()] = (string) $cell->getValue();
 		}
 
 		return $rowData;
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
index 1a6ce0b13..292d49235 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
@@ -42,6 +42,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -59,6 +60,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'af7b6b08-e8c5-4551-b6e6-cde297e78e40',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -76,6 +78,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '46503007-43d9-485f-8cd0-8427a6a8bef2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -93,6 +96,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'f8c2c432-b756-4c67-bfa5-0871e58e55e3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -110,6 +114,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'DATETIME',
 					'default' => 'CURRENT_TIMESTAMP',
+					'GUID' => 'e091bf65-58cb-4bf4-aba3-22015889acc6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -127,6 +132,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '9e7c209f-68df-411a-a6a3-591393bc9d62',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -144,6 +150,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '58525d14-8cbf-49fc-8d8e-50a9ba0e846a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -161,6 +168,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b877b188-693c-43a3-9121-a37a3943d7c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -178,6 +186,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ade283c3-937e-4502-a040-c69d6ddb3c50',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -195,6 +204,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '667a2147-05d1-4138-b666-e8a0ce54ffba',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -212,6 +222,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '508b5e78-c91a-4aaa-b587-000759130d4e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -229,6 +240,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '2089f202-667a-4fbd-881c-cc0fe1343ce4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -246,6 +258,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '991ec7f9-257a-486c-9453-c6b1c3fd5bf0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -263,6 +276,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f4134f92-7dc5-4729-9a16-bfaa51de27f9',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -280,6 +294,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3be0d9ca-afd6-47bc-87e5-8cb73e9f5e61',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -297,6 +312,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -314,6 +330,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f5e0c377-6689-4f79-9a35-41a1bfc58ba5',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -331,6 +348,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'd4a595fb-2264-4e18-8b80-7affee1a6abf',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -348,6 +366,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8cb26845-73d8-438a-b28a-7a128a63a0d7',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -365,6 +384,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '2a9d2cda-1be7-4ae7-b672-9139a8a62d14',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -382,6 +402,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(255)',
 					'default' => '',
+					'GUID' => '9f474240-eb27-40d7-9512-fbb3acf370d5',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -399,6 +420,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '378a9839-97ce-4bdb-8961-a9164738a3bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -416,6 +438,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'e5346711-63a0-45b8-a093-06486959a1d0',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -433,6 +456,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a6c65a43-e305-42c1-bd9d-5db5e4920185',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -450,6 +474,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'b659c01d-accd-4049-bd4c-083000740d5a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -467,6 +492,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '4003ab3f-70d8-4092-a11b-b23215844ffa',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -484,6 +510,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a8b0ea74-9315-4f24-be43-836f249645f3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -501,6 +528,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'd4241cde-3446-4318-9269-905b7ea929f4',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -518,6 +546,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a052df3d-54b4-4da7-a0f6-f18703d1047b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -535,6 +564,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '33c588ca-83b2-419d-b87f-b9f4e5e4ea54',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -552,6 +582,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9f9b030b-31ba-4ae9-88da-76efd8a140dc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -569,6 +600,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'dde96c4d-1528-402a-bdea-96ec481a11ef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -586,6 +618,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3ca01651-a5c3-46c3-b7a8-bfb0d9f6e105',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -603,6 +636,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '3',
+					'GUID' => 'e30ca545-0ccd-4925-b34d-96bc27d6a27c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -620,6 +654,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8d837989-4a21-4943-bb4c-4d4abb9a7a55',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -637,6 +672,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '9ae98a1d-cc61-49d4-8f80-b4e1257fce24',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -654,6 +690,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e76cf555-112a-4021-9a1e-b4ee52d7be8a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -671,6 +708,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5eb879c0-f6e3-45b6-b220-cb5131422a83',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -688,6 +726,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '03de1a61-d639-4d48-8ce6-fcf16c8f6270',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -705,6 +744,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'e6c263b1-da39-4a73-8585-637dc3a5b8eb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -722,6 +762,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '46bd236f-7d43-4038-ac40-936dfd18e910',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -739,6 +780,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '43d7329c-c5f7-4bde-ab6e-a9a743879b51',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -756,6 +798,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '441646d1-27c5-4ea9-80d9-a1931de48b26',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -773,6 +816,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '98ad53ca-0da2-4aab-9a3c-1c7e1ee0a24e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -790,6 +834,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(1)',
 					'default' => '',
+					'GUID' => '50d55392-74b6-43e2-9b16-37c7f95a7402',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -807,6 +852,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'b742dcb4-0d29-4a4a-88f9-eca218d79a19',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -824,6 +870,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'ff624860-89db-4465-97f1-962bf09dcc9f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -841,6 +888,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8b68326a-0e09-4df9-807e-4c32c3c9600a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -858,6 +906,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(1)',
 					'default' => '',
+					'GUID' => '0e5f211c-d6d7-417a-af92-f3e956687f56',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -875,6 +924,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '7d31d363-03b6-4ca7-bbf4-df9a879e3006',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -892,6 +942,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(100)',
 					'default' => '',
+					'GUID' => '7971c559-0867-44a8-bfea-291881bad311',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -909,6 +960,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'c2afae90-c059-4efb-9705-b7cf161b0c2a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -926,6 +978,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'c5cbf873-d13a-4930-9c99-c8b1f03e1a06',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -943,6 +996,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '36fc971f-a446-49ae-94d0-2f270e60bd0b',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -960,6 +1014,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'cce91031-8bf4-435f-8b20-9224f230061a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -977,6 +1032,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => 'b12fadb6-2825-465e-a1e7-1dde507ffde5',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1001,6 +1057,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd5d03647-f29e-44a4-9e63-5feb9f4adbae',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1018,6 +1075,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '365d08ee-fe6e-47c4-b567-a001212f2cb6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1035,6 +1093,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a1aa4716-5ee0-495c-ac35-5a969277da39',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1052,6 +1111,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3c1db8b4-65f2-4f6f-8391-5883f564eabe',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1069,6 +1129,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'de21cce1-44f6-4310-a2c2-08146fb21cbe',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1086,6 +1147,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '22a668bc-d169-4346-9929-3819673c67ac',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1103,6 +1165,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'c8186809-e78b-4632-a2d1-ac2469ccb643',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1120,6 +1183,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '70a2d820-64af-4f51-8b1a-522aed9572bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1137,6 +1201,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '9a825342-c423-42d2-85ad-f74ce9625f99',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1154,6 +1219,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '7c652c71-e00e-45ff-8acb-e1bc0344e4c0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1171,6 +1237,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8e416ff9-3bd1-4115-a08b-06594978ace6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1188,6 +1255,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f22fd59e-4d06-4578-b0bb-a624b8efd145',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1205,6 +1273,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '05e16c3f-1f5e-4355-a948-5331546f218c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1222,6 +1291,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '3',
+					'GUID' => '1831e024-aa0c-4fc7-b1e6-77ce4dd4c562',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1239,6 +1309,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => 'c2ce0b7e-e917-40c0-9c63-016425dd11fd',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1256,6 +1327,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '87a4b892-c4cb-4032-8511-e18ba8c8c202',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1273,6 +1345,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'db2835aa-b0c3-4c9a-abe6-5b09568fffda',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1290,6 +1363,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b9f98c3d-a93a-4b19-b89e-4c62781f9b99',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1307,6 +1381,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '33fb33c3-1ff2-4d4c-8fe8-6aaa93c1646a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1331,6 +1406,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '4553e8c2-3446-4e11-a967-0504509087a4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1355,6 +1431,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'ec128453-f0a7-4b20-a109-56d85c6ce213',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1372,6 +1449,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'eac7c528-4764-45e8-8304-4b8701e10915',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1389,6 +1467,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '627ec119-f50c-4afc-bfe7-8455a7ace163',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1406,6 +1485,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '7b181242-b4bc-4261-87cb-6210ec8b5af5',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1423,6 +1503,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'ecdc0281-fc1b-4643-b9d0-41bf95674959',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1440,6 +1521,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '763e5bdf-d4d3-449b-bb36-de2623d81540',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1457,6 +1539,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b4013eb9-0716-42a5-a479-6c4b53746cd6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1474,6 +1557,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5dabe624-329e-48d6-82cf-1f417df55467',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1491,6 +1575,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '81cd22bd-ee49-470e-afa1-1f61b302734b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1508,6 +1593,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '16ec7ebd-d07a-4134-8537-d7b65bcd8bac',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1525,6 +1611,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0708c9c5-d918-43f9-8383-f3d4c7459cf9',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1542,6 +1629,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'abc5e604-4a2b-4f4c-9add-9e371249adf8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1559,6 +1647,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '288e00d8-7ea3-4bfc-829c-3ab247ca9718',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1576,6 +1665,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '16a76125-d200-4bbf-aa00-91da3513a8f8',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1593,6 +1683,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1610,6 +1701,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f114341a-d271-4917-a5eb-8d5acdf0232d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1627,6 +1719,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'DATETIME',
 					'default' => 'EMPTY',
+					'GUID' => '104b94e8-260f-4517-a4f8-80c6b3d4a10a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1644,6 +1737,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'b607dfed-bb4a-463d-9e14-f1264c67279b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1710,6 +1804,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1727,6 +1822,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '88d58023-7ee7-46dc-a13e-064fbb3d8dc1',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1744,6 +1840,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1761,6 +1858,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '70a2d820-64af-4f51-8b1a-522aed9572bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1778,6 +1876,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '22a668bc-d169-4346-9929-3819673c67ac',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1795,6 +1894,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3c1db8b4-65f2-4f6f-8391-5883f564eabe',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1812,6 +1912,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3bb6d77d-05bf-4447-a6bb-4af197ec9290',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1829,6 +1930,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '03de1a61-d639-4d48-8ce6-fcf16c8f6270',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1846,6 +1948,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6e214a72-6c96-40c0-abf3-5f09116d3018',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1863,6 +1966,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'fc4bc2f3-1a12-4484-88dc-273199fe3b63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1887,6 +1991,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '7c652c71-e00e-45ff-8acb-e1bc0344e4c0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1904,6 +2009,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b9f98c3d-a93a-4b19-b89e-4c62781f9b99',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1921,6 +2027,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f22fd59e-4d06-4578-b0bb-a624b8efd145',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1938,6 +2045,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '33fb33c3-1ff2-4d4c-8fe8-6aaa93c1646a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1962,6 +2070,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'db2835aa-b0c3-4c9a-abe6-5b09568fffda',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1979,6 +2088,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f17742b9-0096-4b03-b981-f0dcd3f7e8c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2003,6 +2113,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'dfb4e6cd-5fb6-4476-9772-f2c8e2143bb6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2020,6 +2131,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '4553e8c2-3446-4e11-a967-0504509087a4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2044,6 +2156,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'bed7693b-ccd1-4803-b065-5e20fac13881',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2068,6 +2181,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9f9b030b-31ba-4ae9-88da-76efd8a140dc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2085,6 +2199,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '628147c3-5f93-4a49-a1bc-ac6685e06b64',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2102,6 +2217,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a6138fdf-ad70-4ec6-aee7-b3e5fda2e2bb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2119,6 +2235,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8d837989-4a21-4943-bb4c-4d4abb9a7a55',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2136,6 +2253,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f9b94931-2255-449d-aeab-60bfaa69c449',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2153,6 +2271,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ade283c3-937e-4502-a040-c69d6ddb3c50',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2170,6 +2289,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd2d81879-9190-45fd-b2a1-9ea6c0b0c12e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2187,6 +2307,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e76cf555-112a-4021-9a1e-b4ee52d7be8a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2204,6 +2325,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '1be0f2e4-0270-4ef4-8449-369b9dabcf48',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2221,6 +2343,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5eb879c0-f6e3-45b6-b220-cb5131422a83',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2238,6 +2361,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '74126149-0257-4844-956d-8f155181ba98',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2255,6 +2379,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b877b188-693c-43a3-9121-a37a3943d7c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2272,6 +2397,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '4982807f-9ad8-47a3-992c-8e18c626394f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2289,6 +2415,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '87a4b892-c4cb-4032-8511-e18ba8c8c202',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2306,6 +2433,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f1deeb63-5df2-45ff-b281-a41d9b2cd122',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2323,6 +2451,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'e6c263b1-da39-4a73-8585-637dc3a5b8eb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2340,6 +2469,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8835dfef-4d87-4104-b93c-47c5e02e4acc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2357,6 +2487,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd5d03647-f29e-44a4-9e63-5feb9f4adbae',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2374,6 +2505,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3ca01651-a5c3-46c3-b7a8-bfb0d9f6e105',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2391,6 +2523,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '378a9839-97ce-4bdb-8961-a9164738a3bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2408,6 +2541,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '365d08ee-fe6e-47c4-b567-a001212f2cb6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2425,6 +2559,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2442,6 +2577,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2475,6 +2611,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2492,6 +2629,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'f73b86df-6954-4689-bb74-9af8c9fc0c79',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2516,6 +2654,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd23a041c-6897-4cef-8941-a26a2114a865',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2540,6 +2679,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '7c652c71-e00e-45ff-8acb-e1bc0344e4c0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2557,6 +2697,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '70a2d820-64af-4f51-8b1a-522aed9572bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2574,6 +2715,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '22a668bc-d169-4346-9929-3819673c67ac',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2591,6 +2733,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3c1db8b4-65f2-4f6f-8391-5883f564eabe',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2608,6 +2751,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '4553e8c2-3446-4e11-a967-0504509087a4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2632,6 +2776,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'db2835aa-b0c3-4c9a-abe6-5b09568fffda',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2649,6 +2794,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e260d101-177f-4722-9b95-417f650f578e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2666,6 +2812,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'cc01a6b1-7f18-4452-bfa6-4d64fc595a49',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2683,6 +2830,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '65341477-33f1-4d58-9b3c-c371168809da',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2700,6 +2848,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f22fd59e-4d06-4578-b0bb-a624b8efd145',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2717,6 +2866,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '03de1a61-d639-4d48-8ce6-fcf16c8f6270',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2734,6 +2884,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4a3ccf7-e259-4b72-ad4c-216b15d6d4f7',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2751,6 +2902,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b9f98c3d-a93a-4b19-b89e-4c62781f9b99',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2768,6 +2920,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '145966d2-32bf-42a7-8a7b-cc44aa93490d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2785,6 +2938,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '33fb33c3-1ff2-4d4c-8fe8-6aaa93c1646a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2809,6 +2963,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2826,6 +2981,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8d837989-4a21-4943-bb4c-4d4abb9a7a55',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2843,6 +2999,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '1133b764-a578-4159-abfb-bf3452801974',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2860,6 +3017,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ade283c3-937e-4502-a040-c69d6ddb3c50',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2877,6 +3035,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6013de6f-f99d-4fa5-b75c-b1973a901e04',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2894,6 +3053,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e76cf555-112a-4021-9a1e-b4ee52d7be8a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2911,6 +3071,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f1deeb63-5df2-45ff-b281-a41d9b2cd122',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2928,6 +3089,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5eb879c0-f6e3-45b6-b220-cb5131422a83',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2945,6 +3107,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8835dfef-4d87-4104-b93c-47c5e02e4acc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2962,6 +3125,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b877b188-693c-43a3-9121-a37a3943d7c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2979,6 +3143,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd5d03647-f29e-44a4-9e63-5feb9f4adbae',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2996,6 +3161,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '87a4b892-c4cb-4032-8511-e18ba8c8c202',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3013,6 +3179,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3ca01651-a5c3-46c3-b7a8-bfb0d9f6e105',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3030,6 +3197,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'e6c263b1-da39-4a73-8585-637dc3a5b8eb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3047,6 +3215,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '365d08ee-fe6e-47c4-b567-a001212f2cb6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3064,6 +3233,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9f9b030b-31ba-4ae9-88da-76efd8a140dc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3081,6 +3251,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3bb6d77d-05bf-4447-a6bb-4af197ec9290',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3098,6 +3269,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '378a9839-97ce-4bdb-8961-a9164738a3bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3115,6 +3287,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '628147c3-5f93-4a49-a1bc-ac6685e06b64',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3132,6 +3305,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3149,6 +3323,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3182,6 +3357,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3199,6 +3375,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a1033166-8112-45f9-8af8-c15a53d30c04',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3216,6 +3393,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3233,6 +3411,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3266,6 +3445,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3283,6 +3463,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'dde8525b-6cce-4922-a7e0-9dcad5622b4e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3300,6 +3481,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '416df962-4468-4665-af1d-da81c9256464',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3317,6 +3499,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '26e695f7-e7fe-47f4-a692-002dcd2df434',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3334,6 +3517,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'aeec50c6-9a39-45ff-8210-f5f3aa6a815b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3351,6 +3535,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3368,6 +3553,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a015aceb-5024-480c-88ea-fd9e4ad2d9f1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3385,6 +3571,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'aa4804ce-9099-4006-b089-d05990461668',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3402,6 +3589,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a0e9a1e1-d32b-4bb7-b3e8-e146b5427405',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3419,6 +3607,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '45a7e8c9-6e44-4e0c-b0c5-3055cdb81a12',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3436,6 +3625,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '65341477-33f1-4d58-9b3c-c371168809da',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3453,6 +3643,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd42f8ec2-710c-41a9-98b6-b74b19213cdb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3477,6 +3668,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '1a0ff40c-90bc-472f-a465-8afefb595a6b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3494,6 +3686,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(1024)',
 					'default' => '',
+					'GUID' => '68dcb3dc-15b2-4357-8c87-f2fb316e9ae0',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3511,6 +3704,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '82b08f94-4ed2-40cf-a311-e323e69d47b1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3535,6 +3729,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'bdd69212-bb69-40b1-8a16-6b665ae94a36',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3552,6 +3747,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '4e23487e-5052-4f04-9352-15c4b75031d8',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3576,6 +3772,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '645ed24e-5159-40a2-bd50-4aa26e625848',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3593,6 +3790,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7ee9f69e-1b64-45c6-90db-d0558f6e40e7',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3617,6 +3815,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4a3ccf7-e259-4b72-ad4c-216b15d6d4f7',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3634,6 +3833,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '00157fc5-d94e-4ac0-80fe-7e5ac5c356b5',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3651,6 +3851,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => 'd937bf3c-2b58-4df4-a6a5-b497bb7b8245',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3668,6 +3869,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '145966d2-32bf-42a7-8a7b-cc44aa93490d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3685,6 +3887,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3702,6 +3905,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3735,6 +3939,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3752,6 +3957,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '7568fcc2-bd06-438c-9666-fe3bde32306f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3769,6 +3975,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '46503007-43d9-485f-8cd0-8427a6a8bef2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3786,6 +3993,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '88173ddb-35c5-49a7-845d-0d4e12119a37',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3803,6 +4011,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b97daa06-7589-43e1-aaf9-c9506756f7b4',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3820,6 +4029,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7dd15ec3-1830-4f4c-9497-d33618702263',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3837,6 +4047,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b9c064cb-4266-4217-95b7-d2956e6bfefb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3854,6 +4065,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0ec2dbcd-8acc-438f-ad28-906fc7b6474e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3871,6 +4083,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'c73c3033-f4d9-475a-977b-9e447b88272f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3888,6 +4101,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '3b731d0a-3205-4409-a9fd-e74d1db25055',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3905,6 +4119,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8dfde218-c13c-4e7e-be62-d651cafc9d43',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3922,6 +4137,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'e1bcb366-b7e0-47d7-9a5f-58f8d8d0307d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3939,6 +4155,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3956,6 +4173,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '0d2bdd49-7559-4cc1-a25b-56aacb830760',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3973,6 +4191,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '92ff3e2c-081b-4b84-a10c-e1a9f3245063',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3990,6 +4209,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5637623b-c82f-4ce2-be82-e262e9596fa2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4007,6 +4227,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '1',
+					'GUID' => '916b0b6e-b5dc-469e-bc9c-c809471903b4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4024,6 +4245,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c56cf55d-fbc6-4246-b3c3-7810d42710b2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4041,6 +4263,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '5f2ddc22-11f5-49a5-bebf-8313d8006e46',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4058,6 +4281,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f23fc722-e0e2-422f-b0f5-ac17da162a63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4075,6 +4299,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '21eff77d-da38-4ce1-96c5-e6af26463942',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4092,6 +4317,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a921c373-45bb-4919-a840-5b13511102cb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4109,6 +4335,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6e7d306a-9210-41bd-b951-6e897fcff773',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4126,6 +4353,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '887264da-8ea1-4333-8a12-de26f6041251',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4143,6 +4371,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '120e7c82-ff53-44ec-bfa0-a1413d100d18',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4160,6 +4389,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0c06ec4b-448e-4c8a-8869-d424b6ab1f4a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4177,6 +4407,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8ac3beb5-c100-41d6-8d2e-dd3e57f3701a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4194,6 +4425,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '2f0432b4-e601-474e-9edb-4b438517039b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4211,6 +4443,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0523633b-2f83-4205-ad7a-f4a77dff3dd0',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4228,6 +4461,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '70c62a1a-a141-4e0e-a271-c606744cb92c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4245,6 +4479,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '77067bb3-3cfa-4042-b3ac-8bdda9d8b492',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4262,6 +4497,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4b56d60-7171-43c9-89ad-03f04a2cdba1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4279,6 +4515,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a5043582-b29c-4ede-a712-16de9346abed',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4296,6 +4533,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8e8e12f8-8d8c-43f1-bbbd-8ef19b4d326e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4313,6 +4551,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4d3c22b-1297-450b-8108-c389f834e354',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4330,6 +4569,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '0',
+					'GUID' => '6336be5a-77e0-46e2-8d1f-9278a4b10080',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4347,6 +4587,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '96e3d0e6-e8b5-488f-8758-7cec18bd5858',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4371,6 +4612,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5eb879c0-f6e3-45b6-b220-cb5131422a83',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4388,6 +4630,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '95eb062e-f221-43b4-b4d4-c32e9d70e8a7',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4405,6 +4648,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '7e6e7fa8-d17b-47ae-9a28-b02ea4936b81',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4422,6 +4666,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '1eecc354-f454-48dd-ab12-4cf85b88f97b',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4439,6 +4684,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '4b956c45-bbcd-4d01-82ce-a85270f44c10',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4456,6 +4702,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f2581140-5d9c-4c29-b511-e12a826d15da',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4473,6 +4720,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '6746d3ba-b120-4918-8bba-2a14260e99c8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4490,6 +4738,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '562bc505-cc89-4a55-956a-b53e1a87ef46',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4507,6 +4756,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '1ad12721-9ee9-4623-98d2-071ba013a373',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4524,6 +4774,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'cc7954c1-d9f7-4a97-8b71-23f6f694bd6d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4541,6 +4792,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a2098911-926a-42b6-8498-d8a453c34d93',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4558,6 +4810,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5799fcb7-8de8-41bf-9a2a-dcf84cae3949',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4575,6 +4828,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '63d5585f-c9bd-485d-9c1d-4a29a4fbf4b2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4592,6 +4846,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '45559d2a-7537-4719-8caa-aa99df171000',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4609,6 +4864,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '42991cef-d988-4ad9-b3d2-f29d9809f0b3',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4626,6 +4882,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '4550b372-974e-432c-8221-69b6fb65fdfd',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4643,6 +4900,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5f7479f2-b499-4094-8294-d580e51244a1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4660,6 +4918,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '30744253-e2cd-44c3-ac86-0de3741b9ce0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4677,6 +4936,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '9405da44-900c-4f7c-823d-734a68f5d6f6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4694,6 +4954,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5b8bfcb4-a2b0-4ee9-931e-474ae9742e76',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4711,6 +4972,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a99c1f40-4b41-4167-ad29-85133375aa7a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4728,6 +4990,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '1e5269aa-e342-4b63-830e-f0a7acb2dab4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4745,6 +5008,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'e19c4fa4-804f-488b-90d7-1ea827bba52e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4762,6 +5026,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '0c7535bd-dbfa-4155-bc06-9ef34bf0f29a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4779,6 +5044,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ec2db8b1-d779-4bf2-b4cd-374a894fdc83',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4796,6 +5062,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '90c08eb4-3097-4f59-a291-5959bbb174ad',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4813,6 +5080,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '70995b9c-d0a9-4a57-b59b-54d39c379e66',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4830,6 +5098,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3b02a65c-1a0a-4e04-8306-34cb484c45fe',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4847,6 +5116,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '34bf9926-34a4-49a3-a29e-b602b1e5f9b2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4864,6 +5134,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3eb7643a-7205-4683-9b8b-80c2d65334eb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4881,6 +5152,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(1)',
 					'default' => '0',
+					'GUID' => 'ab222d85-e408-44de-a513-d6aeda48b286',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4898,6 +5170,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '79a25c26-9ea4-481c-b833-6699dd6e34d0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4915,6 +5188,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f962e778-623e-40a8-b7db-88df71fdac51',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4932,6 +5206,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8272a897-9044-4e62-964f-89cd90e99bbb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4949,6 +5224,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e268c7be-dc34-40d9-bf2c-5f1897a09f7c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4966,6 +5242,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '46fa9c1e-5aa3-41ff-8f02-e9a80252ad9f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4983,6 +5260,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5e831983-665b-43f2-9786-5e7c9cbb9e96',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5000,6 +5278,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '1',
+					'GUID' => '025cfab0-7736-4036-9eec-8f70e53f681b',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5017,6 +5296,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fe8a8811-1bcd-448a-a111-25e17ac47687',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5034,6 +5314,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '1',
+					'GUID' => '29e8af00-5d33-4ddc-8643-9f331da7684e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5051,6 +5332,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '46e5c9d6-6304-4e9f-a582-242308667e2f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5068,6 +5350,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '7c652c71-e00e-45ff-8acb-e1bc0344e4c0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5085,6 +5368,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '625b65cb-7569-437a-a6dd-b3290c662e18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5102,6 +5386,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '33a9df05-3e39-4cc8-af2b-234653aadb7a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5119,6 +5404,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c731b5f5-5bd3-4ad3-ac3e-9e0281104121',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5136,6 +5422,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5153,6 +5440,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e407f6f1-e4e9-4f23-a8c7-8ad75e14a820',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5186,6 +5474,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5203,6 +5492,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5220,6 +5510,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'a5ef0756-5ecd-49ae-a36c-058b90758988',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5237,6 +5528,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd20027fe-4e74-4261-9bf2-7e573a3e883b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5261,6 +5553,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '32564da8-5599-4577-bd93-fd425179612f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5278,6 +5571,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fd03122f-8c74-468a-8f8c-704e927c3b65',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5295,6 +5589,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7d733ad8-a5bf-4e2f-859d-be1251b7d0f1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5312,6 +5607,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ccb3cb86-8403-4494-a284-ce1fb782f0af',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5329,6 +5625,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '25c87995-f58f-4f6a-8f6b-2e462545bdd6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5346,6 +5643,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '83871f4f-e406-416a-845e-a8257a4a34d3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5363,6 +5661,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6e214a72-6c96-40c0-abf3-5f09116d3018',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5380,6 +5679,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'fc4bc2f3-1a12-4484-88dc-273199fe3b63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5404,6 +5704,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '3b731d0a-3205-4409-a9fd-e74d1db25055',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5421,6 +5722,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '6ce6e81e-5cdf-4ea2-83b5-acde779f4297',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5438,6 +5740,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'c7b20fcd-0849-49cc-84c2-0dbb73a19fda',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5455,6 +5758,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f76ffc06-f4c9-417e-8584-bc2f65184d18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5472,6 +5776,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'bed7693b-ccd1-4803-b065-5e20fac13881',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5496,6 +5801,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '075b5082-3fb1-46f1-a838-da558b3afb54',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5513,6 +5819,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c731b5f5-5bd3-4ad3-ac3e-9e0281104121',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5530,6 +5837,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '4a8003fa-7458-405e-90d3-7728b1af9e86',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5547,6 +5855,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '46fa9c1e-5aa3-41ff-8f02-e9a80252ad9f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5564,6 +5873,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '14c857e3-e684-49a3-8b34-1cf7448ed0c4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5581,6 +5891,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8b09aaf9-546c-4f03-8b1f-3170ba4b5491',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5598,6 +5909,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '625b65cb-7569-437a-a6dd-b3290c662e18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5615,6 +5927,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f17742b9-0096-4b03-b981-f0dcd3f7e8c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5639,6 +5952,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e407f6f1-e4e9-4f23-a8c7-8ad75e14a820',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5656,6 +5970,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'c37aa662-719c-4ed5-bbf2-e36672a3ce33',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5680,6 +5995,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4d3c22b-1297-450b-8108-c389f834e354',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5697,6 +6013,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e27df414-cf8a-45c3-bc38-cc48e6146fef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5714,6 +6031,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(1)',
 					'default' => '0',
+					'GUID' => 'ab222d85-e408-44de-a513-d6aeda48b286',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5731,6 +6049,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '96963615-e3bb-4d37-83df-4ad3fca74536',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5748,6 +6067,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f962e778-623e-40a8-b7db-88df71fdac51',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5765,6 +6085,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ffecfa82-c326-4703-9cc3-69d6f313bd32',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5782,6 +6103,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e268c7be-dc34-40d9-bf2c-5f1897a09f7c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5799,6 +6121,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5816,6 +6139,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5e831983-665b-43f2-9786-5e7c9cbb9e96',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5849,6 +6173,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5866,6 +6191,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5883,6 +6209,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'a5ef0756-5ecd-49ae-a36c-058b90758988',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5900,6 +6227,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd20027fe-4e74-4261-9bf2-7e573a3e883b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5924,6 +6252,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '32564da8-5599-4577-bd93-fd425179612f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5941,6 +6270,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '46fa9c1e-5aa3-41ff-8f02-e9a80252ad9f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5958,6 +6288,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8b09aaf9-546c-4f03-8b1f-3170ba4b5491',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5975,6 +6306,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ccb3cb86-8403-4494-a284-ce1fb782f0af',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5992,6 +6324,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '83871f4f-e406-416a-845e-a8257a4a34d3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6009,6 +6342,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '25c87995-f58f-4f6a-8f6b-2e462545bdd6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6026,6 +6360,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'c7b20fcd-0849-49cc-84c2-0dbb73a19fda',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6043,6 +6378,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6e214a72-6c96-40c0-abf3-5f09116d3018',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6060,6 +6396,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'fc4bc2f3-1a12-4484-88dc-273199fe3b63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6084,6 +6421,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '6ce6e81e-5cdf-4ea2-83b5-acde779f4297',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6101,6 +6439,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'bed7693b-ccd1-4803-b065-5e20fac13881',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6125,6 +6464,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fd03122f-8c74-468a-8f8c-704e927c3b65',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6142,6 +6482,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '075b5082-3fb1-46f1-a838-da558b3afb54',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6159,6 +6500,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7d733ad8-a5bf-4e2f-859d-be1251b7d0f1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6176,6 +6518,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f76ffc06-f4c9-417e-8584-bc2f65184d18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6193,6 +6536,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c731b5f5-5bd3-4ad3-ac3e-9e0281104121',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6210,6 +6554,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '4a8003fa-7458-405e-90d3-7728b1af9e86',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6227,6 +6572,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f17742b9-0096-4b03-b981-f0dcd3f7e8c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6251,6 +6597,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '14c857e3-e684-49a3-8b34-1cf7448ed0c4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6268,6 +6615,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'c37aa662-719c-4ed5-bbf2-e36672a3ce33',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6292,6 +6640,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '625b65cb-7569-437a-a6dd-b3290c662e18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6309,6 +6658,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e407f6f1-e4e9-4f23-a8c7-8ad75e14a820',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6326,6 +6676,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(1)',
 					'default' => '0',
+					'GUID' => 'ab222d85-e408-44de-a513-d6aeda48b286',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6343,6 +6694,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4d3c22b-1297-450b-8108-c389f834e354',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6360,6 +6712,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '29a26946-d7c3-4ea0-be64-8e376d2a7f25',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6377,6 +6730,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e27df414-cf8a-45c3-bc38-cc48e6146fef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6394,6 +6748,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '96963615-e3bb-4d37-83df-4ad3fca74536',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6411,6 +6766,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f962e778-623e-40a8-b7db-88df71fdac51',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6428,6 +6784,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ffecfa82-c326-4703-9cc3-69d6f313bd32',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6445,6 +6802,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e268c7be-dc34-40d9-bf2c-5f1897a09f7c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6462,6 +6820,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6479,6 +6838,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5e831983-665b-43f2-9786-5e7c9cbb9e96',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6512,6 +6872,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6529,6 +6890,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'a5ef0756-5ecd-49ae-a36c-058b90758988',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6546,6 +6908,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5087f379-710b-4e76-9b9d-86b842933991',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6570,6 +6933,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6587,6 +6951,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e27df414-cf8a-45c3-bc38-cc48e6146fef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6604,6 +6969,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8b09aaf9-546c-4f03-8b1f-3170ba4b5491',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6621,6 +6987,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7b57c7ca-f4e8-4358-948a-987b1f36b3fb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6638,6 +7005,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'fc4bc2f3-1a12-4484-88dc-273199fe3b63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6662,6 +7030,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f17742b9-0096-4b03-b981-f0dcd3f7e8c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6686,6 +7055,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '477832a1-7a25-4774-ad1a-4ff69ed4b374',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6719,6 +7089,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6736,6 +7107,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'a5ef0756-5ecd-49ae-a36c-058b90758988',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6753,6 +7125,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5087f379-710b-4e76-9b9d-86b842933991',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6777,6 +7150,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'fc4bc2f3-1a12-4484-88dc-273199fe3b63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6801,6 +7175,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6818,6 +7193,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e27df414-cf8a-45c3-bc38-cc48e6146fef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6835,6 +7211,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8b09aaf9-546c-4f03-8b1f-3170ba4b5491',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6852,6 +7229,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7c9289e1-b326-4596-9dd8-f6ebe861a0ef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6869,6 +7247,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f17742b9-0096-4b03-b981-f0dcd3f7e8c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6893,6 +7272,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '477832a1-7a25-4774-ad1a-4ff69ed4b374',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6926,6 +7306,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6943,6 +7324,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '1709c1a3-b26a-4e78-82f9-ff05a08738c9',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6960,6 +7342,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5377a931-8a17-4eed-92dd-8a8808408a5a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6977,6 +7360,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9b6768ae-8d6a-461e-9b41-61d49431a401',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6994,6 +7378,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '88ffbef3-064c-4f87-997a-30af1c88f2ec',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7011,6 +7396,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '01ae4944-ceba-4c21-a02d-38222e1a3733',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7028,6 +7414,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd4b30bcc-414d-403b-9627-037bcbbd1c6b',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7045,6 +7432,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '14f4d49c-7e54-494e-b103-eaccb6428ee8',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7062,6 +7450,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b7aaa1d0-4577-46eb-9d09-b4c1104a02a8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7079,6 +7468,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'bd40a792-2b63-446a-af75-0510f8c7cc2c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7096,6 +7486,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'c1754272-da91-4a17-9567-c2566552cdc9',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7113,6 +7504,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '4c744096-3d1c-406d-87f4-71169002e85f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7137,6 +7529,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8aba2f06-8fd1-4256-add5-1e233e581315',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7154,6 +7547,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '13637273-b286-42f5-b092-90e507484751',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7171,6 +7565,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '661c16f9-71be-41e2-8428-efd5509e6291',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7188,6 +7583,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'f398a2ca-122e-47ad-8e4e-3ee2ac30bf26',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7212,6 +7608,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f2581140-5d9c-4c29-b511-e12a826d15da',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7229,6 +7626,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6c75d3ff-93aa-493b-b25c-733e78408fa2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7246,6 +7644,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'fbb918ff-70bf-41ee-b1fd-110e38cbdba0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7263,6 +7662,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c3bb9074-505a-4085-878b-f7ad3d5522a6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7280,6 +7680,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '6c486f71-abfd-49c7-91e2-165f594fa658',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7297,6 +7698,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fc0dcf64-f6a8-48d7-8ed7-6ecea942cf21',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7314,6 +7716,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => 'b99a8df9-27ce-4502-9f44-863799cd2cc9',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7331,6 +7734,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b9c064cb-4266-4217-95b7-d2956e6bfefb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7348,6 +7752,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '71680787-5da5-4ab8-afdf-1e109556743b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7365,6 +7770,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'bf2293c7-5c8b-4b77-a880-c63ca4777e3e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7382,6 +7788,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '1ae39469-cd74-4d82-84af-fec8af28be61',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7399,6 +7806,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '81466df0-3571-45cf-b520-cee2a9f5e03b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7416,6 +7824,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '007dc9f8-9b06-4211-83c9-4134b23d6561',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7433,6 +7842,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '6e7bb46d-fda5-46b8-b08e-31a2e6884e24',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7450,6 +7860,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f37d69ac-ba75-4b2f-8793-91b77b86751f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7467,6 +7878,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fa2f73d6-8427-47de-abd8-4290da426b49',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7484,6 +7896,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7501,6 +7914,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '79ab7f6c-a6b5-4bad-bcdd-c113d49db876',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7534,6 +7948,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7551,6 +7966,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b7942a37-45cc-4005-b4b5-e716cbf176f9',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7568,6 +7984,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b4fce451-7c6d-4cf9-8b1c-f8be6dbcec5b',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7585,6 +8002,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd1c48683-2655-4e49-9f13-6b25f2b0a0d0',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7602,6 +8020,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '176c63c6-65b1-4a91-97f2-db4d1e36911a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7619,6 +8038,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '3',
+					'GUID' => 'a6c87660-f1fe-490d-b1c5-9755e6db1e19',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7636,6 +8056,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '3a3c43e6-18c2-4fc6-aebe-0ed8d5c6416f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7653,6 +8074,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '777b846c-f3f4-4eb3-a73a-a460d28976dc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7670,6 +8092,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '3347f841-b8e8-4f52-acbd-0bada696e540',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7687,6 +8110,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(100)',
 					'default' => '',
+					'GUID' => 'ebbfce08-7d5a-416a-aad2-b23b78bd926b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7704,6 +8128,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(100)',
 					'default' => '',
+					'GUID' => '82e196f5-cc38-4045-8be3-c1067b23df72',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7721,6 +8146,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => 'e0272089-9156-409b-8444-61e2e3e755bf',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7738,6 +8164,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '04886e45-7821-40a6-ae2b-2f46c6b45906',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7778,6 +8205,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7795,6 +8223,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '7222c742-0092-439c-84de-1973e4e2b180',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7812,6 +8241,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '7e059ab7-d79b-4218-9488-6f38d85d17a0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7829,6 +8259,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7846,6 +8277,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'dd400eb4-8762-4ab5-bc4e-fa1feacc4dfd',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7863,6 +8295,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd23a041c-6897-4cef-8941-a26a2114a865',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7887,6 +8320,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '73ef5c00-c8c5-4cb7-9f69-6aed98346818',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7920,6 +8354,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7937,6 +8372,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '7222c742-0092-439c-84de-1973e4e2b180',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7954,6 +8390,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '7e059ab7-d79b-4218-9488-6f38d85d17a0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7971,6 +8408,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7988,6 +8426,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'abaff633-2a9f-4be1-b057-241f657953a1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8005,6 +8444,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'dd400eb4-8762-4ab5-bc4e-fa1feacc4dfd',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8022,6 +8462,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd23a041c-6897-4cef-8941-a26a2114a865',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8046,6 +8487,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'd2a2f6cf-1689-438b-b2c2-b244b8cbf078',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8079,6 +8521,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '65b533a8-0d70-44af-a9d1-785983eb4ef3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8096,6 +8539,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b14c6496-2aaf-4198-8fc1-cf034525fb91',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8129,6 +8573,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8146,6 +8591,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '07c71471-04cd-4217-a63e-4ca97d880950',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8163,6 +8609,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '0051004f-b0ec-47c4-bfdb-0d8e76adbbb8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8187,6 +8634,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f2940a48-f104-4c11-86ef-ed6456a1211c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8204,6 +8652,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '09b25ca3-6c9f-4b6d-ad80-e0989c221289',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8221,6 +8670,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7e1418d5-5515-49f6-99ed-166365b9b963',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8245,6 +8695,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b70529a1-30bb-42c0-822f-802c23bd616b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8262,6 +8713,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '48d69b71-6eba-480a-b17b-c67243f02d06',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8279,6 +8731,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8312,6 +8765,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8329,6 +8783,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'd29d6854-bb4a-4fa2-83a1-5a1b9c9a0eaf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8346,6 +8801,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '0cc69ef6-eb4d-4a0d-ad40-84bc1845e48f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8370,6 +8826,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'fc671dc8-a9be-43d9-b42a-671750ad869d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8387,6 +8844,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '8b97aaa3-28ae-45f1-80ad-6f37116264cf',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8411,6 +8869,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8428,6 +8887,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '1e0608ea-045b-494b-aac6-060dc76da782',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8445,6 +8905,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '6803fdeb-c251-4588-85c9-d0e8636d18ab',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8462,6 +8923,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '3a1db9fd-204e-4693-bcf7-2084d26c1013',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8479,6 +8941,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'cef2d060-95cf-409a-92c9-02de0c164640',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8496,6 +8959,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '144a1f95-97d5-42b4-be3e-39f21215780e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8513,6 +8977,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '155d8238-a2cf-446c-91a5-c8322ee1d890',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8530,6 +8995,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8563,6 +9029,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '9a98c57f-bf01-49b0-91e3-e72e1b9551f1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8580,6 +9047,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '46503007-43d9-485f-8cd0-8427a6a8bef2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8597,6 +9065,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '419fa655-e64a-4e39-b124-29eeb3198bc7',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8621,6 +9090,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '24ed6b0e-c86c-4131-91a7-5205ac931ad5',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8654,6 +9124,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8671,6 +9142,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '91a4f538-1383-4ae4-85d8-55ddada7d6cd',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8695,6 +9167,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'e41e74b2-a265-4269-8ec6-1d890c893798',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8712,6 +9185,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '63ff758d-a866-4d37-bc2a-a7432bd9bb44',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8729,6 +9203,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6a3d21ad-7cb1-4456-a623-20aa71ba0b12',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8746,6 +9221,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '48b78ab1-bfb0-44eb-9ec8-4f5cdbf4a32c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8763,6 +9239,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => 'ef722d2d-0fa0-4aa7-92d2-7783ec1c9f7f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8780,6 +9257,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'dc69b6d4-2e6f-4f2d-86d9-0fb6534164ca',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8797,6 +9275,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0f0ef89c-e305-408d-ac95-6a86efe28c5a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8814,6 +9293,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9d32c0a5-e010-44f2-8b53-3372c87da08d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8831,6 +9311,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '83a3c115-1a4f-44a7-9572-e91043acdbaa',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8848,6 +9329,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'b3ea0d94-1029-41d8-9f6b-bcbec6b715f4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8865,6 +9347,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a99c1f40-4b41-4167-ad29-85133375aa7a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8882,6 +9365,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '63d5585f-c9bd-485d-9c1d-4a29a4fbf4b2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8899,6 +9383,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '1ad12721-9ee9-4623-98d2-071ba013a373',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8916,6 +9401,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6b2277f3-44e1-4bbb-8e55-3315bdba736e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8933,6 +9419,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6ba76a0f-55a4-49ce-911a-0a3f05674bef',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8950,6 +9437,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'fd7ff7b0-a8e9-476c-8e9d-ac4ca338c589',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8967,6 +9455,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '34bf9926-34a4-49a3-a29e-b602b1e5f9b2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8984,6 +9473,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '6746d3ba-b120-4918-8bba-2a14260e99c8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9001,6 +9491,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a2098911-926a-42b6-8498-d8a453c34d93',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9018,6 +9509,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '9405da44-900c-4f7c-823d-734a68f5d6f6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9035,6 +9527,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '70995b9c-d0a9-4a57-b59b-54d39c379e66',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9052,6 +9545,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '49a285a3-2c16-4846-9dbf-94c9cc6496c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9069,6 +9563,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9102,6 +9597,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9119,6 +9615,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '48b78ab1-bfb0-44eb-9ec8-4f5cdbf4a32c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9136,6 +9633,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6a3d21ad-7cb1-4456-a623-20aa71ba0b12',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9153,6 +9651,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '63ff758d-a866-4d37-bc2a-a7432bd9bb44',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9170,6 +9669,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6b2277f3-44e1-4bbb-8e55-3315bdba736e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9187,6 +9687,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6ba76a0f-55a4-49ce-911a-0a3f05674bef',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9204,6 +9705,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '46503007-43d9-485f-8cd0-8427a6a8bef2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9221,6 +9723,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'e41e74b2-a265-4269-8ec6-1d890c893798',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9238,6 +9741,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'ec2ec4a2-a32f-4407-b318-46b5780774e2',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9255,6 +9759,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ddb8f57f-77c8-4cad-a8cb-0cdc799ce4a1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9272,6 +9777,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9289,6 +9795,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'b3ea0d94-1029-41d8-9f6b-bcbec6b715f4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9306,6 +9813,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'fd7ff7b0-a8e9-476c-8e9d-ac4ca338c589',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9323,6 +9831,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9340,6 +9849,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '7cc4ab46-0d77-4ef8-a2a7-d5b656546a30',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9373,6 +9883,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c2f5d193-ef76-422b-aae5-421cd0a4b22b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9390,6 +9901,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6e1717a7-99b8-4101-a0b0-fcf2a5e1cfa0',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9414,6 +9926,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'd3468164-df0a-4f0d-a679-1aa95ae408fe',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9438,6 +9951,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '61990265-efe5-49d3-ae08-4bd0e8f3e4ce',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9462,6 +9976,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '36edbdce-b9b7-4b89-b2d9-03f91bb56019',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9495,6 +10010,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9512,6 +10028,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '8fdf3640-8668-4818-be46-36c74f9e103e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9545,6 +10062,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9562,6 +10080,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a5bb2b19-d773-465c-a7e3-ce6400735734',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9579,6 +10098,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '59688b83-dca9-4491-aefb-39c18057394e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9596,6 +10116,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '29b8c31d-6e2a-4f8d-90c7-febfbb9cc16c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9613,6 +10134,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c6ccb2ba-4d74-487a-99a8-f2bfe40a23f1',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9630,6 +10152,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0a6939be-aabc-46df-b922-f083cf0c5bd4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9647,6 +10170,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '2c689678-6cef-40ef-97da-d59ab7d039d1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9664,6 +10188,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '452b22ac-adfc-4fca-9d82-5461806bf847',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9681,6 +10206,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '593fe848-22f3-45d1-8d8d-7824542a7381',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9698,6 +10224,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5a64961d-8aa6-4de4-92e2-997199e5a707',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9715,6 +10242,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3eed4f04-46cc-43e8-9712-b6e339e71241',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9732,6 +10260,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '41152cdd-e774-4edf-be9b-280d272d5712',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9765,6 +10294,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9782,6 +10312,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'eaaca317-58c7-4b72-9c20-166c12c04b67',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9799,6 +10330,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '4c224b6d-7b6b-4e5d-8df7-b96c26559476',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9816,6 +10348,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(7)',
 					'default' => '1',
+					'GUID' => 'd22126a7-7e85-4a7a-94d0-6ba9ab194772',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9833,6 +10366,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '3557698d-cfae-4a57-93fc-6030bac2768a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9850,6 +10384,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '0ca15427-abfa-4fac-8ce2-e70e5b8b2c0f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9867,6 +10402,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9884,6 +10420,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fb4e322b-46c0-47e5-b9eb-70c39456d80d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9901,6 +10438,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5e9038cf-bf09-4ec7-aa1d-60df007b96e2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9918,6 +10456,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '8a5addab-5545-4c33-bc1a-7aad217e04c6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9935,6 +10474,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'ce236d83-959b-4d1c-a736-b1717bee29bc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9952,6 +10492,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'f8aa483a-71b9-46c1-a08e-0f546076fd78',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9969,6 +10510,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'fcbab2f2-51bb-4f44-a5ac-a6266e187522',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10002,6 +10544,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'edda1847-ef2e-4a76-9763-c41c82b08c00',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10019,6 +10562,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8487b70c-4a32-46ba-aacb-ea07a1e3d278',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10036,6 +10580,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '59a0cad6-26cc-43b6-8af8-2242eb595d76',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10053,6 +10598,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '0d06a4f6-acd5-4acc-8a3f-28813de178ac',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10070,6 +10616,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(255)',
 					'default' => '',
+					'GUID' => 'd7f97213-2aa1-457c-9e60-d691cfcd905f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10094,6 +10641,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(255)',
 					'default' => '',
+					'GUID' => 'd52f96cd-df76-494b-8c25-146bb434b6af',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10118,6 +10666,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '335866ce-b81b-4329-901d-c20254135c9c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10135,6 +10684,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8b9665d1-f1d9-4d7e-bc2c-72479bf4686f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10152,6 +10702,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f312a8f7-34b9-4731-af00-3ff2092c65b9',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10176,6 +10727,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'd29d6854-bb4a-4fa2-83a1-5a1b9c9a0eaf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10193,6 +10745,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5810dc57-35ac-436e-88ff-117e1f501e67',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10212,6 +10765,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '3ac1327d-75d6-4a16-913d-ef4fdf54c11c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10236,6 +10790,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '15e1f13d-25db-46a4-ae7c-fb616140338e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10269,6 +10824,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '3ac1327d-75d6-4a16-913d-ef4fdf54c11c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10293,6 +10849,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '434a8099-51f0-49d1-bbbb-ed7aa5145a3c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10326,6 +10883,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '3ac1327d-75d6-4a16-913d-ef4fdf54c11c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10350,6 +10908,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '4e87b302-e17f-468e-8934-e5aaf78d6765',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10383,6 +10942,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '3ac1327d-75d6-4a16-913d-ef4fdf54c11c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10407,6 +10967,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '4b794f1a-1be4-4804-92e6-bda624f444b4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10440,6 +11001,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10464,6 +11026,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3bac32ec-8dcf-4257-b518-ecaa952140c2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10497,6 +11060,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10521,6 +11085,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8e225dcd-4e2b-464b-a9f3-b7d39d67de84',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10554,6 +11119,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10578,6 +11144,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b2423282-c8a8-400e-9ded-fe61cea433f4',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10611,6 +11178,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10635,6 +11203,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '1b98fc0a-d58f-4c81-a53f-30106e0c30eb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10668,6 +11237,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10692,6 +11262,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ce203691-6577-4c0d-90fb-539d07ea76c3',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10725,6 +11296,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10749,6 +11321,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '60d68340-14c1-45a9-8240-30f6bdf96345',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10782,6 +11355,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10806,6 +11380,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '4582a192-d46e-4dd9-9bbd-ee2e2ddd20e5',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10823,6 +11398,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '2b31ca2e-11ff-4f57-8c90-2b9bed743202',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10840,6 +11416,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '25fead1f-bb12-40e6-9e03-4e31b236f2e1',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10857,6 +11434,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3ab69198-0827-452b-93a4-6c7bb02ae7ae',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10874,6 +11452,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a411a365-69c8-4f70-a734-25956a9f3393',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10891,6 +11470,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '2321b486-80c4-4e24-81c5-6ddd205592ac',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10908,6 +11488,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '65544263-3215-4574-a977-dbf8ac2ce72a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10941,6 +11522,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10965,6 +11547,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '851d8f15-3ce4-42a3-9041-08c943f61cab',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10998,6 +11581,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11022,6 +11606,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fd0cceef-975e-4daa-a529-2c98446b9df3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11039,6 +11624,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e6c421c3-2f37-429a-a8d9-b552bed392a5',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11072,6 +11658,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11096,6 +11683,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fe780ac8-ed30-481c-8700-84472caa0072',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11113,6 +11701,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e5f50226-6749-4bd3-9aa1-cf3db6ce448d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11130,6 +11719,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '483f2c40-2348-4168-817b-471f5ba96984',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11147,6 +11737,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '143f8b3d-5b58-4b26-aaad-a5f14a57865b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11180,6 +11771,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11204,6 +11796,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fb4e322b-46c0-47e5-b9eb-70c39456d80d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11237,6 +11830,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11261,6 +11855,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9c787541-ed54-4516-bc21-9b6fe2e2e516',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11294,6 +11889,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11318,6 +11914,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5985271b-0795-4204-8739-ffa3d898bae8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11351,6 +11948,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11368,6 +11966,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '09b25ca3-6c9f-4b6d-ad80-e0989c221289',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11385,6 +11984,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11418,6 +12018,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'c6dddec0-c373-4069-bdcc-66acd474b648',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11442,6 +12043,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '851d8f15-3ce4-42a3-9041-08c943f61cab',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11475,6 +12077,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'c6dddec0-c373-4069-bdcc-66acd474b648',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11499,6 +12102,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fe780ac8-ed30-481c-8700-84472caa0072',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11516,6 +12120,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e5f50226-6749-4bd3-9aa1-cf3db6ce448d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11533,6 +12138,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '483f2c40-2348-4168-817b-471f5ba96984',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11550,6 +12156,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '143f8b3d-5b58-4b26-aaad-a5f14a57865b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11567,6 +12174,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c3474b9a-4677-4574-bda3-a4865569ac18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11600,6 +12208,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11617,6 +12226,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '7e059ab7-d79b-4218-9488-6f38d85d17a0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11634,6 +12244,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11651,6 +12262,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4a3ccf7-e259-4b72-ad4c-216b15d6d4f7',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11668,6 +12280,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3d80f045-6262-43c8-9b43-658093f6a057',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11701,6 +12314,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '79251a06-b217-4b3a-8485-b7286cb15bf6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11725,6 +12339,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7d49445c-4e95-4fd5-a2a4-a20bbcd4d812',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11758,6 +12373,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '79251a06-b217-4b3a-8485-b7286cb15bf6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11782,6 +12398,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fe780ac8-ed30-481c-8700-84472caa0072',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11799,6 +12416,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e5f50226-6749-4bd3-9aa1-cf3db6ce448d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11816,6 +12434,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '483f2c40-2348-4168-817b-471f5ba96984',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11833,6 +12452,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '143f8b3d-5b58-4b26-aaad-a5f14a57865b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11850,6 +12470,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c3474b9a-4677-4574-bda3-a4865569ac18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11883,6 +12504,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11900,6 +12522,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'b1edf3cc-3473-41c7-9825-372333299846',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11924,6 +12547,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11957,6 +12581,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd5aeaa99-9fba-4b67-b850-68e19256520a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11981,6 +12606,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7d49445c-4e95-4fd5-a2a4-a20bbcd4d812',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -12014,6 +12640,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd5aeaa99-9fba-4b67-b850-68e19256520a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -12038,6 +12665,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fe780ac8-ed30-481c-8700-84472caa0072',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -12055,6 +12683,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e5f50226-6749-4bd3-9aa1-cf3db6ce448d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -12072,6 +12701,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '483f2c40-2348-4168-817b-471f5ba96984',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -12089,6 +12719,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '143f8b3d-5b58-4b26-aaad-a5f14a57865b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -12106,6 +12737,7 @@ final class Table extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c3474b9a-4677-4574-bda3-a4865569ac18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Search.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Search.php
index fa15f67b7..cb06ee2ad 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Search.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Search.php
@@ -43,6 +43,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -60,6 +61,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'af7b6b08-e8c5-4551-b6e6-cde297e78e40',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -77,6 +79,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '46503007-43d9-485f-8cd0-8427a6a8bef2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -94,6 +97,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'f8c2c432-b756-4c67-bfa5-0871e58e55e3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -111,6 +115,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'DATETIME',
 					'default' => 'CURRENT_TIMESTAMP',
+					'GUID' => 'e091bf65-58cb-4bf4-aba3-22015889acc6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -128,6 +133,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '9e7c209f-68df-411a-a6a3-591393bc9d62',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -145,6 +151,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '58525d14-8cbf-49fc-8d8e-50a9ba0e846a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -162,6 +169,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b877b188-693c-43a3-9121-a37a3943d7c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -179,6 +187,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ade283c3-937e-4502-a040-c69d6ddb3c50',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -196,6 +205,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '667a2147-05d1-4138-b666-e8a0ce54ffba',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -213,6 +223,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '508b5e78-c91a-4aaa-b587-000759130d4e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -230,6 +241,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '2089f202-667a-4fbd-881c-cc0fe1343ce4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -247,6 +259,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '991ec7f9-257a-486c-9453-c6b1c3fd5bf0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -264,6 +277,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f4134f92-7dc5-4729-9a16-bfaa51de27f9',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -281,6 +295,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3be0d9ca-afd6-47bc-87e5-8cb73e9f5e61',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -298,6 +313,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -315,6 +331,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f5e0c377-6689-4f79-9a35-41a1bfc58ba5',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -332,6 +349,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'd4a595fb-2264-4e18-8b80-7affee1a6abf',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -349,6 +367,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8cb26845-73d8-438a-b28a-7a128a63a0d7',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -366,6 +385,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '2a9d2cda-1be7-4ae7-b672-9139a8a62d14',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -383,6 +403,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(255)',
 					'default' => '',
+					'GUID' => '9f474240-eb27-40d7-9512-fbb3acf370d5',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -400,6 +421,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '378a9839-97ce-4bdb-8961-a9164738a3bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -417,6 +439,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'e5346711-63a0-45b8-a093-06486959a1d0',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -434,6 +457,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a6c65a43-e305-42c1-bd9d-5db5e4920185',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -451,6 +475,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'b659c01d-accd-4049-bd4c-083000740d5a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -468,6 +493,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '4003ab3f-70d8-4092-a11b-b23215844ffa',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -485,6 +511,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a8b0ea74-9315-4f24-be43-836f249645f3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -502,6 +529,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'd4241cde-3446-4318-9269-905b7ea929f4',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -519,6 +547,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a052df3d-54b4-4da7-a0f6-f18703d1047b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -536,6 +565,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '33c588ca-83b2-419d-b87f-b9f4e5e4ea54',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -553,6 +583,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9f9b030b-31ba-4ae9-88da-76efd8a140dc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -570,6 +601,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'dde96c4d-1528-402a-bdea-96ec481a11ef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -587,6 +619,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3ca01651-a5c3-46c3-b7a8-bfb0d9f6e105',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -604,6 +637,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '3',
+					'GUID' => 'e30ca545-0ccd-4925-b34d-96bc27d6a27c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -621,6 +655,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8d837989-4a21-4943-bb4c-4d4abb9a7a55',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -638,6 +673,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '9ae98a1d-cc61-49d4-8f80-b4e1257fce24',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -655,6 +691,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e76cf555-112a-4021-9a1e-b4ee52d7be8a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -672,6 +709,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5eb879c0-f6e3-45b6-b220-cb5131422a83',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -689,6 +727,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '03de1a61-d639-4d48-8ce6-fcf16c8f6270',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -706,6 +745,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'e6c263b1-da39-4a73-8585-637dc3a5b8eb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -723,6 +763,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '46bd236f-7d43-4038-ac40-936dfd18e910',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -740,6 +781,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '43d7329c-c5f7-4bde-ab6e-a9a743879b51',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -757,6 +799,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '441646d1-27c5-4ea9-80d9-a1931de48b26',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -774,6 +817,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '98ad53ca-0da2-4aab-9a3c-1c7e1ee0a24e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -791,6 +835,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(1)',
 					'default' => '',
+					'GUID' => '50d55392-74b6-43e2-9b16-37c7f95a7402',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -808,6 +853,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'b742dcb4-0d29-4a4a-88f9-eca218d79a19',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -825,6 +871,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'ff624860-89db-4465-97f1-962bf09dcc9f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -842,6 +889,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8b68326a-0e09-4df9-807e-4c32c3c9600a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -859,6 +907,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(1)',
 					'default' => '',
+					'GUID' => '0e5f211c-d6d7-417a-af92-f3e956687f56',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -876,6 +925,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '7d31d363-03b6-4ca7-bbf4-df9a879e3006',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -893,6 +943,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(100)',
 					'default' => '',
+					'GUID' => '7971c559-0867-44a8-bfea-291881bad311',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -910,6 +961,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'c2afae90-c059-4efb-9705-b7cf161b0c2a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -927,6 +979,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'c5cbf873-d13a-4930-9c99-c8b1f03e1a06',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -944,6 +997,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '36fc971f-a446-49ae-94d0-2f270e60bd0b',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -961,6 +1015,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'cce91031-8bf4-435f-8b20-9224f230061a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -978,6 +1033,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => 'b12fadb6-2825-465e-a1e7-1dde507ffde5',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1002,6 +1058,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd5d03647-f29e-44a4-9e63-5feb9f4adbae',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1019,6 +1076,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '365d08ee-fe6e-47c4-b567-a001212f2cb6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1036,6 +1094,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a1aa4716-5ee0-495c-ac35-5a969277da39',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1053,6 +1112,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3c1db8b4-65f2-4f6f-8391-5883f564eabe',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1070,6 +1130,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'de21cce1-44f6-4310-a2c2-08146fb21cbe',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1087,6 +1148,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '22a668bc-d169-4346-9929-3819673c67ac',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1104,6 +1166,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'c8186809-e78b-4632-a2d1-ac2469ccb643',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1121,6 +1184,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '70a2d820-64af-4f51-8b1a-522aed9572bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1138,6 +1202,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '9a825342-c423-42d2-85ad-f74ce9625f99',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1155,6 +1220,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '7c652c71-e00e-45ff-8acb-e1bc0344e4c0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1172,6 +1238,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8e416ff9-3bd1-4115-a08b-06594978ace6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1189,6 +1256,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f22fd59e-4d06-4578-b0bb-a624b8efd145',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1206,6 +1274,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '05e16c3f-1f5e-4355-a948-5331546f218c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1223,6 +1292,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '3',
+					'GUID' => '1831e024-aa0c-4fc7-b1e6-77ce4dd4c562',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1240,6 +1310,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => 'c2ce0b7e-e917-40c0-9c63-016425dd11fd',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1257,6 +1328,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '87a4b892-c4cb-4032-8511-e18ba8c8c202',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1274,6 +1346,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'db2835aa-b0c3-4c9a-abe6-5b09568fffda',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1291,6 +1364,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b9f98c3d-a93a-4b19-b89e-4c62781f9b99',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1308,6 +1382,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '33fb33c3-1ff2-4d4c-8fe8-6aaa93c1646a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1332,6 +1407,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '4553e8c2-3446-4e11-a967-0504509087a4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1356,6 +1432,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'ec128453-f0a7-4b20-a109-56d85c6ce213',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1373,6 +1450,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'eac7c528-4764-45e8-8304-4b8701e10915',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1390,6 +1468,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '627ec119-f50c-4afc-bfe7-8455a7ace163',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1407,6 +1486,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '7b181242-b4bc-4261-87cb-6210ec8b5af5',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1424,6 +1504,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'ecdc0281-fc1b-4643-b9d0-41bf95674959',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1441,6 +1522,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '763e5bdf-d4d3-449b-bb36-de2623d81540',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1458,6 +1540,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b4013eb9-0716-42a5-a479-6c4b53746cd6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1475,6 +1558,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5dabe624-329e-48d6-82cf-1f417df55467',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1492,6 +1576,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '81cd22bd-ee49-470e-afa1-1f61b302734b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1509,6 +1594,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '16ec7ebd-d07a-4134-8537-d7b65bcd8bac',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1526,6 +1612,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0708c9c5-d918-43f9-8383-f3d4c7459cf9',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1543,6 +1630,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'abc5e604-4a2b-4f4c-9add-9e371249adf8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1560,6 +1648,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '288e00d8-7ea3-4bfc-829c-3ab247ca9718',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1577,6 +1666,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '16a76125-d200-4bbf-aa00-91da3513a8f8',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1594,6 +1684,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1611,6 +1702,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f114341a-d271-4917-a5eb-8d5acdf0232d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1628,6 +1720,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'DATETIME',
 					'default' => 'EMPTY',
+					'GUID' => '104b94e8-260f-4517-a4f8-80c6b3d4a10a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1645,6 +1738,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'b607dfed-bb4a-463d-9e14-f1264c67279b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1711,6 +1805,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1728,6 +1823,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '88d58023-7ee7-46dc-a13e-064fbb3d8dc1',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1745,6 +1841,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1762,6 +1859,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '70a2d820-64af-4f51-8b1a-522aed9572bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1779,6 +1877,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '22a668bc-d169-4346-9929-3819673c67ac',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1796,6 +1895,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3c1db8b4-65f2-4f6f-8391-5883f564eabe',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1813,6 +1913,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3bb6d77d-05bf-4447-a6bb-4af197ec9290',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1830,6 +1931,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '03de1a61-d639-4d48-8ce6-fcf16c8f6270',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1847,6 +1949,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6e214a72-6c96-40c0-abf3-5f09116d3018',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1864,6 +1967,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'fc4bc2f3-1a12-4484-88dc-273199fe3b63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1888,6 +1992,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '7c652c71-e00e-45ff-8acb-e1bc0344e4c0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1905,6 +2010,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b9f98c3d-a93a-4b19-b89e-4c62781f9b99',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1922,6 +2028,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f22fd59e-4d06-4578-b0bb-a624b8efd145',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1939,6 +2046,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '33fb33c3-1ff2-4d4c-8fe8-6aaa93c1646a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -1963,6 +2071,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'db2835aa-b0c3-4c9a-abe6-5b09568fffda',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -1980,6 +2089,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f17742b9-0096-4b03-b981-f0dcd3f7e8c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2004,6 +2114,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'dfb4e6cd-5fb6-4476-9772-f2c8e2143bb6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2021,6 +2132,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '4553e8c2-3446-4e11-a967-0504509087a4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2045,6 +2157,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'bed7693b-ccd1-4803-b065-5e20fac13881',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2069,6 +2182,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9f9b030b-31ba-4ae9-88da-76efd8a140dc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2086,6 +2200,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '628147c3-5f93-4a49-a1bc-ac6685e06b64',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2103,6 +2218,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a6138fdf-ad70-4ec6-aee7-b3e5fda2e2bb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2120,6 +2236,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8d837989-4a21-4943-bb4c-4d4abb9a7a55',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2137,6 +2254,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f9b94931-2255-449d-aeab-60bfaa69c449',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2154,6 +2272,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ade283c3-937e-4502-a040-c69d6ddb3c50',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2171,6 +2290,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd2d81879-9190-45fd-b2a1-9ea6c0b0c12e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2188,6 +2308,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e76cf555-112a-4021-9a1e-b4ee52d7be8a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2205,6 +2326,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '1be0f2e4-0270-4ef4-8449-369b9dabcf48',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2222,6 +2344,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5eb879c0-f6e3-45b6-b220-cb5131422a83',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2239,6 +2362,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '74126149-0257-4844-956d-8f155181ba98',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2256,6 +2380,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b877b188-693c-43a3-9121-a37a3943d7c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2273,6 +2398,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '4982807f-9ad8-47a3-992c-8e18c626394f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2290,6 +2416,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '87a4b892-c4cb-4032-8511-e18ba8c8c202',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2307,6 +2434,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f1deeb63-5df2-45ff-b281-a41d9b2cd122',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2324,6 +2452,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'e6c263b1-da39-4a73-8585-637dc3a5b8eb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2341,6 +2470,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8835dfef-4d87-4104-b93c-47c5e02e4acc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2358,6 +2488,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd5d03647-f29e-44a4-9e63-5feb9f4adbae',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2375,6 +2506,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3ca01651-a5c3-46c3-b7a8-bfb0d9f6e105',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2392,6 +2524,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '378a9839-97ce-4bdb-8961-a9164738a3bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2409,6 +2542,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '365d08ee-fe6e-47c4-b567-a001212f2cb6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2426,6 +2560,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2443,6 +2578,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2476,6 +2612,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2493,6 +2630,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'f73b86df-6954-4689-bb74-9af8c9fc0c79',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2517,6 +2655,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd23a041c-6897-4cef-8941-a26a2114a865',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2541,6 +2680,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '7c652c71-e00e-45ff-8acb-e1bc0344e4c0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2558,6 +2698,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '70a2d820-64af-4f51-8b1a-522aed9572bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2575,6 +2716,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '22a668bc-d169-4346-9929-3819673c67ac',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2592,6 +2734,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3c1db8b4-65f2-4f6f-8391-5883f564eabe',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2609,6 +2752,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '4553e8c2-3446-4e11-a967-0504509087a4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2633,6 +2777,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'db2835aa-b0c3-4c9a-abe6-5b09568fffda',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2650,6 +2795,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e260d101-177f-4722-9b95-417f650f578e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2667,6 +2813,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'cc01a6b1-7f18-4452-bfa6-4d64fc595a49',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2684,6 +2831,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '65341477-33f1-4d58-9b3c-c371168809da',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2701,6 +2849,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f22fd59e-4d06-4578-b0bb-a624b8efd145',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2718,6 +2867,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '03de1a61-d639-4d48-8ce6-fcf16c8f6270',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2735,6 +2885,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4a3ccf7-e259-4b72-ad4c-216b15d6d4f7',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2752,6 +2903,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b9f98c3d-a93a-4b19-b89e-4c62781f9b99',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2769,6 +2921,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '145966d2-32bf-42a7-8a7b-cc44aa93490d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2786,6 +2939,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '33fb33c3-1ff2-4d4c-8fe8-6aaa93c1646a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2810,6 +2964,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2827,6 +2982,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8d837989-4a21-4943-bb4c-4d4abb9a7a55',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2844,6 +3000,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '1133b764-a578-4159-abfb-bf3452801974',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2861,6 +3018,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ade283c3-937e-4502-a040-c69d6ddb3c50',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2878,6 +3036,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6013de6f-f99d-4fa5-b75c-b1973a901e04',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2895,6 +3054,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e76cf555-112a-4021-9a1e-b4ee52d7be8a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2912,6 +3072,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f1deeb63-5df2-45ff-b281-a41d9b2cd122',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2929,6 +3090,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5eb879c0-f6e3-45b6-b220-cb5131422a83',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2946,6 +3108,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8835dfef-4d87-4104-b93c-47c5e02e4acc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2963,6 +3126,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b877b188-693c-43a3-9121-a37a3943d7c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -2980,6 +3144,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd5d03647-f29e-44a4-9e63-5feb9f4adbae',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -2997,6 +3162,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '87a4b892-c4cb-4032-8511-e18ba8c8c202',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3014,6 +3180,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3ca01651-a5c3-46c3-b7a8-bfb0d9f6e105',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3031,6 +3198,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'e6c263b1-da39-4a73-8585-637dc3a5b8eb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3048,6 +3216,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '365d08ee-fe6e-47c4-b567-a001212f2cb6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3065,6 +3234,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9f9b030b-31ba-4ae9-88da-76efd8a140dc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3082,6 +3252,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3bb6d77d-05bf-4447-a6bb-4af197ec9290',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3099,6 +3270,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '378a9839-97ce-4bdb-8961-a9164738a3bf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3116,6 +3288,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '628147c3-5f93-4a49-a1bc-ac6685e06b64',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3133,6 +3306,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3150,6 +3324,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3183,6 +3358,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3200,6 +3376,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a1033166-8112-45f9-8af8-c15a53d30c04',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3217,6 +3394,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3234,6 +3412,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3267,6 +3446,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3284,6 +3464,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'dde8525b-6cce-4922-a7e0-9dcad5622b4e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3301,6 +3482,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '416df962-4468-4665-af1d-da81c9256464',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3318,6 +3500,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '26e695f7-e7fe-47f4-a692-002dcd2df434',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3335,6 +3518,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'aeec50c6-9a39-45ff-8210-f5f3aa6a815b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3352,6 +3536,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3369,6 +3554,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a015aceb-5024-480c-88ea-fd9e4ad2d9f1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3386,6 +3572,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'aa4804ce-9099-4006-b089-d05990461668',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3403,6 +3590,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a0e9a1e1-d32b-4bb7-b3e8-e146b5427405',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3420,6 +3608,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '45a7e8c9-6e44-4e0c-b0c5-3055cdb81a12',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3437,6 +3626,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '65341477-33f1-4d58-9b3c-c371168809da',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3454,6 +3644,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd42f8ec2-710c-41a9-98b6-b74b19213cdb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3478,6 +3669,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '1a0ff40c-90bc-472f-a465-8afefb595a6b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3495,6 +3687,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(1024)',
 					'default' => '',
+					'GUID' => '68dcb3dc-15b2-4357-8c87-f2fb316e9ae0',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3512,6 +3705,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '82b08f94-4ed2-40cf-a311-e323e69d47b1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3536,6 +3730,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'bdd69212-bb69-40b1-8a16-6b665ae94a36',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3553,6 +3748,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '4e23487e-5052-4f04-9352-15c4b75031d8',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3577,6 +3773,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '645ed24e-5159-40a2-bd50-4aa26e625848',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3594,6 +3791,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7ee9f69e-1b64-45c6-90db-d0558f6e40e7',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3618,6 +3816,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4a3ccf7-e259-4b72-ad4c-216b15d6d4f7',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3635,6 +3834,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '00157fc5-d94e-4ac0-80fe-7e5ac5c356b5',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3652,6 +3852,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => 'd937bf3c-2b58-4df4-a6a5-b497bb7b8245',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3669,6 +3870,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '145966d2-32bf-42a7-8a7b-cc44aa93490d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3686,6 +3888,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3703,6 +3906,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3736,6 +3940,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3753,6 +3958,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '7568fcc2-bd06-438c-9666-fe3bde32306f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3770,6 +3976,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '46503007-43d9-485f-8cd0-8427a6a8bef2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3787,6 +3994,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '88173ddb-35c5-49a7-845d-0d4e12119a37',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3804,6 +4012,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b97daa06-7589-43e1-aaf9-c9506756f7b4',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3821,6 +4030,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7dd15ec3-1830-4f4c-9497-d33618702263',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3838,6 +4048,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b9c064cb-4266-4217-95b7-d2956e6bfefb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3855,6 +4066,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0ec2dbcd-8acc-438f-ad28-906fc7b6474e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3872,6 +4084,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'c73c3033-f4d9-475a-977b-9e447b88272f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3889,6 +4102,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '3b731d0a-3205-4409-a9fd-e74d1db25055',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3906,6 +4120,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8dfde218-c13c-4e7e-be62-d651cafc9d43',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3923,6 +4138,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'e1bcb366-b7e0-47d7-9a5f-58f8d8d0307d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -3940,6 +4156,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3957,6 +4174,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '0d2bdd49-7559-4cc1-a25b-56aacb830760',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3974,6 +4192,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '92ff3e2c-081b-4b84-a10c-e1a9f3245063',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -3991,6 +4210,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5637623b-c82f-4ce2-be82-e262e9596fa2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4008,6 +4228,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '1',
+					'GUID' => '916b0b6e-b5dc-469e-bc9c-c809471903b4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4025,6 +4246,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c56cf55d-fbc6-4246-b3c3-7810d42710b2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4042,6 +4264,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '5f2ddc22-11f5-49a5-bebf-8313d8006e46',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4059,6 +4282,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f23fc722-e0e2-422f-b0f5-ac17da162a63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4076,6 +4300,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '21eff77d-da38-4ce1-96c5-e6af26463942',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4093,6 +4318,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a921c373-45bb-4919-a840-5b13511102cb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4110,6 +4336,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6e7d306a-9210-41bd-b951-6e897fcff773',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4127,6 +4354,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '887264da-8ea1-4333-8a12-de26f6041251',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4144,6 +4372,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '120e7c82-ff53-44ec-bfa0-a1413d100d18',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4161,6 +4390,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0c06ec4b-448e-4c8a-8869-d424b6ab1f4a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4178,6 +4408,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8ac3beb5-c100-41d6-8d2e-dd3e57f3701a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4195,6 +4426,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '2f0432b4-e601-474e-9edb-4b438517039b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4212,6 +4444,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0523633b-2f83-4205-ad7a-f4a77dff3dd0',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4229,6 +4462,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '70c62a1a-a141-4e0e-a271-c606744cb92c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4246,6 +4480,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '77067bb3-3cfa-4042-b3ac-8bdda9d8b492',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4263,6 +4498,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4b56d60-7171-43c9-89ad-03f04a2cdba1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4280,6 +4516,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a5043582-b29c-4ede-a712-16de9346abed',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4297,6 +4534,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8e8e12f8-8d8c-43f1-bbbd-8ef19b4d326e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4314,6 +4552,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4d3c22b-1297-450b-8108-c389f834e354',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4331,6 +4570,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '0',
+					'GUID' => '6336be5a-77e0-46e2-8d1f-9278a4b10080',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4348,6 +4588,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '96e3d0e6-e8b5-488f-8758-7cec18bd5858',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4372,6 +4613,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5eb879c0-f6e3-45b6-b220-cb5131422a83',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4389,6 +4631,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '95eb062e-f221-43b4-b4d4-c32e9d70e8a7',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4406,6 +4649,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '7e6e7fa8-d17b-47ae-9a28-b02ea4936b81',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4423,6 +4667,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '1eecc354-f454-48dd-ab12-4cf85b88f97b',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4440,6 +4685,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '4b956c45-bbcd-4d01-82ce-a85270f44c10',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4457,6 +4703,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f2581140-5d9c-4c29-b511-e12a826d15da',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4474,6 +4721,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '6746d3ba-b120-4918-8bba-2a14260e99c8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4491,6 +4739,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '562bc505-cc89-4a55-956a-b53e1a87ef46',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4508,6 +4757,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '1ad12721-9ee9-4623-98d2-071ba013a373',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4525,6 +4775,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'cc7954c1-d9f7-4a97-8b71-23f6f694bd6d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4542,6 +4793,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a2098911-926a-42b6-8498-d8a453c34d93',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4559,6 +4811,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5799fcb7-8de8-41bf-9a2a-dcf84cae3949',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4576,6 +4829,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '63d5585f-c9bd-485d-9c1d-4a29a4fbf4b2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4593,6 +4847,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '45559d2a-7537-4719-8caa-aa99df171000',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4610,6 +4865,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '42991cef-d988-4ad9-b3d2-f29d9809f0b3',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4627,6 +4883,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '4550b372-974e-432c-8221-69b6fb65fdfd',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4644,6 +4901,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5f7479f2-b499-4094-8294-d580e51244a1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4661,6 +4919,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '30744253-e2cd-44c3-ac86-0de3741b9ce0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4678,6 +4937,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '9405da44-900c-4f7c-823d-734a68f5d6f6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4695,6 +4955,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5b8bfcb4-a2b0-4ee9-931e-474ae9742e76',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4712,6 +4973,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a99c1f40-4b41-4167-ad29-85133375aa7a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4729,6 +4991,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '1e5269aa-e342-4b63-830e-f0a7acb2dab4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4746,6 +5009,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'e19c4fa4-804f-488b-90d7-1ea827bba52e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4763,6 +5027,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '0c7535bd-dbfa-4155-bc06-9ef34bf0f29a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4780,6 +5045,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ec2db8b1-d779-4bf2-b4cd-374a894fdc83',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4797,6 +5063,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '90c08eb4-3097-4f59-a291-5959bbb174ad',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4814,6 +5081,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '70995b9c-d0a9-4a57-b59b-54d39c379e66',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4831,6 +5099,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3b02a65c-1a0a-4e04-8306-34cb484c45fe',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4848,6 +5117,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '34bf9926-34a4-49a3-a29e-b602b1e5f9b2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4865,6 +5135,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '3eb7643a-7205-4683-9b8b-80c2d65334eb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4882,6 +5153,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(1)',
 					'default' => '0',
+					'GUID' => 'ab222d85-e408-44de-a513-d6aeda48b286',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4899,6 +5171,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '79a25c26-9ea4-481c-b833-6699dd6e34d0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4916,6 +5189,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f962e778-623e-40a8-b7db-88df71fdac51',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4933,6 +5207,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8272a897-9044-4e62-964f-89cd90e99bbb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4950,6 +5225,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e268c7be-dc34-40d9-bf2c-5f1897a09f7c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -4967,6 +5243,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '46fa9c1e-5aa3-41ff-8f02-e9a80252ad9f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -4984,6 +5261,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5e831983-665b-43f2-9786-5e7c9cbb9e96',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5001,6 +5279,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '1',
+					'GUID' => '025cfab0-7736-4036-9eec-8f70e53f681b',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5018,6 +5297,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fe8a8811-1bcd-448a-a111-25e17ac47687',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5035,6 +5315,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '1',
+					'GUID' => '29e8af00-5d33-4ddc-8643-9f331da7684e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5052,6 +5333,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '46e5c9d6-6304-4e9f-a582-242308667e2f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5069,6 +5351,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '7c652c71-e00e-45ff-8acb-e1bc0344e4c0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5086,6 +5369,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '625b65cb-7569-437a-a6dd-b3290c662e18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5103,6 +5387,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '33a9df05-3e39-4cc8-af2b-234653aadb7a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5120,6 +5405,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c731b5f5-5bd3-4ad3-ac3e-9e0281104121',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5137,6 +5423,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5154,6 +5441,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e407f6f1-e4e9-4f23-a8c7-8ad75e14a820',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5187,6 +5475,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5204,6 +5493,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5221,6 +5511,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'a5ef0756-5ecd-49ae-a36c-058b90758988',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5238,6 +5529,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd20027fe-4e74-4261-9bf2-7e573a3e883b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5262,6 +5554,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '32564da8-5599-4577-bd93-fd425179612f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5279,6 +5572,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fd03122f-8c74-468a-8f8c-704e927c3b65',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5296,6 +5590,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7d733ad8-a5bf-4e2f-859d-be1251b7d0f1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5313,6 +5608,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ccb3cb86-8403-4494-a284-ce1fb782f0af',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5330,6 +5626,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '25c87995-f58f-4f6a-8f6b-2e462545bdd6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5347,6 +5644,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '83871f4f-e406-416a-845e-a8257a4a34d3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5364,6 +5662,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6e214a72-6c96-40c0-abf3-5f09116d3018',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5381,6 +5680,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'fc4bc2f3-1a12-4484-88dc-273199fe3b63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5405,6 +5705,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '3b731d0a-3205-4409-a9fd-e74d1db25055',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5422,6 +5723,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '6ce6e81e-5cdf-4ea2-83b5-acde779f4297',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5439,6 +5741,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'c7b20fcd-0849-49cc-84c2-0dbb73a19fda',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5456,6 +5759,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f76ffc06-f4c9-417e-8584-bc2f65184d18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5473,6 +5777,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'bed7693b-ccd1-4803-b065-5e20fac13881',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5497,6 +5802,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '075b5082-3fb1-46f1-a838-da558b3afb54',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5514,6 +5820,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c731b5f5-5bd3-4ad3-ac3e-9e0281104121',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5531,6 +5838,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '4a8003fa-7458-405e-90d3-7728b1af9e86',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5548,6 +5856,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '46fa9c1e-5aa3-41ff-8f02-e9a80252ad9f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5565,6 +5874,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '14c857e3-e684-49a3-8b34-1cf7448ed0c4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5582,6 +5892,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8b09aaf9-546c-4f03-8b1f-3170ba4b5491',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5599,6 +5910,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '625b65cb-7569-437a-a6dd-b3290c662e18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5616,6 +5928,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f17742b9-0096-4b03-b981-f0dcd3f7e8c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5640,6 +5953,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e407f6f1-e4e9-4f23-a8c7-8ad75e14a820',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5657,6 +5971,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'c37aa662-719c-4ed5-bbf2-e36672a3ce33',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5681,6 +5996,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4d3c22b-1297-450b-8108-c389f834e354',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5698,6 +6014,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e27df414-cf8a-45c3-bc38-cc48e6146fef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5715,6 +6032,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(1)',
 					'default' => '0',
+					'GUID' => 'ab222d85-e408-44de-a513-d6aeda48b286',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5732,6 +6050,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '96963615-e3bb-4d37-83df-4ad3fca74536',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5749,6 +6068,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f962e778-623e-40a8-b7db-88df71fdac51',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5766,6 +6086,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ffecfa82-c326-4703-9cc3-69d6f313bd32',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5783,6 +6104,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e268c7be-dc34-40d9-bf2c-5f1897a09f7c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5800,6 +6122,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5817,6 +6140,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5e831983-665b-43f2-9786-5e7c9cbb9e96',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5850,6 +6174,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5867,6 +6192,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5884,6 +6210,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'a5ef0756-5ecd-49ae-a36c-058b90758988',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5901,6 +6228,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd20027fe-4e74-4261-9bf2-7e573a3e883b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5925,6 +6253,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '32564da8-5599-4577-bd93-fd425179612f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5942,6 +6271,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '46fa9c1e-5aa3-41ff-8f02-e9a80252ad9f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5959,6 +6289,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8b09aaf9-546c-4f03-8b1f-3170ba4b5491',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -5976,6 +6307,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ccb3cb86-8403-4494-a284-ce1fb782f0af',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -5993,6 +6325,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '83871f4f-e406-416a-845e-a8257a4a34d3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6010,6 +6343,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '25c87995-f58f-4f6a-8f6b-2e462545bdd6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6027,6 +6361,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'c7b20fcd-0849-49cc-84c2-0dbb73a19fda',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6044,6 +6379,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6e214a72-6c96-40c0-abf3-5f09116d3018',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6061,6 +6397,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'fc4bc2f3-1a12-4484-88dc-273199fe3b63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6085,6 +6422,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '6ce6e81e-5cdf-4ea2-83b5-acde779f4297',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6102,6 +6440,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'bed7693b-ccd1-4803-b065-5e20fac13881',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6126,6 +6465,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fd03122f-8c74-468a-8f8c-704e927c3b65',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6143,6 +6483,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '075b5082-3fb1-46f1-a838-da558b3afb54',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6160,6 +6501,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7d733ad8-a5bf-4e2f-859d-be1251b7d0f1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6177,6 +6519,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f76ffc06-f4c9-417e-8584-bc2f65184d18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6194,6 +6537,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c731b5f5-5bd3-4ad3-ac3e-9e0281104121',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6211,6 +6555,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '4a8003fa-7458-405e-90d3-7728b1af9e86',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6228,6 +6573,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f17742b9-0096-4b03-b981-f0dcd3f7e8c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6252,6 +6598,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '14c857e3-e684-49a3-8b34-1cf7448ed0c4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6269,6 +6616,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'c37aa662-719c-4ed5-bbf2-e36672a3ce33',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6293,6 +6641,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '625b65cb-7569-437a-a6dd-b3290c662e18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6310,6 +6659,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e407f6f1-e4e9-4f23-a8c7-8ad75e14a820',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6327,6 +6677,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(1)',
 					'default' => '0',
+					'GUID' => 'ab222d85-e408-44de-a513-d6aeda48b286',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6344,6 +6695,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4d3c22b-1297-450b-8108-c389f834e354',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6361,6 +6713,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '29a26946-d7c3-4ea0-be64-8e376d2a7f25',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6378,6 +6731,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e27df414-cf8a-45c3-bc38-cc48e6146fef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6395,6 +6749,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '96963615-e3bb-4d37-83df-4ad3fca74536',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6412,6 +6767,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f962e778-623e-40a8-b7db-88df71fdac51',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6429,6 +6785,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ffecfa82-c326-4703-9cc3-69d6f313bd32',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6446,6 +6803,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e268c7be-dc34-40d9-bf2c-5f1897a09f7c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6463,6 +6821,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6480,6 +6839,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5e831983-665b-43f2-9786-5e7c9cbb9e96',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6513,6 +6873,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6530,6 +6891,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'a5ef0756-5ecd-49ae-a36c-058b90758988',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6547,6 +6909,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5087f379-710b-4e76-9b9d-86b842933991',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6571,6 +6934,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6588,6 +6952,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e27df414-cf8a-45c3-bc38-cc48e6146fef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6605,6 +6970,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8b09aaf9-546c-4f03-8b1f-3170ba4b5491',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6622,6 +6988,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7b57c7ca-f4e8-4358-948a-987b1f36b3fb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6639,6 +7006,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'fc4bc2f3-1a12-4484-88dc-273199fe3b63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6663,6 +7031,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f17742b9-0096-4b03-b981-f0dcd3f7e8c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6687,6 +7056,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '477832a1-7a25-4774-ad1a-4ff69ed4b374',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6720,6 +7090,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6737,6 +7108,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'a5ef0756-5ecd-49ae-a36c-058b90758988',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6754,6 +7126,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5087f379-710b-4e76-9b9d-86b842933991',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6778,6 +7151,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'fc4bc2f3-1a12-4484-88dc-273199fe3b63',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6802,6 +7176,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6819,6 +7194,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e27df414-cf8a-45c3-bc38-cc48e6146fef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6836,6 +7212,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8b09aaf9-546c-4f03-8b1f-3170ba4b5491',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6853,6 +7230,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7c9289e1-b326-4596-9dd8-f6ebe861a0ef',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6870,6 +7248,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f17742b9-0096-4b03-b981-f0dcd3f7e8c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6894,6 +7273,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '477832a1-7a25-4774-ad1a-4ff69ed4b374',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6927,6 +7307,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6944,6 +7325,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '1709c1a3-b26a-4e78-82f9-ff05a08738c9',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6961,6 +7343,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5377a931-8a17-4eed-92dd-8a8808408a5a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -6978,6 +7361,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9b6768ae-8d6a-461e-9b41-61d49431a401',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -6995,6 +7379,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '88ffbef3-064c-4f87-997a-30af1c88f2ec',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7012,6 +7397,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '01ae4944-ceba-4c21-a02d-38222e1a3733',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7029,6 +7415,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd4b30bcc-414d-403b-9627-037bcbbd1c6b',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7046,6 +7433,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '14f4d49c-7e54-494e-b103-eaccb6428ee8',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7063,6 +7451,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b7aaa1d0-4577-46eb-9d09-b4c1104a02a8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7080,6 +7469,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'bd40a792-2b63-446a-af75-0510f8c7cc2c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7097,6 +7487,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'c1754272-da91-4a17-9567-c2566552cdc9',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7114,6 +7505,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '4c744096-3d1c-406d-87f4-71169002e85f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7138,6 +7530,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8aba2f06-8fd1-4256-add5-1e233e581315',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7155,6 +7548,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '13637273-b286-42f5-b092-90e507484751',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7172,6 +7566,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '661c16f9-71be-41e2-8428-efd5509e6291',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7189,6 +7584,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'f398a2ca-122e-47ad-8e4e-3ee2ac30bf26',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7213,6 +7609,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f2581140-5d9c-4c29-b511-e12a826d15da',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7230,6 +7627,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6c75d3ff-93aa-493b-b25c-733e78408fa2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7247,6 +7645,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'fbb918ff-70bf-41ee-b1fd-110e38cbdba0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7264,6 +7663,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c3bb9074-505a-4085-878b-f7ad3d5522a6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7281,6 +7681,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '6c486f71-abfd-49c7-91e2-165f594fa658',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7298,6 +7699,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fc0dcf64-f6a8-48d7-8ed7-6ecea942cf21',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7315,6 +7717,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => 'b99a8df9-27ce-4502-9f44-863799cd2cc9',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7332,6 +7735,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b9c064cb-4266-4217-95b7-d2956e6bfefb',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7349,6 +7753,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '71680787-5da5-4ab8-afdf-1e109556743b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7366,6 +7771,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'bf2293c7-5c8b-4b77-a880-c63ca4777e3e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7383,6 +7789,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '1ae39469-cd74-4d82-84af-fec8af28be61',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7400,6 +7807,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '81466df0-3571-45cf-b520-cee2a9f5e03b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7417,6 +7825,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '007dc9f8-9b06-4211-83c9-4134b23d6561',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7434,6 +7843,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '6e7bb46d-fda5-46b8-b08e-31a2e6884e24',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7451,6 +7861,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'f37d69ac-ba75-4b2f-8793-91b77b86751f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7468,6 +7879,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fa2f73d6-8427-47de-abd8-4290da426b49',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7485,6 +7897,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7502,6 +7915,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '79ab7f6c-a6b5-4bad-bcdd-c113d49db876',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7535,6 +7949,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7552,6 +7967,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b7942a37-45cc-4005-b4b5-e716cbf176f9',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7569,6 +7985,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'b4fce451-7c6d-4cf9-8b1c-f8be6dbcec5b',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7586,6 +8003,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'd1c48683-2655-4e49-9f13-6b25f2b0a0d0',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7603,6 +8021,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '176c63c6-65b1-4a91-97f2-db4d1e36911a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7620,6 +8039,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '3',
+					'GUID' => 'a6c87660-f1fe-490d-b1c5-9755e6db1e19',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7637,6 +8057,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '3a3c43e6-18c2-4fc6-aebe-0ed8d5c6416f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7654,6 +8075,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '777b846c-f3f4-4eb3-a73a-a460d28976dc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7671,6 +8093,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '3347f841-b8e8-4f52-acbd-0bada696e540',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7688,6 +8111,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(100)',
 					'default' => '',
+					'GUID' => 'ebbfce08-7d5a-416a-aad2-b23b78bd926b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7705,6 +8129,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(100)',
 					'default' => '',
+					'GUID' => '82e196f5-cc38-4045-8be3-c1067b23df72',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7722,6 +8147,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => 'e0272089-9156-409b-8444-61e2e3e755bf',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7739,6 +8165,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '04886e45-7821-40a6-ae2b-2f46c6b45906',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7779,6 +8206,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7796,6 +8224,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '7222c742-0092-439c-84de-1973e4e2b180',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7813,6 +8242,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '7e059ab7-d79b-4218-9488-6f38d85d17a0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7830,6 +8260,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7847,6 +8278,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'dd400eb4-8762-4ab5-bc4e-fa1feacc4dfd',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7864,6 +8296,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd23a041c-6897-4cef-8941-a26a2114a865',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7888,6 +8321,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '73ef5c00-c8c5-4cb7-9f69-6aed98346818',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7921,6 +8355,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7938,6 +8373,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '7222c742-0092-439c-84de-1973e4e2b180',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7955,6 +8391,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '7e059ab7-d79b-4218-9488-6f38d85d17a0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -7972,6 +8409,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -7989,6 +8427,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'abaff633-2a9f-4be1-b057-241f657953a1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8006,6 +8445,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'dd400eb4-8762-4ab5-bc4e-fa1feacc4dfd',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8023,6 +8463,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd23a041c-6897-4cef-8941-a26a2114a865',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8047,6 +8488,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'd2a2f6cf-1689-438b-b2c2-b244b8cbf078',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8080,6 +8522,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '65b533a8-0d70-44af-a9d1-785983eb4ef3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8097,6 +8540,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b14c6496-2aaf-4198-8fc1-cf034525fb91',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8130,6 +8574,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8147,6 +8592,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '07c71471-04cd-4217-a63e-4ca97d880950',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8164,6 +8610,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '0051004f-b0ec-47c4-bfdb-0d8e76adbbb8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8188,6 +8635,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f2940a48-f104-4c11-86ef-ed6456a1211c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8205,6 +8653,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '09b25ca3-6c9f-4b6d-ad80-e0989c221289',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8222,6 +8671,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7e1418d5-5515-49f6-99ed-166365b9b963',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8246,6 +8696,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b70529a1-30bb-42c0-822f-802c23bd616b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8263,6 +8714,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '48d69b71-6eba-480a-b17b-c67243f02d06',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8280,6 +8732,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8313,6 +8766,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8330,6 +8784,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'd29d6854-bb4a-4fa2-83a1-5a1b9c9a0eaf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8347,6 +8802,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '0cc69ef6-eb4d-4a0d-ad40-84bc1845e48f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8371,6 +8827,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'fc671dc8-a9be-43d9-b42a-671750ad869d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8388,6 +8845,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '8b97aaa3-28ae-45f1-80ad-6f37116264cf',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8412,6 +8870,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8429,6 +8888,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '1e0608ea-045b-494b-aac6-060dc76da782',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8446,6 +8906,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '6803fdeb-c251-4588-85c9-d0e8636d18ab',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8463,6 +8924,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '3a1db9fd-204e-4693-bcf7-2084d26c1013',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8480,6 +8942,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'cef2d060-95cf-409a-92c9-02de0c164640',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8497,6 +8960,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '144a1f95-97d5-42b4-be3e-39f21215780e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8514,6 +8978,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '155d8238-a2cf-446c-91a5-c8322ee1d890',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8531,6 +8996,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8564,6 +9030,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '9a98c57f-bf01-49b0-91e3-e72e1b9551f1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8581,6 +9048,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '46503007-43d9-485f-8cd0-8427a6a8bef2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8598,6 +9066,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '419fa655-e64a-4e39-b124-29eeb3198bc7',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8622,6 +9091,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '24ed6b0e-c86c-4131-91a7-5205ac931ad5',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8655,6 +9125,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8672,6 +9143,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '91a4f538-1383-4ae4-85d8-55ddada7d6cd',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8696,6 +9168,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'e41e74b2-a265-4269-8ec6-1d890c893798',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8713,6 +9186,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '63ff758d-a866-4d37-bc2a-a7432bd9bb44',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8730,6 +9204,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6a3d21ad-7cb1-4456-a623-20aa71ba0b12',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8747,6 +9222,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '48b78ab1-bfb0-44eb-9ec8-4f5cdbf4a32c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8764,6 +9240,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => 'ef722d2d-0fa0-4aa7-92d2-7783ec1c9f7f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8781,6 +9258,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'dc69b6d4-2e6f-4f2d-86d9-0fb6534164ca',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8798,6 +9276,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0f0ef89c-e305-408d-ac95-6a86efe28c5a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8815,6 +9294,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9d32c0a5-e010-44f2-8b53-3372c87da08d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8832,6 +9312,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '83a3c115-1a4f-44a7-9572-e91043acdbaa',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8849,6 +9330,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'b3ea0d94-1029-41d8-9f6b-bcbec6b715f4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8866,6 +9348,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a99c1f40-4b41-4167-ad29-85133375aa7a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8883,6 +9366,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '63d5585f-c9bd-485d-9c1d-4a29a4fbf4b2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8900,6 +9384,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '1ad12721-9ee9-4623-98d2-071ba013a373',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8917,6 +9402,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6b2277f3-44e1-4bbb-8e55-3315bdba736e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8934,6 +9420,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6ba76a0f-55a4-49ce-911a-0a3f05674bef',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8951,6 +9438,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'fd7ff7b0-a8e9-476c-8e9d-ac4ca338c589',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -8968,6 +9456,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '34bf9926-34a4-49a3-a29e-b602b1e5f9b2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -8985,6 +9474,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '6746d3ba-b120-4918-8bba-2a14260e99c8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9002,6 +9492,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a2098911-926a-42b6-8498-d8a453c34d93',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9019,6 +9510,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '9405da44-900c-4f7c-823d-734a68f5d6f6',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9036,6 +9528,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '70995b9c-d0a9-4a57-b59b-54d39c379e66',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9053,6 +9546,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '49a285a3-2c16-4846-9dbf-94c9cc6496c1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9070,6 +9564,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9103,6 +9598,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9120,6 +9616,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '48b78ab1-bfb0-44eb-9ec8-4f5cdbf4a32c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9137,6 +9634,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6a3d21ad-7cb1-4456-a623-20aa71ba0b12',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9154,6 +9652,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '63ff758d-a866-4d37-bc2a-a7432bd9bb44',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9171,6 +9670,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6b2277f3-44e1-4bbb-8e55-3315bdba736e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9188,6 +9688,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '6ba76a0f-55a4-49ce-911a-0a3f05674bef',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9205,6 +9706,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '46503007-43d9-485f-8cd0-8427a6a8bef2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9222,6 +9724,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'e41e74b2-a265-4269-8ec6-1d890c893798',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9239,6 +9742,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'ec2ec4a2-a32f-4407-b318-46b5780774e2',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9256,6 +9760,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ddb8f57f-77c8-4cad-a8cb-0cdc799ce4a1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9273,6 +9778,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '749a9917-90c3-49c4-9e72-aa33b0683a87',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9290,6 +9796,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'b3ea0d94-1029-41d8-9f6b-bcbec6b715f4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9307,6 +9814,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'fd7ff7b0-a8e9-476c-8e9d-ac4ca338c589',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9324,6 +9832,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9341,6 +9850,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'INT(11)',
 					'default' => '0',
+					'GUID' => '7cc4ab46-0d77-4ef8-a2a7-d5b656546a30',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9374,6 +9884,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c2f5d193-ef76-422b-aae5-421cd0a4b22b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9391,6 +9902,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '6e1717a7-99b8-4101-a0b0-fcf2a5e1cfa0',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9415,6 +9927,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'd3468164-df0a-4f0d-a679-1aa95ae408fe',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9439,6 +9952,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '61990265-efe5-49d3-ae08-4bd0e8f3e4ce',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9463,6 +9977,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '36edbdce-b9b7-4b89-b2d9-03f91bb56019',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9496,6 +10011,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9513,6 +10029,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '8fdf3640-8668-4818-be46-36c74f9e103e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9546,6 +10063,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9563,6 +10081,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'a5bb2b19-d773-465c-a7e3-ce6400735734',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9580,6 +10099,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '59688b83-dca9-4491-aefb-39c18057394e',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9597,6 +10117,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '29b8c31d-6e2a-4f8d-90c7-febfbb9cc16c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9614,6 +10135,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c6ccb2ba-4d74-487a-99a8-f2bfe40a23f1',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9631,6 +10153,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '0a6939be-aabc-46df-b922-f083cf0c5bd4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9648,6 +10171,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '2c689678-6cef-40ef-97da-d59ab7d039d1',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9665,6 +10189,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '452b22ac-adfc-4fca-9d82-5461806bf847',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9682,6 +10207,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '593fe848-22f3-45d1-8d8d-7824542a7381',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9699,6 +10225,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5a64961d-8aa6-4de4-92e2-997199e5a707',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9716,6 +10243,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3eed4f04-46cc-43e8-9712-b6e339e71241',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9733,6 +10261,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '41152cdd-e774-4edf-be9b-280d272d5712',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9766,6 +10295,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'acfe906b-6e61-4f94-ae66-359e4bc3e4cc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9783,6 +10313,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'eaaca317-58c7-4b72-9c20-166c12c04b67',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9800,6 +10331,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '4c224b6d-7b6b-4e5d-8df7-b96c26559476',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9817,6 +10349,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(7)',
 					'default' => '1',
+					'GUID' => 'd22126a7-7e85-4a7a-94d0-6ba9ab194772',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9834,6 +10367,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '1',
+					'GUID' => '3557698d-cfae-4a57-93fc-6030bac2768a',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9851,6 +10385,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '0ca15427-abfa-4fac-8ce2-e70e5b8b2c0f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9868,6 +10403,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9885,6 +10421,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fb4e322b-46c0-47e5-b9eb-70c39456d80d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -9902,6 +10439,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5e9038cf-bf09-4ec7-aa1d-60df007b96e2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9919,6 +10457,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '8a5addab-5545-4c33-bc1a-7aad217e04c6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9936,6 +10475,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'ce236d83-959b-4d1c-a736-b1717bee29bc',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9953,6 +10493,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'f8aa483a-71b9-46c1-a08e-0f546076fd78',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -9970,6 +10511,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'fcbab2f2-51bb-4f44-a5ac-a6266e187522',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10003,6 +10545,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => 'edda1847-ef2e-4a76-9763-c41c82b08c00',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10020,6 +10563,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '8487b70c-4a32-46ba-aacb-ea07a1e3d278',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10037,6 +10581,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '59a0cad6-26cc-43b6-8af8-2242eb595d76',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10054,6 +10599,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '0d06a4f6-acd5-4acc-8a3f-28813de178ac',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10071,6 +10617,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(255)',
 					'default' => '',
+					'GUID' => 'd7f97213-2aa1-457c-9e60-d691cfcd905f',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10095,6 +10642,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(255)',
 					'default' => '',
+					'GUID' => 'd52f96cd-df76-494b-8c25-146bb434b6af',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10119,6 +10667,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
+					'GUID' => '335866ce-b81b-4329-901d-c20254135c9c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10136,6 +10685,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8b9665d1-f1d9-4d7e-bc2c-72479bf4686f',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10153,6 +10703,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => 'f312a8f7-34b9-4731-af00-3ff2092c65b9',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10177,6 +10728,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => 'd29d6854-bb4a-4fa2-83a1-5a1b9c9a0eaf',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10194,6 +10746,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '5810dc57-35ac-436e-88ff-117e1f501e67',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10213,6 +10766,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '3ac1327d-75d6-4a16-913d-ef4fdf54c11c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10237,6 +10791,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '15e1f13d-25db-46a4-ae7c-fb616140338e',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10270,6 +10825,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '3ac1327d-75d6-4a16-913d-ef4fdf54c11c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10294,6 +10850,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '434a8099-51f0-49d1-bbbb-ed7aa5145a3c',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10327,6 +10884,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '3ac1327d-75d6-4a16-913d-ef4fdf54c11c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10351,6 +10909,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '4e87b302-e17f-468e-8934-e5aaf78d6765',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10384,6 +10943,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '3ac1327d-75d6-4a16-913d-ef4fdf54c11c',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10408,6 +10968,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '4b794f1a-1be4-4804-92e6-bda624f444b4',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10441,6 +11002,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10465,6 +11027,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3bac32ec-8dcf-4257-b518-ecaa952140c2',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10498,6 +11061,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10522,6 +11086,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '8e225dcd-4e2b-464b-a9f3-b7d39d67de84',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10555,6 +11120,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10579,6 +11145,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'b2423282-c8a8-400e-9ded-fe61cea433f4',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10612,6 +11179,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10636,6 +11204,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '1b98fc0a-d58f-4c81-a53f-30106e0c30eb',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10669,6 +11238,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10693,6 +11263,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'ce203691-6577-4c0d-90fb-539d07ea76c3',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10726,6 +11297,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10750,6 +11322,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '60d68340-14c1-45a9-8240-30f6bdf96345',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10783,6 +11356,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10807,6 +11381,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '4582a192-d46e-4dd9-9bbd-ee2e2ddd20e5',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10824,6 +11399,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '2b31ca2e-11ff-4f57-8c90-2b9bed743202',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10841,6 +11417,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TINYINT(1)',
 					'default' => '0',
+					'GUID' => '25fead1f-bb12-40e6-9e03-4e31b236f2e1',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10858,6 +11435,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3ab69198-0827-452b-93a4-6c7bb02ae7ae',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10875,6 +11453,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'a411a365-69c8-4f70-a734-25956a9f3393',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10892,6 +11471,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '2321b486-80c4-4e24-81c5-6ddd205592ac',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10909,6 +11489,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '65544263-3215-4574-a977-dbf8ac2ce72a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10942,6 +11523,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -10966,6 +11548,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '851d8f15-3ce4-42a3-9041-08c943f61cab',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -10999,6 +11582,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11023,6 +11607,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fd0cceef-975e-4daa-a529-2c98446b9df3',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11040,6 +11625,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e6c421c3-2f37-429a-a8d9-b552bed392a5',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11073,6 +11659,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11097,6 +11684,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fe780ac8-ed30-481c-8700-84472caa0072',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11114,6 +11702,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e5f50226-6749-4bd3-9aa1-cf3db6ce448d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11131,6 +11720,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '483f2c40-2348-4168-817b-471f5ba96984',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11148,6 +11738,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '143f8b3d-5b58-4b26-aaad-a5f14a57865b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11181,6 +11772,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11205,6 +11797,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fb4e322b-46c0-47e5-b9eb-70c39456d80d',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11238,6 +11831,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11262,6 +11856,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '9c787541-ed54-4516-bc21-9b6fe2e2e516',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11295,6 +11890,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '591df1a2-b685-4378-845a-f8a1d1985548',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11319,6 +11915,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '5985271b-0795-4204-8739-ffa3d898bae8',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11352,6 +11949,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11369,6 +11967,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '09b25ca3-6c9f-4b6d-ad80-e0989c221289',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11386,6 +11985,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11419,6 +12019,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'c6dddec0-c373-4069-bdcc-66acd474b648',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11443,6 +12044,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '851d8f15-3ce4-42a3-9041-08c943f61cab',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11476,6 +12078,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'c6dddec0-c373-4069-bdcc-66acd474b648',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11500,6 +12103,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fe780ac8-ed30-481c-8700-84472caa0072',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11517,6 +12121,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e5f50226-6749-4bd3-9aa1-cf3db6ce448d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11534,6 +12139,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '483f2c40-2348-4168-817b-471f5ba96984',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11551,6 +12157,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '143f8b3d-5b58-4b26-aaad-a5f14a57865b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11568,6 +12175,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c3474b9a-4677-4574-bda3-a4865569ac18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11601,6 +12209,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11618,6 +12227,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
+					'GUID' => '7e059ab7-d79b-4218-9488-6f38d85d17a0',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11635,6 +12245,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11652,6 +12263,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e4a3ccf7-e259-4b72-ad4c-216b15d6d4f7',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11669,6 +12281,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '3d80f045-6262-43c8-9b43-658093f6a057',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11702,6 +12315,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '79251a06-b217-4b3a-8485-b7286cb15bf6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11726,6 +12340,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7d49445c-4e95-4fd5-a2a4-a20bbcd4d812',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11759,6 +12374,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '79251a06-b217-4b3a-8485-b7286cb15bf6',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11783,6 +12399,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fe780ac8-ed30-481c-8700-84472caa0072',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11800,6 +12417,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e5f50226-6749-4bd3-9aa1-cf3db6ce448d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11817,6 +12435,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '483f2c40-2348-4168-817b-471f5ba96984',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11834,6 +12453,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '143f8b3d-5b58-4b26-aaad-a5f14a57865b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11851,6 +12471,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c3474b9a-4677-4574-bda3-a4865569ac18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -11884,6 +12505,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
+					'GUID' => '5d3d34dd-4876-4c6a-86ab-b4e162f22c08',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11901,6 +12523,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'b1edf3cc-3473-41c7-9825-372333299846',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11925,6 +12548,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => '5aa57bbe-7b19-4db9-915c-561863458d2b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11958,6 +12582,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd5aeaa99-9fba-4b67-b850-68e19256520a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -11982,6 +12607,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
+					'GUID' => '7d49445c-4e95-4fd5-a2a4-a20bbcd4d812',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -12015,6 +12641,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
+					'GUID' => 'd5aeaa99-9fba-4b67-b850-68e19256520a',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
@@ -12039,6 +12666,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'fe780ac8-ed30-481c-8700-84472caa0072',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -12056,6 +12684,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'e5f50226-6749-4bd3-9aa1-cf3db6ce448d',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -12073,6 +12702,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '483f2c40-2348-4168-817b-471f5ba96984',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -12090,6 +12720,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => '143f8b3d-5b58-4b26-aaad-a5f14a57865b',
 					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
@@ -12107,6 +12738,7 @@ final class Search extends BaseTable implements TableInterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
+					'GUID' => 'c3474b9a-4677-4574-bda3-a4865569ac18',
 					'null_switch' => 'NOT NULL',
 					'unique_key' => false,
 					'key' => false,
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php
index d3551c678..ee214a42a 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php
@@ -101,7 +101,7 @@ final class MultiSubform implements MultiSubformInterface
 	 *        $items,
 	 *        $setMap = [
 	 *        	'_core' => [
-	 *        		'table' =>'data',
+	 *        		'table' => 'data',
 	 *        		'indexKey' => 'guid',
 	 *        		'linkKey' => 'look',
 	 *        		'linkValue' => $data['guid'] ?? ''
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/FileHelper.php b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/FileHelper.php
index 0dc05d6bf..b943c8860 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/FileHelper.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/FileHelper.php
@@ -147,36 +147,43 @@ abstract class FileHelper
 	}
 
 	/**
-	 * Write a file to the server
+	 * Write a file to the server safely and efficiently.
+	 * This function will always overwrite the existing file with new data.
 	 *
-	 * @param  string   $path    The path and file name where to safe the data
-	 * @param  string   $data    The data to safe
-	 *
-	 * @return  bool true   On success
+	 * @param  string  $path  The full path and file name where to save the data.
+	 * @param  string  $data  The data to save.
 	 *
+	 * @return bool  Returns true on success, false on failure.
 	 * @since  3.0.9
 	 */
 	public static function write($path, $data): bool
 	{
-		$klaar = false;
-		if (StringHelper::check($data))
+		if (!is_string($path) || !is_string($data) || trim($path) === '')
 		{
-			// open the file
-			$fh = fopen($path, "w");
-			if (!is_resource($fh))
-			{
-				return $klaar;
-			}
-			// write to the file
-			if (fwrite($fh, $data))
-			{
-				// has been done
-				$klaar = true;
-			}
-			// close file.
-			fclose($fh);
+			return false;
 		}
-		return $klaar;
+
+		$handle = null;
+		$success = false;
+
+		try {
+			$handle = fopen($path, "wb"); // Open in write-binary mode to ensure full overwrite
+			if (!is_resource($handle))
+			{
+				return false;
+			}
+
+			$success = fwrite($handle, $data) !== false;
+		} catch (\Throwable $e) {
+			return false;
+		} finally {
+			if (is_resource($handle))
+			{
+				fclose($handle);
+			}
+		}
+
+		return $success;
 	}
 
 	/**
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/String/TypeHelper.php b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/String/TypeHelper.php
index 3c1554d4b..6fdf5dbd7 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/String/TypeHelper.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/String/TypeHelper.php
@@ -29,7 +29,14 @@ abstract class TypeHelper
 	 * 
 	 * @since  3.0.9
 	 */
-	protected static $builder = false;
+	protected static int $builder = 0;
+
+	/**
+	 * Cache for processed field type names to avoid redundant computations.
+	 *
+	 * @since  5.1.1
+	 */
+	protected static array $cache = [];
 
 	/**
 	 * Making field type name safe
@@ -41,42 +48,144 @@ abstract class TypeHelper
 	 * 
 	 * @since  3.0.9
 	 */
-	public static function safe($string, $option = null)
+	public static function safe($string, $option = null): string
 	{
-		// get global value
-		if (self::$builder === false)
+		// Check if result is already cached
+		if (isset(self::$cache[$string]))
 		{
-			self::$builder = Helper::getParams($option)->get('type_name_builder', 1);
+			return self::$cache[$string];
 		}
 
-		// use the new convention
+		// get global value
+		if (self::$builder == 0)
+		{
+			self::$builder = (int) Helper::getParams($option)->get('type_name_builder', 2);
+		}
+
+		// Apply new naming convention
 		if (2 == self::$builder)
 		{
-			// 0nly continue if we have a string
+			// Ensure input is a valid string
 			if (StringHelper::check($string))
 			{
-				// check that the first character is not a number
+				// Ensure the first character is not a number
 				if (is_numeric(substr($string, 0, 1)))
 				{
 					$string = StringHelper::numbers($string);
 				}
 
-				// Transliterate string
-				$string = StringHelper::transliterate($string);
+				// Detect if camel case is used
+				$has_camel_case = preg_match('/[a-z][A-Z]/', $string);
 
-				// remove all and keep only characters and numbers and point (TODO just one point)
-				$string = trim(preg_replace("/[^A-Za-z0-9_\.]/", '', (string) $string));
+				// Detect non-ASCII characters (extended Unicode)
+				$has_non_ascii = preg_match('/[^\x20-\x7E]/', $string); // Anything outside printable ASCII
 
-				// best is to return lower (for all string equality in compiler)
-				return strtolower($string);
+				// Detect non-standard symbols (anything that is not a letter, number, underscore, or dot)
+				$has_non_standard_symbols = preg_match('/[^a-zA-Z0-9_.]/', $string);
+
+				// Only transliterate if necessary:
+				// - If it contains non-ASCII characters, or
+				// - If it has non-standard symbols that may affect safe usage
+				if ($has_non_ascii || $has_non_standard_symbols)
+				{
+					// Store original casing before transliteration
+					$original_casing = $string;
+
+					// Run transliteration
+					$string = StringHelper::transliterate($string);
+
+					// If original had camel case and transliterate altered casing, restore it
+					if ($has_camel_case)
+					{
+						// Use original casing where possible, as Joomla's transliteration might enforce lowercase
+						$string = self::restoreCamelCase($original_casing, $string);
+					}
+				}
+
+				// Clean the string while preserving camelCase
+				$cleaned = self::clean($string);
+
+				// Cache the result
+				self::$cache[$string] = $cleaned;
+
+				return $cleaned;
 			}
-			// not a string
+
 			return '';
 		}
 
-		// use the default (original behaviour/convention)
-		return StringHelper::safe($string);
+		// Default behaviour for legacy convention
+		$result = StringHelper::safe($string);
+
+		// Cache the result
+		self::$cache[$string] = $result;
+
+		return $result;
 	}
-
+
+	/**
+	 * Restores the camel case pattern from the original string after transliteration.
+	 *
+	 * @param   string  $original  The original string before transliteration.
+	 * @param   string  $modified  The string after transliteration.
+	 *
+	 * @return  string  The string with restored camel case.
+	 * @since   5.1.1
+	 */
+	protected static function restoreCamelCase(string $original, string $modified): string
+	{
+		// Split original and modified strings into character arrays
+		$origChars = preg_split('//u', $original, -1, PREG_SPLIT_NO_EMPTY);
+		$modChars  = preg_split('//u', $modified, -1, PREG_SPLIT_NO_EMPTY);
+
+		// Ensure lengths match before processing
+		if (count($origChars) !== count($modChars))
+		{
+			return $modified; // Return as-is if lengths differ (indicating complex transformation)
+		}
+
+		// Restore camel case where applicable
+		foreach ($origChars as $index => $char)
+		{
+			if (ctype_upper($char))
+			{
+				$modChars[$index] = strtoupper($modChars[$index]);
+			}
+		}
+
+		return implode('', $modChars);
+	}
+
+	/**
+	 * Cleans type name string by:
+	 * - Removing all characters except letters, numbers, underscores, and periods.
+	 * - Allowing only one period (the first period in the string).
+	 *
+	 * @param string $string Type name string to clean.
+	 *
+	 * @return string Cleaned string with only one period (first occurrence).
+	 * @since  5.1.1
+	 */
+	protected static function clean(string $string): string
+	{
+		// Step 1: Remove unwanted characters (allow letters, numbers, underscores, and periods)
+		$string = preg_replace('/[^A-Za-z0-9_.]/', '', $string);
+
+		// Step 2: Keep only the first period, remove all subsequent periods
+		$parts = explode('.', $string, 2);  // Split on first period only
+
+		if (count($parts) === 2)
+		{
+			// Reconstruct string: first part + '.' + remove any further periods from second part
+			$cleaned_string = $parts[0] . '.' . str_replace('.', '', $parts[1]);
+		}
+		else
+		{
+			// No period or just one part, no further action needed
+			$cleaned_string = $string;
+		}
+
+		return trim($cleaned_string);
+	}
 }
 
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/StringHelper.php b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/StringHelper.php
index 5d79075b6..69c884d01 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/StringHelper.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/StringHelper.php
@@ -12,8 +12,10 @@
 namespace VDM\Joomla\Utilities;
 
 
+use Joomla\CMS\Factory;
 use Joomla\Filter\InputFilter;
-use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Language\LanguageFactory;
 use VDM\Joomla\Utilities\Component\Helper;
 
 
@@ -27,188 +29,219 @@ abstract class StringHelper
 	/**
 	 * The Main Active Language
 	 * 
-	 * @var      string
-	 * 
+	 * @var    string
 	 * @since  3.0.9
 	 */
 	public static $langTag;
 
 	/**
-	 * Check if we have a string with a length
+	 * Validate that input is a non-empty, non-whitespace-only string.
 	 *
-	 * @input    string  $string The string to check
+	 * @param mixed $input The input value to validate.
 	 *
-	 * @returns bool true on success
-	 * 
+	 * @returns bool  True if input is a non-empty, non-whitespace-only string, otherwise false.
 	 * @since  3.0.9
 	 */
-	public static function check($string): bool
+	public static function check($input): bool
 	{
-		return is_string($string) && strlen($string) > 0;
+		return is_string($input) && trim($input) !== '';
 	}
 
 	/**
-	 * Shorten a string
+	 * Shortens a string to a specified length, optionally adding a tooltip with the full text.
 	 *
-	 * @input	string   The sting that you would like to shorten
+	 * This method safely shortens the input string without cutting words abruptly. If the string
+	 * exceeds the specified length, ellipses (...) are added. Optionally, a tooltip containing the
+	 * longer original string can be included.
 	 *
-	 * @returns string on success
-	 * 
-	 * @since  3.2.0
+	 * @param mixed $string   The string you would like to shorten.
+	 * @param int   $length   The maximum length for the shortened string. Default is 40.
+	 * @param bool  $addTip   Whether to add a tooltip with the original longer string. Default true.
+	 *
+	 * @return string|mixed   The shortened string, optionally with a tooltip. Or original value passed
+	 * @since  3.2.1
 	 */
-	public static function shorten($string, $length = 40, $addTip = true)
+	public static function shorten($string, int $length = 40, bool $addTip = true)
 	{
-		if (self::check($string))
+		// Validate string input and return original if invalid or short enough.
+		if (!self::check($string) || mb_strlen($string) <= $length)
 		{
-			$initial = strlen((string) $string);
-			$words = preg_split('/([\s\n\r]+)/', (string) $string, -1, PREG_SPLIT_DELIM_CAPTURE);
-			$words_count = count((array)$words);
-
-			$word_length = 0;
-			$last_word = 0;
-			for (; $last_word < $words_count; ++$last_word)
-			{
-				$word_length += strlen($words[$last_word]);
-				if ($word_length > $length)
-				{
-					break;
-				}
-			}
-
-			$newString	= implode(array_slice($words, 0, $last_word));
-			$final	= strlen($newString);
-			if ($initial !== $final && $addTip)
-			{
-				$title = self::shorten($string, 400 , false);
-				return '<span class="hasTip" title="' . $title . '" style="cursor:help">' . trim($newString) . '...</span>';
-			}
-			elseif ($initial !== $final && !$addTip)
-			{
-				return trim($newString) . '...';
-			}
+			return $string;
 		}
-		return $string;
+
+		// Truncate string to nearest word boundary
+		$shortened = mb_substr($string, 0, $length);
+
+		// Find the last space to avoid cutting off a word
+		$lastSpace = mb_strrpos($shortened, ' ');
+		if ($lastSpace !== false)
+		{
+			$shortened = mb_substr($shortened, 0, $lastSpace);
+		}
+
+		// Prepare trimmed and shortened output with ellipses
+		$shortened = trim($shortened) . '...';
+
+		// Add tooltip if requested
+		if ($addTip)
+		{
+			// Safely escape output for HTML
+			$title = self::shorten($string, 400 , false);
+			$escapedTitle = htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
+			$escapedShort = htmlspecialchars($shortened, ENT_QUOTES, 'UTF-8');
+
+			return '<span class="hasTip" title="' . $escapedTitle . '" style="cursor:help">'
+				. $escapedShort
+				. '</span>';
+		}
+
+		// Return shortened version without tooltip
+		return $shortened;
 	}
 
 	/**
-	 * Making strings safe (various ways)
+	 * Makes a string safe by sanitizing and formatting it according to the specified type.
 	 *
-	 * @input	string   The you would like to make safe
+	 * This method can remove unwanted characters, transliterate text, replace numbers with 
+	 * their English equivalents, and apply different case formatting styles.
 	 *
-	 * @returns string on success
-	 * 
+	 * @param string  $string            The string to sanitize and format.
+	 * @param string  $type              The formatting type to apply. Supported values:
+	 *                                   - 'filename'  : Removes special characters and extra spaces.
+	 *                                   - 'L'         : Converts to lowercase with underscores replacing spaces.
+	 *                                   - 'strtolower': Alias for 'L'.
+	 *                                   - 'W'         : Capitalizes the first letter of each word.
+	 *                                   - 'w'         : Converts to lowercase (spaces remain).
+	 *                                   - 'word'      : Alias for 'w'.
+	 *                                   - 'Ww'        : Capitalizes only the first word.
+	 *                                   - 'Word'      : Alias for 'Ww'.
+	 *                                   - 'WW'        : Converts the entire string to uppercase.
+	 *                                   - 'WORD'      : Alias for 'WW'.
+	 *                                   - 'U'         : Converts to uppercase with underscores replacing spaces.
+	 *                                   - 'strtoupper': Alias for 'U'.
+	 *                                   - 'F'         : Capitalizes only the first letter of the entire string.
+	 *                                   - 'ucfirst'   : Alias for 'F'.
+	 *                                   - 'cA'        : Converts to camelCase.
+	 *                                   - 'cAmel'     : Alias for 'cA'.
+	 *                                   - 'camelcase' : Alias for 'cA'.
+	 * @param string  $spacer            The character to replace spaces with (default: '_').
+	 * @param bool    $replaceNumbers    Whether to replace numbers with their English text equivalents (default: true).
+	 * @param bool    $keepOnlyCharacters Whether to remove all non-alphabetic characters (default: true).
+	 *
+	 * @return string The sanitized and formatted string.
 	 * @since  3.0.9
 	 */
-	public static function safe($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true)
+	public static function safe($string, string $type = 'L', string $spacer = '_', bool $replaceNumbers = true, bool $keepOnlyCharacters = true): string
 	{
-		if ($replaceNumbers === true)
+		if ($replaceNumbers)
 		{
 			// remove all numbers and replace with English text version (works well only up to millions)
 			$string = self::numbers($string);
 		}
-		// 0nly continue if we have a string
-		if (self::check($string))
-		{
-			// create file name without the extension that is safe
-			if ($type === 'filename')
-			{
-				// make sure VDM is not in the string
-				$string = str_replace('VDM', 'vDm', (string) $string);
-				// Remove anything which isn't a word, whitespace, number
-				// or any of the following caracters -_()
-				// If you don't need to handle multi-byte characters
-				// you can use preg_replace rather than mb_ereg_replace
-				// Thanks @Łukasz Rysiak!
-				// $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
-				$string = preg_replace("([^\w\s\d\-_\(\)])", '', $string);
 
-				// http://stackoverflow.com/a/2021729/1429677
-				return preg_replace('/\s+/', ' ', (string) $string);
-			}
-			// remove all other characters
-			$string = trim((string) $string);
-			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
-			$string = preg_replace('/\s+/', ' ', $string);
-			// Transliterate string
-			$string = self::transliterate($string);
-			// remove all and keep only characters
-			if ($keepOnlyCharacters)
-			{
-				$string = preg_replace("/[^A-Za-z ]/", '', (string) $string);
-			}
-			// keep both numbers and characters
-			else
-			{
-				$string = preg_replace("/[^A-Za-z0-9 ]/", '', (string) $string);
-			}
-			// select final adaptations
-			if ($type === 'L' || $type === 'strtolower')
-			{
-				// replace white space with underscore
-				$string = preg_replace('/\s+/', (string) $spacer, (string) $string);
-				// default is to return lower
-				return strtolower($string);
-			}
-			elseif ($type === 'W')
-			{
-				// return a string with all first letter of each word uppercase(no underscore)
-				return ucwords(strtolower($string));
-			}
-			elseif ($type === 'w' || $type === 'word')
-			{
-				// return a string with all lowercase(no underscore)
-				return strtolower($string);
-			}
-			elseif ($type === 'Ww' || $type === 'Word')
-			{
-				// return a string with first letter of the first word uppercase and all the rest lowercase(no underscore)
-				return ucfirst(strtolower($string));
-			}
-			elseif ($type === 'WW' || $type === 'WORD')
-			{
-				// return a string with all the uppercase(no underscore)
-				return strtoupper($string);
-			}
-			elseif ($type === 'U' || $type === 'strtoupper')
-			{
-					// replace white space with underscore
-					$string = preg_replace('/\s+/', (string) $spacer, $string);
-					// return all upper
-					return strtoupper($string);
-			}
-			elseif ($type === 'F' || $type === 'ucfirst')
-			{
-					// replace white space with underscore
-					$string = preg_replace('/\s+/', (string) $spacer, $string);
-					// return with first character to upper
-					return ucfirst(strtolower($string));
-			}
-			elseif ($type === 'cA' || $type === 'cAmel' || $type === 'camelcase')
-			{
-				// convert all words to first letter uppercase
-				$string = ucwords(strtolower($string));
-				// remove white space
-				$string = preg_replace('/\s+/', '', $string);
-				// now return first letter lowercase
-				return lcfirst($string);
-			}
-			// return string
-			return $string;
+		// Only continue if we have a string
+		if (!self::check($string))
+		{
+			// not a string
+			return '';
 		}
-		// not a string
-		return '';
+
+		// create file name without the extension that is safe
+		if ($type === 'filename')
+		{
+			// make sure VDM is not in the string
+			$string = str_replace('VDM', 'vDm', (string) $string);
+			// Remove anything which isn't a word, whitespace, number
+			// or any of the following caracters -_()
+			// If you don't need to handle multi-byte characters
+			// you can use preg_replace rather than mb_ereg_replace
+			// Thanks @Łukasz Rysiak!
+			// $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+			$string = preg_replace("([^\w\s\d\-_\(\)])", '', $string);
+
+			// http://stackoverflow.com/a/2021729/1429677
+			return preg_replace('/\s+/', ' ', (string) $string);
+		}
+		// remove all other characters
+		$string = trim((string) $string);
+		$string = preg_replace('/'.$spacer.'+/', ' ', $string);
+		$string = preg_replace('/\s+/', ' ', $string);
+		// Transliterate string
+		$string = self::transliterate($string);
+		// remove all and keep only characters
+		if ($keepOnlyCharacters)
+		{
+			$string = preg_replace("/[^A-Za-z ]/", '', (string) $string);
+		}
+		// keep both numbers and characters
+		else
+		{
+			$string = preg_replace("/[^A-Za-z0-9 ]/", '', (string) $string);
+		}
+		// select final adaptations
+		if ($type === 'L' || $type === 'strtolower')
+		{
+			// replace white space with underscore
+			$string = preg_replace('/\s+/', (string) $spacer, (string) $string);
+			// default is to return lower
+			return strtolower($string);
+		}
+		elseif ($type === 'W')
+		{
+			// return a string with all first letter of each word uppercase(no underscore)
+			return ucwords(strtolower($string));
+		}
+		elseif ($type === 'w' || $type === 'word')
+		{
+			// return a string with all lowercase(no underscore)
+			return strtolower($string);
+		}
+		elseif ($type === 'Ww' || $type === 'Word')
+		{
+			// return a string with first letter of the first word uppercase and all the rest lowercase(no underscore)
+			return ucfirst(strtolower($string));
+		}
+		elseif ($type === 'WW' || $type === 'WORD')
+		{
+			// return a string with all the uppercase(no underscore)
+			return strtoupper($string);
+		}
+		elseif ($type === 'U' || $type === 'strtoupper')
+		{
+				// replace white space with underscore
+				$string = preg_replace('/\s+/', (string) $spacer, $string);
+				// return all upper
+				return strtoupper($string);
+		}
+		elseif ($type === 'F' || $type === 'ucfirst')
+		{
+				// replace white space with underscore
+				$string = preg_replace('/\s+/', (string) $spacer, $string);
+				// return with first character to upper
+				return ucfirst(strtolower($string));
+		}
+		elseif ($type === 'cA' || $type === 'cAmel' || $type === 'camelcase')
+		{
+			// convert all words to first letter uppercase
+			$string = ucwords(strtolower($string));
+			// remove white space
+			$string = preg_replace('/\s+/', '', $string);
+			// now return first letter lowercase
+			return lcfirst($string);
+		}
+		// return string
+		return $string;
 	}
 
 	/**
 	 * Convert none English strings to code usable string
 	 *
-	 * @input	an string
+	 * @input  $string  an string
 	 *
-	 * @returns a string
-	 * 
-	 * @since  3.0.9
+	 * @returns string
+	 * @since   3.0.9
 	 */
-	public static function transliterate($string)
+	public static function transliterate($string): string
 	{
 		// set tag only once
 		if (!self::check(self::$langTag))
@@ -217,22 +250,31 @@ abstract class StringHelper
 			self::$langTag = Helper::getParams()->get('language', 'en-GB');
 		}
 
-		// Transliterate on the language requested
-		$lang = Language::getInstance(self::$langTag);
+		/** @var $langFactory LanguageFactory **/
+		$langFactory = Factory::getContainer()->get(LanguageFactoryInterface::class);
+		$lang = $langFactory->createLanguage(self::$langTag);
 
+		// Transliterate on the language requested
 		return $lang->transliterate($string);
 	}
 
 	/**
-	 * make sure a string is HTML save
+	 * Ensures a string is safe for HTML output by encoding entities and applying an input filter.
 	 *
-	 * @input	an html string
+	 * This method sanitizes the input string, converting special characters to HTML entities 
+	 * and applying Joomla's `InputFilter` to remove potentially unsafe HTML.
+	 * Optionally, it can also shorten the string while preserving word integrity.
 	 *
-	 * @returns a string
-	 * 
-	 * @since  3.0.9
+	 * @param string  $var      The input string containing HTML content.
+	 * @param string  $charset  The character set to use for encoding (default: 'UTF-8').
+	 * @param bool    $shorten  Whether to shorten the string to a specified length (default: false).
+	 * @param int     $length   The maximum length for shortening, if enabled (default: 40).
+	 * @param bool    $addTip   Whether to append a tooltip (ellipsis) when shortening (default: true).
+	 *
+	 * @return string The sanitized and optionally shortened HTML-safe string.
+	 * @since 3.0.9
 	 */
-	public static function html($var, $charset = 'UTF-8', $shorten = false, $length = 40, $addTip = true)
+	public static function html($var, $charset = 'UTF-8', $shorten = false, $length = 40, $addTip = true): string
 	{
 		if (self::check($var))
 		{
@@ -262,13 +304,12 @@ abstract class StringHelper
 	/**
 	 * Convert all int in a string to an English word string
 	 *
-	 * @input	an string with numbers
+	 * @input    $string  an string with numbers
 	 *
-	 * @returns a string
-	 * 
+	 * @returns  string|null
 	 * @since  3.0.9
 	 */
-	public static function numbers($string)
+	public static function numbers($string): ?string
 	{
 		// set numbers array
 		$numbers = [];
@@ -300,19 +341,19 @@ abstract class StringHelper
 	 * Convert an integer into an English word string
 	 * Thanks to Tom Nicholson <http://php.net/manual/en/function.strval.php#41988>
 	 *
-	 * @input	an int
-	 * @returns a string
+	 * @input    $x an int
 	 * 
+	 * @returns   string
 	 * @since  3.0.9
 	 */
 	public static function number($x)
 	{
-		$nwords = array( "zero", "one", "two", "three", "four", "five", "six", "seven",
+		$nwords = ["zero", "one", "two", "three", "four", "five", "six", "seven",
 			"eight", "nine", "ten", "eleven", "twelve", "thirteen",
 			"fourteen", "fifteen", "sixteen", "seventeen", "eighteen",
 			"nineteen", "twenty", 30 => "thirty", 40 => "forty",
 			50 => "fifty", 60 => "sixty", 70 => "seventy", 80 => "eighty",
-			90 => "ninety" );
+			90 => "ninety"];
 
 		if(!is_numeric($x))
 		{
@@ -372,7 +413,7 @@ abstract class StringHelper
 				}
 			} 
 			else //  millions
-			{    
+			{
 				$w .= self::number(floor($x/1000000)) .' million';
 				$r = fmod($x, 1000000);
 				if($r > 0)
@@ -392,9 +433,9 @@ abstract class StringHelper
 	/**
 	 * Random Key
 	 *
-	 * @input	 int  $size   The size of the random string
+	 * @input   int  $size   The size of the random string
 	 *
-	 * @returns a string
+	 * @returns string
 	 * @since  3.0.9
 	 */
 	public static function random(int $size): string