diff --git a/CHANGELOG.md b/CHANGELOG.md
index c588683eb..7aeaba2a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,43 +1,29 @@
-# v3.2.1-rc1
+# v3.2.1-rc2
 
 - Improved the Schema Table update engine (more)
 - Fix autoloader timing, and loading.
-- Implement the Joomla Powers in JCB code, to move away from JClasses.
+- Implement the Joomla Powers in JCB code, to move away from JClasses.
+- Remove many of the SQL updates, to only use the Schema updates of table columns to avoid collusion.
 
-# v3.2.1-beta3
+# v3.2.1-beta
 
+- Add fallback option to ensure that all JCB tables and fields exist.
+- Move the powers autoloader to its own file.
+- Fix the media field size limitation. #1109
+- Add dynamic datatype update to schema field check.
 - Fix version_update column size.
 - Improved the Schema Table update engine.
 
-# v3.2.1-beta2
-
-- Fix the media field size limitation. #1109
-- Add dynamic datatype update to schema field check.
-
-# v3.2.1-beta1
-
-- Add fallback option to ensure that all JCB tables and fields exist.
-- Move the powers autoloader to its own file.
-
-# v3.2.1-alpha4
-
-- Add Joomla powers for namespace dynamic management.
-
-# v3.2.1-alpha3
-
-- Fix plugin code display when methods and properties are missing.
-
-# v3.2.1-alpha2
+# v3.2.1-alpha
 
+- Add power path override option on component level.
+- Fix the sql build feature. #1032
 - Add view list and single name fix.
 - Add component code name fix.
 - Add reset list of powers.
-- Fix missing Factory class in plugin. #1102
-
-# v3.2.1-alpha1
-
-- Add power path override option on component level.
-- Fix the sql build feature. #1032
+- Fix missing Factory class in plugin. #1102
+- Fix plugin code display when methods and properties are missing.
+- Add Joomla powers for namespace dynamic management.
 
 # v3.2.0
 
@@ -61,84 +47,45 @@
 
 # v3.2.0-beta
 
-- Move beta to main repo
-
-# v3.1.42
-
-- Fix #1055 to add the style and scripts to all views.
-
-# v3.1.40
-
-- Fix #1052 so that tabs last opened is remembered and opened again on save, refresh or reopening of an item.
-- Fix #1057 so that the datetime fields will be set correctly in mysql.
-
-# v3.1.39
-
-- Fix #1051 making sure the list view is lowercase.
-
-# v3.1.38
-
-- Fix #1046 so that the version restore function will work.
-
-# v3.1.37
-
-- Fix #1041 so that custom tabs are build correctly.
-- Fix #1043 so that delete function in Joomla 4 and 5 will work.
-- Fix #1045 so that plug-in Structure::setMainXmlFile method will except an object.
-- Fix #1042 so that it will remove line breaks and new lines from other languages as well.
-
-# v3.1.36
-
-- Move the defined or die below use statements.
-- Add the new router view
-
-# v3.1.35
-
-- Improve the Joomla 4 Templates.
-- Fix #1033 the response class issue for the gitea classes.
-- Remove the JRegistry class to resolve #1036, #1035
-
-# v3.1.34
-
-- Fix the AjaxController contructor class.
-- Improved the getModel calls from the AxajController class.
-
-# v3.1.33
-
+- Add namspace prefix to both global, and component override level.
+- Add Joomla 4 and 5 build option
+- Add joomla_version to custom code.
+- Add Joomla 4 and 5 correct build files.
+- Fix #1026 by removing chosen everywhere.
+- Resolve #1028 by adding in line helper toggle integration to all admin views.
+- Remove the import and export buttons until the area is fixed.
+- Add emptystate list template to all admin list views.
 - Fix #1026 by adding the correct layout to the filter views.
 - Fix #1026 by adding the class to the filter views.
 - Fix #1026 by adding a hint to the filters that are having multiple selection.
 - Fix the directional bog where a field in the filters are also called direction.
-- Fix the getModel helper method fot J4+.
-
-# v3.1.32
-
-- Fix #1026 by removing chosen everywhere.
-- Resolve #1028 by adding in line helper toggle integration to all admin views.
-- Remove the import and export buttons until the area is fixed.
-- Add emptystate list template to all admin list views.
-
-# v3.1.31
-
-- Add joomla_version to custom code.
-- Add Joomla 4 and 5 correct build files.
-
-# v3.1.30
-
-- Add namspace prefix to both global, and component override level.
-- Add Joomla 4 and 5 build option
+- Fix the getModel helper method fot J4+.
+- Fix the AjaxController contructor class.
+- Improved the getModel calls from the AxajController class.
+- Improve the Joomla 4 Templates.
+- Fix #1033 the response class issue for the gitea classes.
+- Remove the JRegistry class to resolve #1036, #1035
+- Move the defined or die below use statements.
+- Add the new router view
+- Fix #1041 so that custom tabs are build correctly.
+- Fix #1043 so that delete function in Joomla 4 and 5 will work.
+- Fix #1045 so that plug-in Structure::setMainXmlFile method will except an object.
+- Fix #1042 so that it will remove line breaks and new lines from other languages as well.
+- Fix #1046 so that the version restore function will work.
+- Fix #1051 making sure the list view is lowercase.
+- Fix #1052 so that tabs last opened is remembered and opened again on save, refresh or reopening of an item.
+- Fix #1057 so that the datetime fields will be set correctly in mysql.
+- Fix #1055 to add the style and scripts to all views.
+- Move beta to main repo
 
 # v3.1.28
 
+- Adds better remote repository management for the super power features.
+- Fixes #1014 so that powers are added to components.
 - Updates PHPSecLib.
 - Fixed connection failure to remote server.
 - Adds overriding of back-folder and git-folder on component level.
 
-# v3.1.27
-
-- Adds better remote repository management for the super power features.
-- Fixes #1014 so that powers are added to components.
-
 # v3.1.26
 
 - Fixed changelog direction so newest changes is listed at top of the file.
diff --git a/README.md b/README.md
index 9cc32291f..007047036 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 (3.2.1-rc1) 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 (3.2.1-rc2) 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*: 27th April, 2024
-+ *Version*: 3.2.1-rc1
++ *Last Build*: 30th April, 2024
++ *Version*: 3.2.1-rc2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **764912**
++ *Line count*: **761457**
 + *Field count*: **2097**
-+ *File count*: **5383**
++ *File count*: **5294**
 + *Folder count*: **471**
 
 > 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 9cc32291f..007047036 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 (3.2.1-rc1) 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 (3.2.1-rc2) 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*: 27th April, 2024
-+ *Version*: 3.2.1-rc1
++ *Last Build*: 30th April, 2024
++ *Version*: 3.2.1-rc2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **764912**
++ *Line count*: **761457**
 + *Field count*: **2097**
-+ *File count*: **5383**
++ *File count*: **5294**
 + *Folder count*: **471**
 
 > 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/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index cf6d61664..ad8b709fc 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -8104,7 +8104,6 @@ COM_COMPONENTBUILDER_SERVER_HOST_HINT="yourhost.com"
 COM_COMPONENTBUILDER_SERVER_HOST_LABEL="Host/IP<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_HOST_MESSAGE="Error! Please add server host name here."
 COM_COMPONENTBUILDER_SERVER_ID="Id"
-COM_COMPONENTBUILDER_SERVER_LINKED_COMPONENTS="Linked Components"
 COM_COMPONENTBUILDER_SERVER_MODIFIED_BY_DESC="The last user that modified this Server."
 COM_COMPONENTBUILDER_SERVER_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_SERVER_MODIFIED_DATE_DESC="The date this Server was modified."
diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php
deleted file mode 100644
index a63f14529..000000000
--- a/admin/layouts/server/linked_components_fullwidth.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\HTML\HTMLHelper as Html;
-use VDM\Joomla\Utilities\StringHelper;
-use VDM\Joomla\Utilities\ArrayHelper;
-use VDM\Joomla\Utilities\GetHelper;
-
-// set the defaults
-$items = $displayData->vydlinked_components;
-$user = Factory::getUser();
-$id = $displayData->item->id;
-// set the edit URL
-$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
-// set a return value
-$return = ($id) ? "index.php?option=com_componentbuilder&view=server&layout=edit&id=" . $id : "";
-// check for a return value
-$jinput = Factory::getApplication()->input;
-if ($_return = $jinput->get('return', null, 'base64'))
-{
-	$return .= "&return=" . $_return;
-}
-// check if return value was set
-if (StringHelper::check($return))
-{
-	// set the referral values
-	$ref = ($id) ? "&ref=server&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
-}
-else
-{
-	$ref = ($id) ? "&ref=server&refid=" . $id : "";
-}
-
-?>
-<div class="form-vertical">
-<?php if (ArrayHelper::check($items)): ?>
-<table class="footable table data joomla_components" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
-<thead>
-	<tr>
-		<th data-type="html" data-sort-use="text">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SYSTEM_NAME_LABEL'); ?>
-		</th>
-		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CODE_NAME'); ?>
-		</th>
-		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DESCRIPTION'); ?>
-		</th>
-		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_COMPANY_DETAILS'); ?>
-		</th>
-		<th width="10" data-breakpoints="xs sm md">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_STATUS'); ?>
-		</th>
-		<th width="5" data-type="number" data-breakpoints="xs sm md">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ID'); ?>
-		</th>
-	</tr>
-</thead>
-<tbody>
-<?php foreach ($items as $i => $item): ?>
-	<?php
-		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = Factory::getUser($item->checked_out);
-		$canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components');
-	?>
-	<tr>
-		<td>
-			<div>
-			<?php if ($canDo->get('joomla_component.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $displayData->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 $displayData->escape($item->system_name); ?>
-			<?php endif; ?>
-				- <?php echo $this->escape($item->component_version); ?>
-			</div>
-			<?php
-				// always make sure the $this->return_here is set
-				if (!isset($this->return_here))
-				{
-					$this->return_here = urlencode(base64_encode((string) Uri::getInstance()));
-				}
-				// setup the buttons
-				if (!isset($_buttons) || !ArrayHelper::check($_buttons))
-				{
-					$_buttons = array();
-					$_buttons[0] = array(
-						array(
-							'view' => 'component_admin_views',
-							'views' => 'components_admin_views',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_ADMIN_VIEWS'),
-							'icon' => 'stack'),
-						array(
-							'view' => 'component_custom_admin_views',
-							'views' => 'components_custom_admin_views',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_CUSTOM_ADMIN_VIEWS'),
-							'icon' => 'screen'),
-						array(
-							'view' => 'component_site_views',
-							'views' => 'components_site_views',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_SITE_VIEWS'),
-							'icon' => 'palette'),
-						array(
-							'view' => 'component_router',
-							'views' => 'components_routers',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_SITE_ROUTER'),
-							'icon' => 'tree-2'),
-						array(
-							'view' => 'component_config',
-							'views' => 'components_config',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_CONFIG'),
-							'icon' => 'options')
-						);
-					$_buttons[1] = array(
-						array(
-							'view' => 'component_placeholders',
-							'views' => 'components_placeholders',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_PLACEHOLDERS'),
-							'icon' => 'search'),
-						array(
-							'view' => 'component_updates',
-							'views' => 'components_updates',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_UPDATES'),
-							'icon' => 'database'),
-						array(
-							'view' => 'component_mysql_tweaks',
-							'views' => 'components_mysql_tweaks',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_MYSQL_TWEAKS'),
-							'icon' => 'screwdriver'),
-						array(
-							'view' => 'component_files_folders',
-							'views' => 'components_files_folders',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_FILES_FOLDERS'),
-							'icon' => 'briefcase')
-						);
-					$_buttons[2] = array(
-						array(
-							'view' => 'component_custom_admin_menus',
-							'views' => 'components_custom_admin_menus',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_CUSTOM_ADMIN_MENUS'),
-							'icon' => 'plus'),
-						array(
-							'view' => 'component_dashboard',
-							'views' => 'components_dashboard',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_DASHBOARD'),
-							'icon' => 'dashboard'),
-						array(
-							'view' => 'component_modules',
-							'views' => 'components_modules',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_MODULES'),
-							'icon' => 'cube'),
-						array(
-							'view' => 'component_plugins',
-							'views' => 'components_plugins',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_PLUGINS'),
-							'icon' => 'power-cord')
-						);
-				}
-			?>
-			<div class="btn-group" style="margin: 5px 0 0 0;">
-			<?php foreach ($_buttons[0] as $_button): ?>
-				<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_component', 'id')) !== false): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php elseif ($canDo->get($_button['view'].'.create')): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_component&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php endif; ?>
-			<?php endforeach; ?>
-
-			</div>
-		</td>
-		<td>
-			<div>
-			<?php echo $displayData->escape($item->name_code); ?>
-			</div>
-			<div class="btn-group" style="margin: 5px 0 0 0;">
-			<?php foreach ($_buttons[1] as $_button): ?>
-				<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_component', 'id')) !== false): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php elseif ($canDo->get($_button['view'].'.create')): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_component&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php endif; ?>
-			<?php endforeach; ?>
-			</div>
-		</td>
-		<td>
-			<div>
-			<?php echo $displayData->escape($item->short_description); ?>
-			</div>
-			<div class="btn-group" style="margin: 5px 0 0 0;">
-			<?php foreach ($_buttons[2] as $_button): ?>
-				<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_component', 'id')) !== false): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php elseif ($canDo->get($_button['view'].'.create')): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_component&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php endif; ?>
-			<?php endforeach; ?>
-			</div>
-		</td>
-		<td>
-			<div><b><?php echo $this->escape($item->companyname); ?></b><br />
-			<?php if (StringHelper::check($item->author)) : ?>
-				<em><?php echo $this->escape($item->author); ?><em><br />
-			<?php endif; ?>
-			<?php if (StringHelper::check($item->email) && StringHelper::check($item->author)) : ?>
-				<a href="mailto:<?php echo $this->escape($item->email); ?>" title="<?php echo Text::sprintf('COM_COMPONENTBUILDER_EMAIL_S', $item->author); ?>" target="_blank">
-					<?php echo $this->escape($item->email); ?>
-				</a>
-				<br />
-			<?php endif; ?>
-			<?php if (StringHelper::check($item->website) && StringHelper::check($item->author)) : ?>
-				<a href="<?php echo $this->escape($item->website); ?>" title="<?php echo Text::sprintf('COM_COMPONENTBUILDER_WEBSITE_OF_S', $item->companyname); ?>" target="_blank">
-					<?php echo $this->escape($item->website); ?>
-				</a>
-			<?php endif; ?>
-			</div>
-		</td>
-		<?php if ($item->published == 1): ?>
-			<td class="center"  data-sort-value="1">
-				<span class="status-metro status-published" title="<?php echo Text::_('COM_COMPONENTBUILDER_PUBLISHED');  ?>">
-					<?php echo Text::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == 0): ?>
-			<td class="center"  data-sort-value="2">
-				<span class="status-metro status-inactive" title="<?php echo Text::_('COM_COMPONENTBUILDER_INACTIVE');  ?>">
-					<?php echo Text::_('COM_COMPONENTBUILDER_INACTIVE'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == 2): ?>
-			<td class="center"  data-sort-value="3">
-				<span class="status-metro status-archived" title="<?php echo Text::_('COM_COMPONENTBUILDER_ARCHIVED');  ?>">
-					<?php echo Text::_('COM_COMPONENTBUILDER_ARCHIVED'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == -2): ?>
-			<td class="center"  data-sort-value="4">
-				<span class="status-metro status-trashed" title="<?php echo Text::_('COM_COMPONENTBUILDER_TRASHED');  ?>">
-					<?php echo Text::_('COM_COMPONENTBUILDER_TRASHED'); ?>
-				</span>
-			</td>
-		<?php endif; ?>
-		<td class="nowrap center hidden-phone">
-			<?php echo $item->id; ?>
-		</td>
-	</tr>
-<?php endforeach; ?>
-</tbody>
-</table>
-<?php else: ?>
-	<div class="alert alert-no-items">
-		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-	</div>
-<?php endif; ?>
-</div>
diff --git a/admin/models/server.php b/admin/models/server.php
index bb324d5eb..7633eaaaa 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -25,9 +25,8 @@ use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Helper\TagsHelper;
 use VDM\Joomla\FOF\Encrypt\AES;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 /**
  * Componentbuilder Server Admin Model
@@ -188,104 +187,10 @@ class ComponentbuilderModelServer extends AdminModel
 				$item->username = rtrim($basic->decryptString($item->username), "\0");
 			}
 		}
-		$this->sales_serverupdate_servervvvw = $item->id;
 
 		return $item;
 	}
 
-	/**
-	 * Method to get list data.
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getVydlinked_components()
-	{
-		// Get the user object.
-		$user = Factory::getUser();
-		// Create a new query object.
-		$db = Factory::getDBO();
-		$query = $db->getQuery(true);
-
-		// Select some fields
-		$query->select('a.*');
-
-		// From the componentbuilder_joomla_component table
-		$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
-
-		// Filter by sales_serverupdate_servervvvw global.
-		$sales_serverupdate_servervvvw = $this->sales_serverupdate_servervvvw;
-		if (is_numeric($sales_serverupdate_servervvvw ))
-		{
-			$query->where('a.sales_server = ' . (int) $sales_serverupdate_servervvvw . ' OR a.update_server = ' . (int) $sales_serverupdate_servervvvw, ' OR');
-		}
-		elseif (is_string($sales_serverupdate_servervvvw))
-		{
-			$query->where('a.sales_server = ' . $db->quote($sales_serverupdate_servervvvw) . ' OR a.update_server = ' . $db->quote($sales_serverupdate_servervvvw), ' OR');
-		}
-		else
-		{
-			$query->where('a.update_server = -5');
-		}
-
-		// Join over the asset groups.
-		$query->select('ag.title AS access_level');
-		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// Filter by access level.
-		$_access = $this->getState('filter.access');
-		if ($_access && is_numeric($_access))
-		{
-			$query->where('a.access = ' . (int) $_access);
-		}
-		elseif (UtilitiesArrayHelper::check($_access))
-		{
-			// Secure the array for the query
-			$_access = ArrayHelper::toInteger($_access);
-			// Filter by the Access Array.
-			$query->where('a.access IN (' . implode(',', $_access) . ')');
-		}
-		// Implement View Level Access
-		if (!$user->authorise('core.options', 'com_componentbuilder'))
-		{
-			$groups = implode(',', $user->getAuthorisedViewLevels());
-			$query->where('a.access IN (' . $groups . ')');
-		}
-
-		// Order the results by ordering
-		$query->order('a.published  ASC');
-		$query->order('a.ordering  ASC');
-
-		// Load the items
-		$db->setQuery($query);
-		$db->execute();
-		if ($db->getNumRows())
-		{
-			$items = $db->loadObjectList();
-
-			// Set values to display correctly.
-			if (UtilitiesArrayHelper::check($items))
-			{
-				// Get the user object if not set.
-				if (!isset($user) || !ObjectHelper::check($user))
-				{
-					$user = Factory::getUser();
-				}
-				foreach ($items as $nr => &$item)
-				{
-					// Remove items the user can't access.
-					$access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $item->id) && $user->authorise('joomla_component.access', 'com_componentbuilder'));
-					if (!$access)
-					{
-						unset($items[$nr]);
-						continue;
-					}
-
-				}
-			}
-			return $items;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get the record form.
 	 *
diff --git a/admin/sql/updates/mysql/2.10.1.sql b/admin/sql/updates/mysql/2.10.1.sql
deleted file mode 100644
index 73163a01b..000000000
--- a/admin/sql/updates/mysql/2.10.1.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_library` ADD `target` TINYINT(1) NOT NULL DEFAULT 1 AFTER `php_setdocument`;
diff --git a/admin/sql/updates/mysql/2.10.10.sql b/admin/sql/updates/mysql/2.10.10.sql
deleted file mode 100644
index b3a38d3de..000000000
--- a/admin/sql/updates/mysql/2.10.10.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_module` ROW_FORMAT=DYNAMIC;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ROW_FORMAT=DYNAMIC;
-
-ALTER TABLE `#__componentbuilder_dynamic_get` ROW_FORMAT=DYNAMIC;
-
-ALTER TABLE `#__componentbuilder_class_property` ROW_FORMAT=DYNAMIC;
-
-ALTER TABLE `#__componentbuilder_class_method` ROW_FORMAT=DYNAMIC;
-
-ALTER TABLE `#__componentbuilder_class_extends` ROW_FORMAT=DYNAMIC;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin_group` ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/2.10.11.sql b/admin/sql/updates/mysql/2.10.11.sql
deleted file mode 100644
index d0825115c..000000000
--- a/admin/sql/updates/mysql/2.10.11.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_module` ADD `target` TINYINT(1) NOT NULL DEFAULT 0 AFTER `system_name`;
diff --git a/admin/sql/updates/mysql/2.10.12.sql b/admin/sql/updates/mysql/2.10.12.sql
deleted file mode 100644
index 008ecc5fe..000000000
--- a/admin/sql/updates/mysql/2.10.12.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_language_translation` ADD `modules` TEXT NOT NULL AFTER `components`;
-
-ALTER TABLE `#__componentbuilder_language_translation` ADD `plugins` TEXT NOT NULL AFTER `modules`;
diff --git a/admin/sql/updates/mysql/2.10.2.sql b/admin/sql/updates/mysql/2.10.2.sql
deleted file mode 100644
index 5105ec1dd..000000000
--- a/admin/sql/updates/mysql/2.10.2.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `#__componentbuilder_field` ADD `on_get_model_field` TEXT NOT NULL AFTER `datatype`;
-
-ALTER TABLE `#__componentbuilder_field` ADD `on_save_model_field` TEXT NOT NULL AFTER `on_get_model_field`;
-
-ALTER TABLE `#__componentbuilder_field` ADD `initiator_on_save_model` TEXT NOT NULL AFTER `indexes`;
-
-ALTER TABLE `#__componentbuilder_field` ADD `initiator_on_get_model` TEXT NOT NULL AFTER `indexes`;
diff --git a/admin/sql/updates/mysql/2.10.5.sql b/admin/sql/updates/mysql/2.10.5.sql
deleted file mode 100644
index 7464118eb..000000000
--- a/admin/sql/updates/mysql/2.10.5.sql
+++ /dev/null
@@ -1,133 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`abstract_class_helper_code` MEDIUMTEXT NOT NULL,
-	`abstract_class_helper_header` TEXT NOT NULL,
-	`add_abstract_class_helper` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_custom_abstract_class_helper_header` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_php_method_uninstall` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_php_postflight_install` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_php_postflight_update` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_php_preflight_install` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_php_preflight_uninstall` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_php_preflight_update` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_php_script_construct` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_sales_server` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_sql` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_sql_uninstall` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_update_server` TINYINT(1) NOT NULL DEFAULT 0,
-	`addreadme` TINYINT(1) NOT NULL DEFAULT 0,
-	`custom_get` TEXT NOT NULL,
-	`default` TEXT NOT NULL,
-	`description` TEXT NOT NULL,
-	`fields` TEXT NOT NULL,
-	`libraries` TEXT NOT NULL,
-	`module_version` CHAR(64) NOT NULL DEFAULT '',
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`php_method_uninstall` MEDIUMTEXT NOT NULL,
-	`php_postflight_install` MEDIUMTEXT NOT NULL,
-	`php_postflight_update` MEDIUMTEXT NOT NULL,
-	`php_preflight_install` MEDIUMTEXT NOT NULL,
-	`php_preflight_uninstall` MEDIUMTEXT NOT NULL,
-	`php_preflight_update` MEDIUMTEXT NOT NULL,
-	`php_script_construct` MEDIUMTEXT NOT NULL,
-	`readme` TEXT NOT NULL,
-	`sales_server` INT(11) NOT NULL DEFAULT 0,
-	`snippet_one` TEXT NOT NULL,
-	`snippet_two` INT(11) NOT NULL DEFAULT 0,
-	`sql` MEDIUMTEXT NOT NULL,
-	`sql_uninstall` MEDIUMTEXT NOT NULL,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
-	`update_server` INT(11) NOT NULL DEFAULT 0,
-	`update_server_target` TINYINT(1) NOT NULL DEFAULT 0,
-	`update_server_url` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_system_name` (`system_name`),
-	KEY `idx_add_sales_server` (`add_sales_server`),
-	KEY `idx_add_php_preflight_uninstall` (`add_php_preflight_uninstall`),
-	KEY `idx_add_php_postflight_install` (`add_php_postflight_install`),
-	KEY `idx_add_php_postflight_update` (`add_php_postflight_update`),
-	KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`),
-	KEY `idx_add_sql` (`add_sql`),
-	KEY `idx_add_sql_uninstall` (`add_sql_uninstall`),
-	KEY `idx_addreadme` (`addreadme`),
-	KEY `idx_add_php_script_construct` (`add_php_script_construct`),
-	KEY `idx_add_update_server` (`add_update_server`),
-	KEY `idx_update_server_target` (`update_server_target`),
-	KEY `idx_add_php_preflight_install` (`add_php_preflight_install`),
-	KEY `idx_add_php_preflight_update` (`add_php_preflight_update`),
-	KEY `idx_name` (`name`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module_updates` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`joomla_module` INT(11) NOT NULL DEFAULT 0,
-	`version_update` TEXT NOT NULL,
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_joomla_module` (`joomla_module`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module_files_folders_urls` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addfiles` TEXT NOT NULL,
-	`addfilesfullpath` TEXT NOT NULL,
-	`addfolders` TEXT NOT NULL,
-	`addfoldersfullpath` TEXT NOT NULL,
-	`addurls` TEXT NOT NULL,
-	`joomla_module` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_joomla_module` (`joomla_module`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/2.10.6.sql b/admin/sql/updates/mysql/2.10.6.sql
deleted file mode 100644
index 22b45e717..000000000
--- a/admin/sql/updates/mysql/2.10.6.sql
+++ /dev/null
@@ -1,33 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_modules` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addjoomla_modules` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_joomla_component` (`joomla_component`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
-
-ALTER TABLE `#__componentbuilder_joomla_module` CHANGE `add_abstract_class_helper` `add_class_helper` TINYINT(1) NOT NULL DEFAULT 0;
-
-ALTER TABLE `#__componentbuilder_joomla_module` CHANGE `add_custom_abstract_class_helper_header` `add_class_helper_header` TINYINT(1) NOT NULL DEFAULT 0;
-
-ALTER TABLE `#__componentbuilder_joomla_module` CHANGE `abstract_class_helper_code` `class_helper_code` MEDIUMTEXT NOT NULL;
-
-ALTER TABLE `#__componentbuilder_joomla_module` CHANGE `abstract_class_helper_header` `class_helper_header` TEXT NOT NULL;
diff --git a/admin/sql/updates/mysql/2.10.7.sql b/admin/sql/updates/mysql/2.10.7.sql
deleted file mode 100644
index 8aedc75fa..000000000
--- a/admin/sql/updates/mysql/2.10.7.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_module` ADD `mod_code` TEXT NOT NULL AFTER `libraries`;
diff --git a/admin/sql/updates/mysql/2.10.9.sql b/admin/sql/updates/mysql/2.10.9.sql
deleted file mode 100644
index 8a0a28508..000000000
--- a/admin/sql/updates/mysql/2.10.9.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `export_key`;
-
-ALTER TABLE `#__componentbuilder_joomla_module` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `fields`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `fields`;
-
-ALTER TABLE `#__componentbuilder_admin_view` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `description`;
-
-ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `dynamic_get`;
-
-ALTER TABLE `#__componentbuilder_site_view` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `dynamic_get`;
-
-ALTER TABLE `#__componentbuilder_dynamic_get` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `group`;
-
-ALTER TABLE `#__componentbuilder_class_property` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `extension_type`;
-
-ALTER TABLE `#__componentbuilder_class_method` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `extension_type`;
-
-ALTER TABLE `#__componentbuilder_library` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `description`;
-
-ALTER TABLE `#__componentbuilder_snippet` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `description`;
-
-ALTER TABLE `#__componentbuilder_field` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `fieldtype`;
-
-ALTER TABLE `#__componentbuilder_fieldtype` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `description`;
diff --git a/admin/sql/updates/mysql/2.11.4.sql b/admin/sql/updates/mysql/2.11.4.sql
deleted file mode 100644
index 8ce5fca1d..000000000
--- a/admin/sql/updates/mysql/2.11.4.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_module` CHANGE `default` `default` MEDIUMTEXT NOT NULL;
-
-ALTER TABLE `#__componentbuilder_custom_admin_view` CHANGE `default` `default` MEDIUMTEXT NOT NULL;
-
-ALTER TABLE `#__componentbuilder_site_view` CHANGE `default` `default` MEDIUMTEXT NOT NULL;
diff --git a/admin/sql/updates/mysql/2.11.5.sql b/admin/sql/updates/mysql/2.11.5.sql
deleted file mode 100644
index d325e2f1d..000000000
--- a/admin/sql/updates/mysql/2.11.5.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `remove_line_breaks` TINYINT(1) NOT NULL DEFAULT 0 AFTER `readme`;
diff --git a/admin/sql/updates/mysql/2.12.1.sql b/admin/sql/updates/mysql/2.12.1.sql
deleted file mode 100644
index 99b2ee06f..000000000
--- a/admin/sql/updates/mysql/2.12.1.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `assets_table_fix` TINYINT(1) NOT NULL DEFAULT 3 AFTER `adduikit`;
diff --git a/admin/sql/updates/mysql/2.12.10.sql b/admin/sql/updates/mysql/2.12.10.sql
deleted file mode 100644
index b666cf9b0..000000000
--- a/admin/sql/updates/mysql/2.12.10.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_class_property` CHANGE `default` `default` TEXT NOT NULL;
diff --git a/admin/sql/updates/mysql/2.12.16.sql b/admin/sql/updates/mysql/2.12.16.sql
deleted file mode 100644
index d8c537d5c..000000000
--- a/admin/sql/updates/mysql/2.12.16.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_powers` TINYINT(1) NOT NULL DEFAULT 1 AFTER `add_placeholders`;
diff --git a/admin/sql/updates/mysql/2.12.4.sql b/admin/sql/updates/mysql/2.12.4.sql
deleted file mode 100644
index 41b9fcbb5..000000000
--- a/admin/sql/updates/mysql/2.12.4.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_admin_view` ADD `add_category_submenu` TINYINT(1) NOT NULL DEFAULT 1 AFTER `asset_id`;
diff --git a/admin/sql/updates/mysql/2.13.1.sql b/admin/sql/updates/mysql/2.13.1.sql
deleted file mode 100644
index a4255d34d..000000000
--- a/admin/sql/updates/mysql/2.13.1.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_power` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_head` TINYINT(1) NOT NULL DEFAULT 0,
-	`description` TEXT NOT NULL,
-	`extends` VARCHAR(36) NOT NULL DEFAULT '',
-	`extends_custom` VARCHAR(64) NOT NULL DEFAULT '',
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
-	`head` TEXT NOT NULL,
-	`implements` TEXT NULL,
-	`implements_custom` VARCHAR(1024) NOT NULL DEFAULT '',
-	`load_selection` TEXT NOT NULL,
-	`main_class_code` MEDIUMTEXT NOT NULL,
-	`method_selection` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`namespace` VARCHAR(255) NOT NULL DEFAULT '',
-	`power_version` CHAR(64) NOT NULL DEFAULT '',
-	`property_selection` TEXT NOT NULL,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
-	`type` VARCHAR(64) NOT NULL DEFAULT '',
-	`use_selection` TEXT NOT NULL,
-	`params` text NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_system_name` (`system_name`),
-	KEY `idx_namespace` (`namespace`),
-	KEY `idx_type` (`type`),
-	KEY `idx_implements_custom` (`implements_custom`),
-	KEY `idx_extends_custom` (`extends_custom`),
-	KEY `idx_guid` (`guid`),
-	KEY `idx_name` (`name`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/2.5.1.sql b/admin/sql/updates/mysql/2.5.1.sql
deleted file mode 100644
index 0f44c98e2..000000000
--- a/admin/sql/updates/mysql/2.5.1.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_ftp` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`signature` TEXT NOT NULL,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
diff --git a/admin/sql/updates/mysql/2.5.2.sql b/admin/sql/updates/mysql/2.5.2.sql
deleted file mode 100644
index 805660076..000000000
--- a/admin/sql/updates/mysql/2.5.2.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_before_save` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_before_publish`;
-
-ALTER TABLE `#__componentbuilder_admin_view` ADD `php_before_save` MEDIUMTEXT NOT NULL AFTER `php_before_publish`;
diff --git a/admin/sql/updates/mysql/2.5.3.sql b/admin/sql/updates/mysql/2.5.3.sql
deleted file mode 100644
index 4d3f57964..000000000
--- a/admin/sql/updates/mysql/2.5.3.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `toignore` TEXT NOT NULL AFTER `system_name`;
diff --git a/admin/sql/updates/mysql/2.5.5.sql b/admin/sql/updates/mysql/2.5.5.sql
deleted file mode 100644
index 81f300cb8..000000000
--- a/admin/sql/updates/mysql/2.5.5.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_javascript` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_email_helper`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `javascript` TEXT NOT NULL AFTER `image`;
diff --git a/admin/sql/updates/mysql/2.5.6.sql b/admin/sql/updates/mysql/2.5.6.sql
deleted file mode 100644
index 9a75e6884..000000000
--- a/admin/sql/updates/mysql/2.5.6.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addconditions` TEXT NOT NULL,
-	`addfields` TEXT NOT NULL,
-	`admin_view` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_admin_view` (`admin_view`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
diff --git a/admin/sql/updates/mysql/2.5.7.sql b/admin/sql/updates/mysql/2.5.7.sql
deleted file mode 100644
index 2a37091a2..000000000
--- a/admin/sql/updates/mysql/2.5.7.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields_conditions` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addconditions` TEXT NOT NULL,
-	`admin_view` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_admin_view` (`admin_view`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
diff --git a/admin/sql/updates/mysql/2.5.8.sql b/admin/sql/updates/mysql/2.5.8.sql
deleted file mode 100644
index 9c637db0c..000000000
--- a/admin/sql/updates/mysql/2.5.8.sql
+++ /dev/null
@@ -1,235 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_admin_views` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addadmin_views` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_site_views` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addsite_views` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_custom_admin_views` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addcustom_admin_views` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_updates` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`version_update` TEXT NOT NULL,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_mysql_tweaks` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`sql_tweak` TEXT NOT NULL,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_custom_admin_menus` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addcustommenus` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_config` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addconfig` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_dashboard` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`dashboard_tab` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`php_dashboard_methods` MEDIUMTEXT NOT NULL,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_files_folders` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addfiles` TEXT NOT NULL,
-	`addfolders` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
diff --git a/admin/sql/updates/mysql/2.6.11.sql b/admin/sql/updates/mysql/2.6.11.sql
deleted file mode 100644
index dfb6b8dcc..000000000
--- a/admin/sql/updates/mysql/2.6.11.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_admin_view` ADD `php_import_headers` MEDIUMTEXT NOT NULL AFTER `php_import_ext`;
diff --git a/admin/sql/updates/mysql/2.6.12.sql b/admin/sql/updates/mysql/2.6.12.sql
deleted file mode 100644
index fdf479552..000000000
--- a/admin/sql/updates/mysql/2.6.12.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_dynamic_get` ADD `add_php_router_parse` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_getlistquery`;
-
-ALTER TABLE `#__componentbuilder_dynamic_get` ADD `php_router_parse` MEDIUMTEXT NOT NULL AFTER `php_getlistquery`;
diff --git a/admin/sql/updates/mysql/2.6.14.sql b/admin/sql/updates/mysql/2.6.14.sql
deleted file mode 100644
index d1651c795..000000000
--- a/admin/sql/updates/mysql/2.6.14.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-RENAME TABLE `#__componentbuilder_ftp` to `#__componentbuilder_server`;
-
-ALTER TABLE `#__componentbuilder_server` ADD `host` TEXT NOT NULL AFTER `asset_id`;
-ALTER TABLE `#__componentbuilder_server` ADD `authentication` TINYINT(1) NOT NULL DEFAULT 0 AFTER `asset_id`;
-ALTER TABLE `#__componentbuilder_server` ADD `password` TEXT NOT NULL AFTER `name`;
-ALTER TABLE `#__componentbuilder_server` ADD `path` TEXT NOT NULL AFTER `password`;
-ALTER TABLE `#__componentbuilder_server` ADD `port` TEXT NOT NULL AFTER `path`;
-ALTER TABLE `#__componentbuilder_server` ADD `private` TEXT NOT NULL AFTER `port`;
-ALTER TABLE `#__componentbuilder_server` ADD `protocol` TINYINT(1) NOT NULL DEFAULT 0 AFTER `private`;
-ALTER TABLE `#__componentbuilder_server` ADD `secret` TEXT NOT NULL AFTER `protocol`;
-ALTER TABLE `#__componentbuilder_server` ADD `username` TEXT NOT NULL AFTER `signature`;
-
-ALTER TABLE `#__componentbuilder_component_files_folders` ADD `addfilesfullpath` TEXT NOT NULL AFTER `addfiles`;
-ALTER TABLE `#__componentbuilder_component_files_folders` ADD `addfoldersfullpath` TEXT NOT NULL AFTER `addfolders`;
-ALTER TABLE `#__componentbuilder_library_files_folders_urls` ADD `addfilesfullpath` TEXT NOT NULL AFTER `addfiles`;
-ALTER TABLE `#__componentbuilder_library_files_folders_urls` ADD `addfoldersfullpath` TEXT NOT NULL AFTER `addfolders`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `update_server` `update_server_url` VARCHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `sales_server_ftp` `sales_server` INT(11) NOT NULL DEFAULT 0;
-ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `update_server_ftp` `update_server` INT(11) NOT NULL DEFAULT 0;
-
-UPDATE `#__componentbuilder_server` SET `protocol` = 1;
diff --git a/admin/sql/updates/mysql/2.6.16.sql b/admin/sql/updates/mysql/2.6.16.sql
deleted file mode 100644
index 898f836f1..000000000
--- a/admin/sql/updates/mysql/2.6.16.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_server` ADD `private_key` TEXT NOT NULL AFTER `private`;
diff --git a/admin/sql/updates/mysql/2.6.17.sql b/admin/sql/updates/mysql/2.6.17.sql
deleted file mode 100644
index 9fac5dc31..000000000
--- a/admin/sql/updates/mysql/2.6.17.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `dashboard` VARCHAR(64) NOT NULL DEFAULT '' AFTER `css_site`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `dashboard_type` TINYINT(1) NOT NULL DEFAULT 1 AFTER `dashboard`;
-
-UPDATE `#__componentbuilder_joomla_component` SET `dashboard_type`=1;
diff --git a/admin/sql/updates/mysql/2.6.3.sql b/admin/sql/updates/mysql/2.6.3.sql
deleted file mode 100644
index 21c8f8d38..000000000
--- a/admin/sql/updates/mysql/2.6.3.sql
+++ /dev/null
@@ -1,106 +0,0 @@
-ALTER TABLE `#__componentbuilder_snippet` ADD `library` INT(11) NOT NULL DEFAULT 0 AFTER `heading`;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet_type` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-INSERT INTO `#__componentbuilder_snippet_type` (`id`, `description`, `name`, `params`, `published`, `version`, `hits`, `access`, `ordering`) VALUES
-(1, '', 'Layout', '', 1, 1, 0, 1, 1),
-(2, '', 'Navigations', '', 1, 1, 0, 1, 2),
-(3, '', 'Elements', '', 1, 1, 0, 1, 3),
-(4, '', 'Common', '', 1, 1, 0, 1, 4),
-(5, '', 'JavaScript', '', 1,  1, 0, 1, 5),
-(6, '', 'Charts', '', 1, 1, 0, 1, 6),
-(7, '', 'Alerts', '', 1, 1, 0, 1, 7),
-(8, '', 'Badges', '', 1, 1, 0, 1, 8),
-(9, '', 'Breadcrumbs', '', 1, 1, 0, 1, 9),
-(10, '', 'Buttons', '', 1, 1, 0, 1, 10),
-(11, '', 'Button Groups', '', 1, 1, 0, 1, 11),
-(12, '', 'Button Modifiers', '', 1, 1, 0, 1, 12),
-(13, '', 'Cards', '', 1, 1, 0, 1, 13),
-(14, '', 'Carousel', '', 1, 1, 0, 1, 14),
-(15, '', 'Collapse', '', 1, 1, 0, 1, 15),
-(16, '', 'Dropdowns', '', 1, 1, 0, 1, 16),
-(17, '', 'Forms', '', 1, 1, 0, 1, 17),
-(18, '', 'Form Input Groups', '', 1, 1, 0, 1, 18),
-(19, '', 'Custom Forms', '', 1, 1, 0, 1, 19),
-(20, '', 'Grid', '', 1, 1, 0, 1, 20),
-(21, '', 'Images', '', 1, 1, 0, 1, 21),
-(22, '', 'Jumbotron', '', 1, 1, 0, 1, 22),
-(23, '', 'List Group', '', 1, 1, 0, 1, 23),
-(24, '', 'Media Objects', '', 1, 1, 0, 1, 24),
-(25, '', 'Modal', '', 1, 1, 0, 1, 25),
-(26, '', 'Navs', '', 1, 1, 0, 1, 26),
-(27, '', 'Navbar', '', 1, 1, 0, 1, 27),
-(28, '', 'Pagination', '', 1, 1, 0, 1, 28),
-(29, '', 'Popover', '', 1, 1, 0, 1, 29),
-(30, '', 'Progress', '', 1, 1, 0, 1, 30),
-(31, '', 'Scrollspy', '', 1, 1, 0, 1, 31),
-(32, '', 'Tables', '', 1, 1, 0, 1, 32),
-(33, '', 'Tooltips', '', 1, 1, 0, 1, 33),
-(34, '', 'Typography', '', 1, 1, 0, 1, 34),
-(35, '', 'Utility: Borders', '', 1, 1, 0, 1, 35),
-(36, '', 'Utility: Colors', '', 1, 1, 0, 1, 36),
-(37, '', 'Utility: Display', '', 1, 1, 0, 1, 37),
-(38, '', 'Utility: Flexbox', '', 1, 1, 0, 1, 38),
-(39, '', 'Utility: Misc', '', 1, 1, 0, 1, 39),
-(40, '', 'Utility: Positioning', '', 1, 1, 0, 1, 40),
-(41, '', 'Utility: Sizing', '', 1, 1, 0, 1, 41),
-(42, '', 'Utility: Spacing', '', 1, 1, 0, 1, 42),
-(43, '', 'Utility: Text', '', 1, 1, 0, 1, 43);
-
-INSERT INTO `#__componentbuilder_library` (`id`, `description`, `name`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
-(1, '', 'No Library', '', 1, '2017-11-11 22:08:33', '0000-00-00 00:00:00', 1, '', 1),
-(2, '', 'Bootstrap v4', '', 1, '2017-11-11 22:08:39', '0000-00-00 00:00:00', 1, '', 2),
-(3, '', 'Uikit v3', '', 1, '2017-11-11 22:08:45', '0000-00-00 00:00:00', 1, '', 3),
-(4, '', 'Uikit v2', '', 1, '2017-11-11 22:08:51', '0000-00-00 00:00:00', 1, '', 4),
-(5, '', 'FooTable', '', 1, '2017-11-11 22:08:57', '0000-00-00 00:00:00', 1, '', 5);
-
diff --git a/admin/sql/updates/mysql/2.6.4.sql b/admin/sql/updates/mysql/2.6.4.sql
deleted file mode 100644
index 4f8dcfd82..000000000
--- a/admin/sql/updates/mysql/2.6.4.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `#__componentbuilder_snippet` ADD `contributor_company` VARCHAR(255) NOT NULL DEFAULT '' AFTER `asset_id`;
-
-ALTER TABLE `#__componentbuilder_snippet` ADD `contributor_email` VARCHAR(255) NOT NULL DEFAULT '' AFTER `contributor_company`;
-
-ALTER TABLE `#__componentbuilder_snippet` ADD `contributor_name` VARCHAR(255) NOT NULL DEFAULT '' AFTER `contributor_email`;
-
-ALTER TABLE `#__componentbuilder_snippet` ADD `contributor_website` VARCHAR(255) NOT NULL DEFAULT '' AFTER `contributor_name`;
diff --git a/admin/sql/updates/mysql/2.6.5.sql b/admin/sql/updates/mysql/2.6.5.sql
deleted file mode 100644
index ceb18cc77..000000000
--- a/admin/sql/updates/mysql/2.6.5.sql
+++ /dev/null
@@ -1,113 +0,0 @@
-ALTER TABLE `#__componentbuilder_site_view` ADD `libraries` TEXT NOT NULL AFTER `js_document`;
-
-ALTER TABLE `#__componentbuilder_template` ADD `libraries` TEXT NOT NULL AFTER `dynamic_get`;
-
-ALTER TABLE `#__componentbuilder_layout` ADD `libraries` TEXT NOT NULL AFTER `layout`;
-
-ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `libraries` TEXT NOT NULL AFTER `js_document`;
-
-DROP TABLE IF EXISTS `#__componentbuilder_library`;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_config` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addconfig` TEXT NOT NULL,
-	`library` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_library` (`library`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_files_folders_urls` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addfiles` TEXT NOT NULL,
-	`addfolders` TEXT NOT NULL,
-	`addurls` TEXT NOT NULL,
-	`library` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_library` (`library`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addconditions` MEDIUMTEXT NOT NULL,
-	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`how` TINYINT(1) NOT NULL DEFAULT 1,
-	`libraries` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`not_required` INT(1) NOT NULL DEFAULT 0,
-	`php_setdocument` MEDIUMTEXT NOT NULL,
-	`type` TINYINT(1) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`),
-	KEY `idx_how` (`how`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-INSERT INTO `#__componentbuilder_library` (`id`, `addconditions`, `description`, `type`, `how`, `name`, `php_setdocument`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
-(1, '', '', 1, '', 'No Library', '', 1, '2017-11-11 22:08:33', '2017-12-08 15:51:34', 4, '', 1),
-(2, '', '', 1, 1, 'Bootstrap v4', '', 1, '2017-11-12 02:08:39', '2017-12-10 15:09:48', 14, '', 2),
-(3, '', '', 1, 1, 'Uikit v3', '', 1, '2017-11-11 22:08:45', '2017-12-10 15:55:35', 18, '', 3),
-(4, '', '', 1, 4, 'Uikit v2', '', 1, '2017-11-11 22:08:51', '2017-12-10 15:53:17', 5, '', 4),
-(5, '', '', 1, 4, 'FooTable v2', '', 1, '2017-11-11 22:08:57', '2017-12-11 20:07:32', 9, '', 5),
-(6, '', '', 1, 4, 'FooTable v3', '', 1, '2017-11-25 22:11:03', '2017-12-10 15:54:45', 12, '', 6);
-
-INSERT INTO `#__componentbuilder_library_files_folders_urls` (`id`, `addfiles`, `addfolders`, `addurls`, `library`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
-(2, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/js\\/bootstrap.min.js\",\"type\":\"1\"},\"addurls1\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/css\\/bootstrap.min.css\",\"type\":\"1\"}}', 2, '', 1, '2017-11-25 16:17:36', '2017-11-26 20:48:33', 6, '', 2),
-(3, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit.min.js\",\"type\":\"2\"},\"addurls1\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit-icons.min.js\",\"type\":\"2\"},\"addurls2\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/css\\/uikit.min.css\",\"type\":\"2\"}}', 3, '', 1, '2017-11-25 21:47:40', '2017-12-10 15:09:17', 7, '', 3);
-
-UPDATE `#__componentbuilder_site_view` SET `snippet` = 0;
-UPDATE `#__componentbuilder_template` SET `snippet` = 0;
-UPDATE `#__componentbuilder_layout` SET `snippet` = 0;
-UPDATE `#__componentbuilder_custom_admin_view` SET `snippet` = 0;
diff --git a/admin/sql/updates/mysql/2.6.6.sql b/admin/sql/updates/mysql/2.6.6.sql
deleted file mode 100644
index 5f3d1f695..000000000
--- a/admin/sql/updates/mysql/2.6.6.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_custom_button`;
-
-ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `javascript_file` TEXT NOT NULL AFTER `icon`;
-
-ALTER TABLE `#__componentbuilder_site_view` ADD `add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_custom_button`;
-
-ALTER TABLE `#__componentbuilder_site_view` ADD `javascript_file` TEXT NOT NULL AFTER `dynamic_get`;
diff --git a/admin/sql/updates/mysql/2.6.9.sql b/admin/sql/updates/mysql/2.6.9.sql
deleted file mode 100644
index fdc47b88f..000000000
--- a/admin/sql/updates/mysql/2.6.9.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_js_document`;
-
-ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `ajax_input` TEXT NOT NULL AFTER `add_php_view`;
-
-ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `php_ajaxmethod` MEDIUMTEXT NOT NULL AFTER `not_required`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `css` `css_admin` TEXT NOT NULL;
-
-ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `add_css` `add_css_admin` TINYINT(1) NOT NULL DEFAULT 0 ;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_css_site` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_css_admin`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `css_site` TEXT NOT NULL AFTER `css_admin`;
diff --git a/admin/sql/updates/mysql/2.7.0.sql b/admin/sql/updates/mysql/2.7.0.sql
deleted file mode 100644
index 3be24671a..000000000
--- a/admin/sql/updates/mysql/2.7.0.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_validation_rule` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`inherit` CHAR NOT NULL DEFAULT '',
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`php` MEDIUMTEXT NOT NULL,
-	`short_description` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
-ALTER TABLE `#__componentbuilder_admin_view` ADD `alias_builder` VARCHAR(255) NOT NULL DEFAULT '' AFTER `ajax_input`;
-
-ALTER TABLE `#__componentbuilder_admin_view` ADD `alias_builder_type` CHAR NOT NULL DEFAULT '' AFTER `alias_builder`;
diff --git a/admin/sql/updates/mysql/2.7.10.sql b/admin/sql/updates/mysql/2.7.10.sql
deleted file mode 100644
index 2976ef642..000000000
--- a/admin/sql/updates/mysql/2.7.10.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields_relations` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addrelations` MEDIUMTEXT NOT NULL,
-	`admin_view` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_admin_view` (`admin_view`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
diff --git a/admin/sql/updates/mysql/2.7.5.sql b/admin/sql/updates/mysql/2.7.5.sql
deleted file mode 100644
index 3cbacc703..000000000
--- a/admin/sql/updates/mysql/2.7.5.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_language_translation` CHANGE `entranslation` `source` TEXT NOT NULL;
diff --git a/admin/sql/updates/mysql/2.7.8.sql b/admin/sql/updates/mysql/2.7.8.sql
deleted file mode 100644
index 43690a92e..000000000
--- a/admin/sql/updates/mysql/2.7.8.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `export_package_link` `joomla_source_link` VARCHAR(255) NOT NULL DEFAULT '';
diff --git a/admin/sql/updates/mysql/2.7.9.sql b/admin/sql/updates/mysql/2.7.9.sql
deleted file mode 100644
index 2c891d3a3..000000000
--- a/admin/sql/updates/mysql/2.7.9.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_sql_uninstall` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_sql`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `sql_uninstall` MEDIUMTEXT NOT NULL AFTER `sql`;
diff --git a/admin/sql/updates/mysql/2.8.1.sql b/admin/sql/updates/mysql/2.8.1.sql
deleted file mode 100644
index d1b6c7bc5..000000000
--- a/admin/sql/updates/mysql/2.8.1.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_getform` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_document`;
-ALTER TABLE `#__componentbuilder_admin_view` ADD `php_getform` MEDIUMTEXT NOT NULL AFTER `php_document`;
diff --git a/admin/sql/updates/mysql/2.8.2.sql b/admin/sql/updates/mysql/2.8.2.sql
deleted file mode 100644
index 1c359339e..000000000
--- a/admin/sql/updates/mysql/2.8.2.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `whmcs_buy_link` VARCHAR(255) NOT NULL DEFAULT '' AFTER `website`;
diff --git a/admin/sql/updates/mysql/2.8.5.sql b/admin/sql/updates/mysql/2.8.5.sql
deleted file mode 100644
index b93636075..000000000
--- a/admin/sql/updates/mysql/2.8.5.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_allowadd` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_ajax`;
-
-ALTER TABLE `#__componentbuilder_admin_view` ADD `php_allowadd` MEDIUMTEXT NOT NULL AFTER `php_ajaxmethod`;
diff --git a/admin/sql/updates/mysql/2.8.6.sql b/admin/sql/updates/mysql/2.8.6.sql
deleted file mode 100644
index 6f5b4780b..000000000
--- a/admin/sql/updates/mysql/2.8.6.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_dynamic_get` ADD `plugin_events` VARCHAR(255) NOT NULL DEFAULT '' AFTER `php_router_parse`;
diff --git a/admin/sql/updates/mysql/2.8.7.sql b/admin/sql/updates/mysql/2.8.7.sql
deleted file mode 100644
index 35a5f0f7f..000000000
--- a/admin/sql/updates/mysql/2.8.7.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_site_view` ADD `context` VARCHAR(255) NOT NULL DEFAULT '' AFTER `codename`;
diff --git a/admin/sql/updates/mysql/2.8.8.sql b/admin/sql/updates/mysql/2.8.8.sql
deleted file mode 100644
index 58d97bfb3..000000000
--- a/admin/sql/updates/mysql/2.8.8.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `context` VARCHAR(255) NOT NULL DEFAULT '' AFTER `codename`;
diff --git a/admin/sql/updates/mysql/2.8.9.sql b/admin/sql/updates/mysql/2.8.9.sql
deleted file mode 100644
index 158f5e8c3..000000000
--- a/admin/sql/updates/mysql/2.8.9.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_custom_tabs` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`admin_view` INT(11) NOT NULL DEFAULT 0,
-	`tabs` TEXT NOT NULL,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_admin_view` (`admin_view`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
diff --git a/admin/sql/updates/mysql/2.9.1.sql b/admin/sql/updates/mysql/2.9.1.sql
deleted file mode 100644
index 7301144f7..000000000
--- a/admin/sql/updates/mysql/2.9.1.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_menu_prefix` CHAR(1) NOT NULL DEFAULT '' AFTER `add_license`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `menu_prefix` VARCHAR(100) NOT NULL DEFAULT '' AFTER `license_type`;
diff --git a/admin/sql/updates/mysql/2.9.11.sql b/admin/sql/updates/mysql/2.9.11.sql
deleted file mode 100644
index f0e595dba..000000000
--- a/admin/sql/updates/mysql/2.9.11.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_placeholders` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addplaceholders` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/2.9.12.sql b/admin/sql/updates/mysql/2.9.12.sql
deleted file mode 100644
index a8469ba78..000000000
--- a/admin/sql/updates/mysql/2.9.12.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_placeholder` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`target` VARCHAR(255) NOT NULL DEFAULT '',
-	`value` TEXT NOT NULL,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_target` (`target`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/2.9.14.sql b/admin/sql/updates/mysql/2.9.14.sql
deleted file mode 100644
index 81a86cca2..000000000
--- a/admin/sql/updates/mysql/2.9.14.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_dynamic_get` ADD `group` TEXT NOT NULL AFTER `global`;
diff --git a/admin/sql/updates/mysql/2.9.15.sql b/admin/sql/updates/mysql/2.9.15.sql
deleted file mode 100644
index f94a869fe..000000000
--- a/admin/sql/updates/mysql/2.9.15.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-ALTER TABLE `#__componentbuilder_fieldtype` ADD `datadefault` CHAR(64) NOT NULL DEFAULT '' AFTER `catid`;
-ALTER TABLE `#__componentbuilder_fieldtype` ADD `datadefault_other` CHAR(64) NOT NULL DEFAULT '' AFTER `datadefault`;
-ALTER TABLE `#__componentbuilder_fieldtype` ADD `datalenght` CHAR(64) NOT NULL DEFAULT '' AFTER `datadefault_other`;
-ALTER TABLE `#__componentbuilder_fieldtype` ADD `datalenght_other` CHAR(64) NOT NULL DEFAULT '' AFTER `datalenght`;
-ALTER TABLE `#__componentbuilder_fieldtype` ADD `datatype` CHAR(64) NOT NULL DEFAULT '' AFTER `datalenght_other`;
-ALTER TABLE `#__componentbuilder_fieldtype` ADD `has_defaults` TINYINT(1) NOT NULL DEFAULT 0 AFTER `description`;
-ALTER TABLE `#__componentbuilder_fieldtype` ADD `indexes` CHAR(64) NOT NULL DEFAULT '' AFTER `has_defaults`;
-ALTER TABLE `#__componentbuilder_fieldtype` ADD `null_switch` CHAR(64) NOT NULL DEFAULT '' AFTER `indexes`;
-ALTER TABLE `#__componentbuilder_fieldtype` ADD `store` INT(11) NOT NULL DEFAULT 0 AFTER `short_description`;
diff --git a/admin/sql/updates/mysql/2.9.16.sql b/admin/sql/updates/mysql/2.9.16.sql
deleted file mode 100644
index 6308f6dbe..000000000
--- a/admin/sql/updates/mysql/2.9.16.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `crowdin_account_api_key` TEXT NOT NULL AFTER `creatuserhelper`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `crowdin_project_api_key` TEXT NOT NULL AFTER `crowdin_account_api_key`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `crowdin_project_identifier` VARCHAR(255) NOT NULL DEFAULT '' AFTER `crowdin_project_api_key`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `crowdin_username` TEXT NOT NULL AFTER `crowdin_project_identifier`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `translation_tool` TINYINT(1) NOT NULL DEFAULT 0 AFTER `toignore`;
diff --git a/admin/sql/updates/mysql/2.9.18.sql b/admin/sql/updates/mysql/2.9.18.sql
deleted file mode 100644
index f0588cd2b..000000000
--- a/admin/sql/updates/mysql/2.9.18.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_before_cancel` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_batchmove`;
-
-ALTER TABLE `#__componentbuilder_admin_view` ADD `php_before_cancel` MEDIUMTEXT NOT NULL AFTER `php_batchmove`;
diff --git a/admin/sql/updates/mysql/2.9.19.sql b/admin/sql/updates/mysql/2.9.19.sql
deleted file mode 100644
index 1b5efe835..000000000
--- a/admin/sql/updates/mysql/2.9.19.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_after_cancel` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_javascript_views_footer`;
-
-ALTER TABLE `#__componentbuilder_admin_view` ADD `php_after_cancel` MEDIUMTEXT NOT NULL AFTER `name_single`;
diff --git a/admin/sql/updates/mysql/2.9.21.sql b/admin/sql/updates/mysql/2.9.21.sql
deleted file mode 100644
index 9200ce425..000000000
--- a/admin/sql/updates/mysql/2.9.21.sql
+++ /dev/null
@@ -1,59 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`class_extends` INT(11) NOT NULL DEFAULT 0,
-	`fields` TEXT NOT NULL,
-	`joomla_plugin_group` INT(11) NOT NULL DEFAULT 0,
-	`main_class_code` MEDIUMTEXT NOT NULL,
-	`method_selection` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`property_selection` TEXT NOT NULL,
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`),
-	KEY `idx_class_extends` (`class_extends`),
-	KEY `idx_joomla_plugin_group` (`joomla_plugin_group`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_group` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`class_extends` INT(11) NOT NULL DEFAULT 0,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`),
-	KEY `idx_class_extends` (`class_extends`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/admin/sql/updates/mysql/2.9.31.sql b/admin/sql/updates/mysql/2.9.31.sql
deleted file mode 100644
index c7e02058f..000000000
--- a/admin/sql/updates/mysql/2.9.31.sql
+++ /dev/null
@@ -1,92 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_property` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`comment` TEXT NOT NULL,
-	`default` VARCHAR(255) NOT NULL DEFAULT '',
-	`extension_type` VARCHAR(64) NOT NULL DEFAULT '',
-	`joomla_plugin_group` INT(11) NOT NULL DEFAULT 0,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`visibility` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`),
-	KEY `idx_visibility` (`visibility`),
-	KEY `idx_joomla_plugin_group` (`joomla_plugin_group`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_method` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`arguments` TEXT NOT NULL,
-	`code` MEDIUMTEXT NOT NULL,
-	`comment` TEXT NOT NULL,
-	`extension_type` VARCHAR(64) NOT NULL DEFAULT '',
-	`joomla_plugin_group` INT(11) NOT NULL DEFAULT 0,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`visibility` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`),
-	KEY `idx_visibility` (`visibility`),
-	KEY `idx_joomla_plugin_group` (`joomla_plugin_group`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_extends` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`comment` TEXT NOT NULL,
-	`extension_type` VARCHAR(64) NOT NULL DEFAULT '',
-	`head` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/admin/sql/updates/mysql/2.9.32.sql b/admin/sql/updates/mysql/2.9.32.sql
deleted file mode 100644
index de2cda4cc..000000000
--- a/admin/sql/updates/mysql/2.9.32.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_plugins` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addjoomla_plugins` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_component` (`joomla_component`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/2.9.33.sql b/admin/sql/updates/mysql/2.9.33.sql
deleted file mode 100644
index 31fc10911..000000000
--- a/admin/sql/updates/mysql/2.9.33.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_head` TINYINT(1) NOT NULL DEFAULT 0 AFTER `asset_id`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `head` TEXT NOT NULL AFTER `fields`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `system_name` VARCHAR(255) NOT NULL DEFAULT '' AFTER `property_selection`;
diff --git a/admin/sql/updates/mysql/2.9.34.sql b/admin/sql/updates/mysql/2.9.34.sql
deleted file mode 100644
index 36f4ed148..000000000
--- a/admin/sql/updates/mysql/2.9.34.sql
+++ /dev/null
@@ -1,77 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_php_method_uninstall` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_head`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_php_postflight_install` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_method_uninstall`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_php_postflight_update` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_postflight_install`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_php_preflight_install` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_postflight_update`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_php_preflight_uninstall` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_preflight_install`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_php_preflight_update` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_preflight_uninstall`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_sales_server` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_preflight_update`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_sql` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_sales_server`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_sql_uninstall` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_sql`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_update_server` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_sql_uninstall`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `addreadme` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_update_server`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `php_method_uninstall` MEDIUMTEXT NOT NULL AFTER `name`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `php_postflight_install` MEDIUMTEXT NOT NULL AFTER `php_method_uninstall`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `php_postflight_update` MEDIUMTEXT NOT NULL AFTER `php_postflight_install`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `php_preflight_install` MEDIUMTEXT NOT NULL AFTER `php_postflight_update`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `php_preflight_uninstall` MEDIUMTEXT NOT NULL AFTER `php_preflight_install`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `php_preflight_update` MEDIUMTEXT NOT NULL AFTER `php_preflight_uninstall`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `readme` TEXT NOT NULL AFTER `property_selection`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `sales_server` INT(11) NOT NULL DEFAULT 0 AFTER `readme`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `sql` MEDIUMTEXT NOT NULL AFTER `sales_server`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `sql_uninstall` MEDIUMTEXT NOT NULL AFTER `sql`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `update_server` INT(11) NOT NULL DEFAULT 0 AFTER `system_name`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `update_server_target` TINYINT(1) NOT NULL DEFAULT 0 AFTER `update_server`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `update_server_url` VARCHAR(255) NOT NULL DEFAULT '' AFTER `update_server_target`;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_files_folders_urls` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addfiles` TEXT NOT NULL,
-	`addfilesfullpath` TEXT NOT NULL,
-	`addfolders` TEXT NOT NULL,
-	`addfoldersfullpath` TEXT NOT NULL,
-	`addurls` TEXT NOT NULL,
-	`joomla_plugin` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_plugin` (`joomla_plugin`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/2.9.35.sql b/admin/sql/updates/mysql/2.9.35.sql
deleted file mode 100644
index 40bf3bda6..000000000
--- a/admin/sql/updates/mysql/2.9.35.sql
+++ /dev/null
@@ -1,33 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_php_script_construct` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_preflight_update`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `description` TEXT NOT NULL AFTER `class_extends`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `php_script_construct` MEDIUMTEXT NOT NULL AFTER `php_preflight_update`;
-
-ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `plugin_version` CHAR(64) NOT NULL DEFAULT '' AFTER `php_script_construct`;
-
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_updates` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`joomla_plugin` INT(11) NOT NULL DEFAULT 0,
-	`version_update` TEXT NOT NULL,
-	`params` text NOT NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_joomla_plugin` (`joomla_plugin`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/2.9.4.sql b/admin/sql/updates/mysql/2.9.4.sql
deleted file mode 100644
index b062a26c3..000000000
--- a/admin/sql/updates/mysql/2.9.4.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `#__componentbuilder_admin_view` ADD `mysql_table_charset` VARCHAR(64) NOT NULL DEFAULT 1 AFTER `javascript_views_footer`;
-
-ALTER TABLE `#__componentbuilder_admin_view` ADD `mysql_table_collate` VARCHAR(64) NOT NULL DEFAULT 1 AFTER `mysql_table_charset`;
-
-ALTER TABLE `#__componentbuilder_admin_view` ADD `mysql_table_engine` VARCHAR(64) NOT NULL DEFAULT 1 AFTER `mysql_table_collate`;
diff --git a/admin/sql/updates/mysql/2.9.8.sql b/admin/sql/updates/mysql/2.9.8.sql
deleted file mode 100644
index 4b568408f..000000000
--- a/admin/sql/updates/mysql/2.9.8.sql
+++ /dev/null
@@ -1,37 +0,0 @@
-ALTER TABLE `#__componentbuilder_language_translation` CHANGE `source` `source` MEDIUMTEXT NOT NULL;
-
-ALTER TABLE `#__componentbuilder_admin_view` ADD `mysql_table_row_format` VARCHAR(64) NOT NULL DEFAULT 0 AFTER `mysql_table_engine`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_admin_view` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_custom_admin_view` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_site_view` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_template` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_layout` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_dynamic_get` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_custom_code` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_library` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_snippet` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_validation_rule` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_field` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_fieldtype` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_language_translation` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_language` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_server` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_help_document` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_admin_fields` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_admin_fields_conditions` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_admin_fields_relations` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_admin_custom_tabs` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_component_admin_views` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_component_site_views` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_component_custom_admin_views` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_component_updates` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_component_mysql_tweaks` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_component_custom_admin_menus` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_component_config` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_component_dashboard` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_component_files_folders` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_snippet_type` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_library_config` ROW_FORMAT=DYNAMIC;
-ALTER TABLE `#__componentbuilder_library_files_folders_urls` ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/2.9.9.sql b/admin/sql/updates/mysql/2.9.9.sql
deleted file mode 100644
index bad0916ca..000000000
--- a/admin/sql/updates/mysql/2.9.9.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_dynamic_get` ADD `select_all` TINYINT(1) NOT NULL DEFAULT 0 AFTER `addcalculation`;
diff --git a/admin/sql/updates/mysql/3.0.0.sql b/admin/sql/updates/mysql/3.0.0.sql
deleted file mode 100644
index 98ab2ab5a..000000000
--- a/admin/sql/updates/mysql/3.0.0.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_power` ADD `load_selection` TEXT NOT NULL AFTER `implements_custom`;
diff --git a/admin/sql/updates/mysql/3.0.10.sql b/admin/sql/updates/mysql/3.0.10.sql
deleted file mode 100644
index 6e6988aa1..000000000
--- a/admin/sql/updates/mysql/3.0.10.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `#__componentbuilder_power` CHANGE `extends` `extends` VARCHAR(36) NOT NULL DEFAULT '';
-ALTER TABLE `#__componentbuilder_power` CHANGE `implements` `implements` TEXT NULL;
diff --git a/admin/sql/updates/mysql/3.0.9.sql b/admin/sql/updates/mysql/3.0.9.sql
deleted file mode 100644
index d8c537d5c..000000000
--- a/admin/sql/updates/mysql/3.0.9.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_powers` TINYINT(1) NOT NULL DEFAULT 1 AFTER `add_placeholders`;
diff --git a/admin/sql/updates/mysql/3.1.12.sql b/admin/sql/updates/mysql/3.1.12.sql
deleted file mode 100644
index c8e27449a..000000000
--- a/admin/sql/updates/mysql/3.1.12.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_power` ADD `composer` TEXT NOT NULL AFTER `add_licensing_template`;
diff --git a/admin/sql/updates/mysql/3.1.21.sql b/admin/sql/updates/mysql/3.1.21.sql
deleted file mode 100644
index c7d0397e8..000000000
--- a/admin/sql/updates/mysql/3.1.21.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `#__componentbuilder_power` ADD `approved` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_licensing_template`;
-ALTER TABLE `#__componentbuilder_power` ADD `approved_paths` TEXT NOT NULL AFTER `approved`;
diff --git a/admin/sql/updates/mysql/3.1.27.sql b/admin/sql/updates/mysql/3.1.27.sql
deleted file mode 100644
index 3edcba651..000000000
--- a/admin/sql/updates/mysql/3.1.27.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_backup_folder_path` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_admin_event`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_git_folder_path` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_email_helper`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `backup_folder_path` VARCHAR(255) NOT NULL DEFAULT '' AFTER `author`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `git_folder_path` VARCHAR(255) NOT NULL DEFAULT '' AFTER `export_key`;
diff --git a/admin/sql/updates/mysql/3.1.29.sql b/admin/sql/updates/mysql/3.1.29.sql
deleted file mode 100644
index 11f0419aa..000000000
--- a/admin/sql/updates/mysql/3.1.29.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_namespace_prefix` CHAR(1) NOT NULL DEFAULT '' AFTER `add_menu_prefix`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `namespace_prefix` VARCHAR(255) NOT NULL DEFAULT '' AFTER `name_code`;
diff --git a/admin/sql/updates/mysql/3.1.30.sql b/admin/sql/updates/mysql/3.1.30.sql
deleted file mode 100644
index 834be685a..000000000
--- a/admin/sql/updates/mysql/3.1.30.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__componentbuilder_custom_code` ADD `joomla_version` INT(11) NOT NULL DEFAULT 3 AFTER `hashtarget`;
diff --git a/admin/sql/updates/mysql/3.1.32.sql b/admin/sql/updates/mysql/3.1.32.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.1.32.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.1.33.sql b/admin/sql/updates/mysql/3.1.33.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.1.33.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.1.34.sql b/admin/sql/updates/mysql/3.1.34.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.1.34.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.1.35.sql b/admin/sql/updates/mysql/3.1.35.sql
deleted file mode 100644
index 798a7f4b9..000000000
--- a/admin/sql/updates/mysql/3.1.35.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_router` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`constructor_after_parent_code` MEDIUMTEXT NOT NULL,
-	`constructor_before_parent_code` MEDIUMTEXT NOT NULL,
-	`constructor_before_parent_manual` TEXT NOT NULL,
-	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`methods_code` MEDIUMTEXT NOT NULL,
-	`mode_constructor_after_parent` TINYINT(1) NOT NULL DEFAULT 0,
-	`mode_constructor_before_parent` TINYINT(1) NOT NULL DEFAULT 0,
-	`mode_methods` TINYINT(1) NOT NULL DEFAULT 0,
-	`params` text NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_joomla_component` (`joomla_component`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/3.1.36.sql b/admin/sql/updates/mysql/3.1.36.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.1.36.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.1.37.sql b/admin/sql/updates/mysql/3.1.37.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.1.37.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.1.38.sql b/admin/sql/updates/mysql/3.1.38.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.1.38.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.1.39.sql b/admin/sql/updates/mysql/3.1.39.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.1.39.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.1.40.sql b/admin/sql/updates/mysql/3.1.40.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.1.40.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.1.42.sql b/admin/sql/updates/mysql/3.1.42.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.1.42.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.1.5.sql b/admin/sql/updates/mysql/3.1.5.sql
deleted file mode 100644
index 951fcc604..000000000
--- a/admin/sql/updates/mysql/3.1.5.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `#__componentbuilder_power` ADD `add_licensing_template` TINYINT(1) NOT NULL DEFAULT 1 AFTER `add_head`;
-ALTER TABLE `#__componentbuilder_power` ADD `licensing_template` TEXT NOT NULL AFTER `implements_custom`;
diff --git a/admin/sql/updates/mysql/3.2.0-beta.sql b/admin/sql/updates/mysql/3.2.0-beta.sql
index 376a853c3..8b1378917 100644
--- a/admin/sql/updates/mysql/3.2.0-beta.sql
+++ b/admin/sql/updates/mysql/3.2.0-beta.sql
@@ -1 +1 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `preferred_joomla_version` INT(11) NOT NULL DEFAULT 3 AFTER `php_site_event`;
+
diff --git a/admin/sql/updates/mysql/3.2.0.sql b/admin/sql/updates/mysql/3.2.0.sql
index f98f6aec0..8b1378917 100644
--- a/admin/sql/updates/mysql/3.2.0.sql
+++ b/admin/sql/updates/mysql/3.2.0.sql
@@ -1,3 +1 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_jcb_powers_path` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_javascript`;
-
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `jcb_powers_path` VARCHAR(255) NOT NULL DEFAULT '' AFTER `javascript`;
+
diff --git a/admin/sql/updates/mysql/3.1.25.sql b/admin/sql/updates/mysql/3.2.1-alpha.sql
similarity index 100%
rename from admin/sql/updates/mysql/3.1.25.sql
rename to admin/sql/updates/mysql/3.2.1-alpha.sql
diff --git a/admin/sql/updates/mysql/3.2.1-alpha1.sql b/admin/sql/updates/mysql/3.2.1-alpha1.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.2.1-alpha1.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.2.1-alpha2.sql b/admin/sql/updates/mysql/3.2.1-alpha2.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.2.1-alpha2.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/sql/updates/mysql/3.2.1-alpha3.sql b/admin/sql/updates/mysql/3.2.1-alpha3.sql
deleted file mode 100644
index d525a44ab..000000000
--- a/admin/sql/updates/mysql/3.2.1-alpha3.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_power` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`description` TEXT NULL,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
-	`settings` TEXT NOT NULL,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NULL,
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME DEFAULT CURRENT_TIMESTAMP,
-	`modified` DATETIME DEFAULT NULL,
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME DEFAULT NULL,
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_system_name` (`system_name`),
-	KEY `idx_guid` (`guid`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/admin/sql/updates/mysql/3.2.1-alpha4.sql b/admin/sql/updates/mysql/3.2.1-alpha4.sql
deleted file mode 100644
index 902532589..000000000
--- a/admin/sql/updates/mysql/3.2.1-alpha4.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_php_method_install` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_helper_site`;
-ALTER TABLE `#__componentbuilder_joomla_component` ADD `php_method_install` MEDIUMTEXT NOT NULL AFTER `php_helper_site`;
diff --git a/admin/sql/updates/mysql/3.1.31.sql b/admin/sql/updates/mysql/3.2.1-beta.sql
similarity index 100%
rename from admin/sql/updates/mysql/3.1.31.sql
rename to admin/sql/updates/mysql/3.2.1-beta.sql
diff --git a/admin/sql/updates/mysql/3.2.1-beta1.sql b/admin/sql/updates/mysql/3.2.1-beta1.sql
deleted file mode 100644
index 5bcf8654f..000000000
--- a/admin/sql/updates/mysql/3.2.1-beta1.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-UPDATE `#__componentbuilder_admin_view`
-SET `alias_builder_type` = 0
-WHERE `alias_builder_type` = '';
-
-UPDATE `#__componentbuilder_dynamic_get`
-SET `addcalculation` = 0
-WHERE `addcalculation` = '';
-
-ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `image` `image` VARCHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `#__componentbuilder_admin_view` CHANGE `alias_builder_type` `alias_builder_type` TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE `#__componentbuilder_admin_view` CHANGE `icon` `icon` VARCHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `#__componentbuilder_admin_view` CHANGE `icon_add` `icon_add` VARCHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `#__componentbuilder_admin_view` CHANGE `icon_category` `icon_category` VARCHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `#__componentbuilder_custom_admin_view` CHANGE `icon` `icon` VARCHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `#__componentbuilder_dynamic_get` CHANGE `addcalculation` `addcalculation` TINYINT(1) NOT NULL DEFAULT 0;
diff --git a/admin/sql/updates/mysql/3.2.1-beta2.sql b/admin/sql/updates/mysql/3.2.1-beta2.sql
deleted file mode 100644
index 9c9830468..000000000
--- a/admin/sql/updates/mysql/3.2.1-beta2.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `#__componentbuilder_component_updates` CHANGE `version_update` `version_update` MEDIUMTEXT NOT NULL;
-ALTER TABLE `#__componentbuilder_joomla_module_updates` CHANGE `version_update` `version_update` MEDIUMTEXT NOT NULL;
-ALTER TABLE `#__componentbuilder_joomla_plugin_updates` CHANGE `version_update` `version_update` MEDIUMTEXT NOT NULL;
diff --git a/admin/sql/updates/mysql/3.2.1-beta3.sql b/admin/sql/updates/mysql/3.2.1-beta3.sql
deleted file mode 100644
index 8b1378917..000000000
--- a/admin/sql/updates/mysql/3.2.1-beta3.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/admin/views/server/tmpl/edit.php b/admin/views/server/tmpl/edit.php
index 3002c59f5..b35565308 100644
--- a/admin/views/server/tmpl/edit.php
+++ b/admin/views/server/tmpl/edit.php
@@ -63,18 +63,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		</div>
 	<?php echo Html::_('bootstrap.endTab'); ?>
 
-	<?php if ($this->canDo->get('joomla_component.access')) : ?>
-	<?php echo Html::_('bootstrap.addTab', 'serverTab', 'linked_components', Text::_('COM_COMPONENTBUILDER_SERVER_LINKED_COMPONENTS', true)); ?>
-		<div class="row-fluid form-horizontal-desktop">
-		</div>
-		<div class="row-fluid form-horizontal-desktop">
-			<div class="span12">
-				<?php echo LayoutHelper::render('server.linked_components_fullwidth', $this); ?>
-			</div>
-		</div>
-	<?php echo Html::_('bootstrap.endTab'); ?>
-	<?php endif; ?>
-
 	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
 	<?php $this->tab_name = 'serverTab'; ?>
 	<?php echo LayoutHelper::render('joomla.edit.params', $this); ?>
diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php
index d6cba8c5a..778db94d7 100644
--- a/admin/views/server/view.html.php
+++ b/admin/views/server/view.html.php
@@ -70,9 +70,6 @@ class ComponentbuilderViewServer extends HtmlView
 			$this->referral .= '&return=' . (string)$return;
 		}
 
-		// Get Linked view data
-		$this->vydlinked_components = $this->get('Vydlinked_components');
-
 		// Set the toolbar
 		$this->addToolBar();
 
@@ -201,16 +198,6 @@ class ComponentbuilderViewServer extends HtmlView
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_SERVER_NEW' : 'COM_COMPONENTBUILDER_SERVER_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/server.css", ['version' => 'auto']);
-
-		// Add the CSS for Footable
-		Html::_('stylesheet', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css', ['version' => 'auto']);
-		Html::_('stylesheet', 'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']);
-		// Add the JavaScript for Footable (adding all functions)
-		Html::_('script', 'media/com_componentbuilder/footable-v3/js/footable.min.js', ['version' => 'auto']);
-
-		$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});";
-		$this->getDocument()->addScriptDeclaration($footable);
-
 		Html::_('script', $this->script, ['version' => 'auto']);
 		Html::_('script', "administrator/components/com_componentbuilder/views/server/submitbutton.js", ['version' => 'auto']);
 		Text::script('view not acceptable. Error');
diff --git a/componentbuilder.xml b/componentbuilder.xml
index f0f6f1c86..27df935ec 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.10" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>27th April, 2024</creationDate>
+	<creationDate>30th April, 2024</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>3.2.1-rc1</version>
+	<version>3.2.1-rc2</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.3.2.1-rc1)</h1>
+		<h1>Component Builder (v.3.2.1-rc2)</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.
 
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index fe882c8d7..177813f40 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -1,242 +1,4 @@
 <updates>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.5.1</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.1/JCB_v2.5.1.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.5.2</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.4/JCB_v2.5.4.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.5.3</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.4/JCB_v2.5.4.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.5.5</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.5/JCB_v2.5.5.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.5.6</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.6/JCB_v2.5.6.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.5.7</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.8/JCB_v2.5.8.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.5.8</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.8/JCB_v2.5.8.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.6.3</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.3/JCB_v2.6.3.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.6.4</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.5/JCB_v2.6.5.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.6.5</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.5/JCB_v2.6.5.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.6.6</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.6/JCB_v2.6.6.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.6.9</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.9/JCB_v2.6.9.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.6.11</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.11/JCB_v2.6.11.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.6.12</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.12/JCB_v2.6.12.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
 	<update>
 		<name>Component Builder</name>
 		<description>Builds Complex Joomla Components</description>
@@ -254,915 +16,6 @@
 		<maintainerurl>https://dev.vdm.io</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.6.14</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.14/JCB_v2.6.14.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.6.16</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.16/JCB_v2.6.16.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.6.17</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.17/JCB_v2.6.17.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.7.0</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.7.0/JCB_v2.7.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.7.5</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.7.5/JCB_v2.7.5.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.7.8</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.7.8/JCB_v2.7.8.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.7.9</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.7.9/JCB_v2.7.9.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.7.10</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.7.10/JCB_v2.7.10.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.8.1</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.2/JCB_v2.8.2.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.8.2</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.2/JCB_v2.8.2.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.8.5</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.5/JCB_v2.8.5.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.8.6</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.0/JCB_v2.9.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.8.7</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.0/JCB_v2.9.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.8.8</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.0/JCB_v2.9.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.8.9</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.0/JCB_v2.9.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.1</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.1/JCB_v2.9.1.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.4</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.7/JCB_v2.9.7.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.8</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.8/JCB_v2.9.8.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.9</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.10/JCB_v2.9.10.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.11</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.11/JCB_v2.9.11.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.12</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.12/JCB_v2.9.12.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.14</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.14/JCB_v2.9.14.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.15</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.18/JCB_v2.9.18.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.16</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.18/JCB_v2.9.18.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.18</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.18/JCB_v2.9.18.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.19</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.21/JCB_v2.9.21.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.21</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.21/JCB_v2.9.21.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.31</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.0/JCB_v2.10.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.32</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.0/JCB_v2.10.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.33</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.0/JCB_v2.10.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.34</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.0/JCB_v2.10.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.9.35</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.0/JCB_v2.10.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.10.1</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.1/JCB_v2.10.1.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.10.2</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.4/JCB_v2.10.4.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.10.5</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.5/JCB_v2.10.5.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.10.6</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.9/JCB_v2.10.9.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.10.7</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.9/JCB_v2.10.9.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.10.9</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.9/JCB_v2.10.9.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.10.10</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.11/JCB_v2.10.11.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.10.11</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.11/JCB_v2.10.11.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.10.12</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.13/JCB_v2.10.13.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.11.4</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.11.4/JCB_v2.11.4.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.11.5</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.11.7/JCB_v2.11.7.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.12.1</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.4/JCB_v2.12.4.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>com_componentbuilder</element>
-		<type>component</type>
-		<version>2.12.4</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.4/JCB_v2.12.4.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>2.12.10</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/v2.12.10.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>2.12.16</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/v2.12.16.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>2.13.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/v2.13.1.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.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/v3.1.5.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.0.9</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.1.5.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.0.10</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.1.5.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.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.1.5.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.12</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.1.12.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
 	<update>
 		<name>Component Builder</name>
 		<description>Builds Complex Joomla Components</description>
@@ -1181,24 +34,6 @@
 		<maintainerurl>https://dev.vdm.io</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.21</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla-beta/pkg-component-builder/archive/v3.1.22.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
 	<update>
 		<name>Component Builder</name>
 		<description>Builds Complex Joomla Components</description>
@@ -1217,24 +52,6 @@
 		<maintainerurl>https://dev.vdm.io</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.25</version>
-		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
-		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla-beta/pkg-component-builder/archive/v3.1.25.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
 	<update>
 		<name>Component Builder</name>
 		<description>Builds Complex Joomla Components</description>
@@ -1253,24 +70,6 @@
 		<maintainerurl>https://dev.vdm.io</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.27</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.1.27.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>stable</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
 	<update>
 		<name>Component Builder</name>
 		<description>Builds Complex Joomla Components</description>
@@ -1289,240 +88,6 @@
 		<maintainerurl>https://dev.vdm.io</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.29</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.30</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.31</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.32</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.33</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.34</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.35</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.36</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.37</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.38</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.39</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.40</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.1.42</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.0.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
 	<update>
 		<name>Component Builder</name>
 		<description>Builds Complex Joomla Components</description>
@@ -1559,67 +124,13 @@
 		<maintainerurl>https://dev.vdm.io</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>component</type>
-		<client>site</client>
-		<version>3.2.1-alpha1</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.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="3.*"/>
-	</update>
 	<update>
 		<name>Component Builder</name>
 		<description>Builds Complex Joomla Components</description>
 		<element>pkg_component_builder</element>
 		<type>package</type>
 		<client>site</client>
-		<version>3.2.1-alpha2</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.1-alpha2.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>alpha</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.2.1-alpha3</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.1-alpha3.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>alpha</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.2.1-alpha4</version>
+		<version>3.2.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/v3.2.1-alpha4.zip</downloadurl>
@@ -1637,43 +148,7 @@
 		<element>pkg_component_builder</element>
 		<type>package</type>
 		<client>site</client>
-		<version>3.2.1-beta1</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.1-beta1.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.2.1-beta2</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.1-beta2.zip</downloadurl>
-		</downloads>
-		<tags>
-			<tag>beta</tag>
-		</tags>
-		<maintainer>Llewellyn van der Merwe</maintainer>
-		<maintainerurl>https://dev.vdm.io</maintainerurl>
-		<targetplatform name="joomla" version="3.*"/>
-	</update>
-	<update>
-		<name>Component Builder</name>
-		<description>Builds Complex Joomla Components</description>
-		<element>pkg_component_builder</element>
-		<type>package</type>
-		<client>site</client>
-		<version>3.2.1-beta3</version>
+		<version>3.2.1-beta</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.1-beta3.zip</downloadurl>
@@ -1691,10 +166,10 @@
 		<element>pkg_component_builder</element>
 		<type>package</type>
 		<client>site</client>
-		<version>3.2.1-rc1</version>
+		<version>3.2.1-rc2</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.1-rc1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.1-rc2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>releasecandidate</tag>
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaPower/Extractor.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaPower/Extractor.php
index 043954dcc..71835a2fb 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaPower/Extractor.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaPower/Extractor.php
@@ -12,6 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaPower;
 
 
+use VDM\Joomla\Utilities\JsonHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Power\ExtractorInterface;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Extractor as ExtendingExtractor;
 
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Utilities.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Utilities.php
index 2f4b56a6d..bf14861fc 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Utilities.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Utilities.php
@@ -121,7 +121,8 @@ class Utilities implements ServiceProviderInterface
 	public function getFileInjector(Container $container): FileInjector
 	{
 		return new FileInjector(
-			$container->get('Power.Injector')
+			$container->get('Power.Injector'),
+			$container->get('Joomla.Power.Injector')
 		);
 	}
 
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Utilities/FileInjector.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Utilities/FileInjector.php
index 47c9af0bf..eaf28e2c6 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Utilities/FileInjector.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Utilities/FileInjector.php
@@ -13,6 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Utilities;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Power\Injector as Power;
+use VDM\Joomla\Componentbuilder\Compiler\JoomlaPower\Injector as JoomlaPower;
 use VDM\Joomla\Utilities\MathHelper;
 
 
@@ -33,23 +34,41 @@ final class FileInjector
 	protected Power $power;
 
 	/**
-	 * The pattern to get the powers
+	 * The Joomla Injector Class.
+	 *
+	 * @var   JoomlaPower
+	 * @since 3.2.1
+	 */
+	protected JoomlaPower $joomla;
+
+	/**
+	 * The power pattern to get the powers
 	 *
 	 * @var    string
 	 * @since 3.2.0
 	 **/
-	protected string $pattern = '/Super_'.'_'.'_[a-zA-Z0-9_]+_'.'_'.'_Power/';
+	protected string $powerPattern = '/Super_'.'_'.'_[a-zA-Z0-9_]+_'.'_'.'_Power/';
+
+	/**
+	 * The Joomla power pattern to get the powers
+	 *
+	 * @var    string
+	 * @since 3.2.1
+	 **/
+	protected string $joomlaPattern = '/Joomla_'.'_'.'_[a-zA-Z0-9_]+_'.'_'.'_Power/';
 
 	/**
 	 * Constructor.
 	 *
-	 * @param Power   $power   The Injector Class.
+	 * @param Power        $power    The Injector Class.
+	 * @param JoomlaPower  $joomla   The Joomla Injector Class.
 	 *
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
-	public function __construct(Power $power)
+	public function __construct(Power $power, JoomlaPower $joomla)
 	{
 		$this->power = $power;
+		$this->joomla = $joomla;
 	}
 
 	/**
@@ -72,7 +91,9 @@ final class FileInjector
 			throw new \InvalidArgumentException('Position cannot be negative.');
 		}
 
-		$found_super_powers = preg_match($this->pattern, $data);
+		$found_joomla_powers = preg_match($this->joomlaPattern, $data);
+		$found_super_powers = preg_match($this->powerPattern, $data);
+
 		$actual_file = $this->openFileWithLock($file);
 
 		try
@@ -85,6 +106,11 @@ final class FileInjector
 
 			$this->processFile($actual_file, $temp_file, $data, $position, $replace);
 
+			if ($found_joomla_powers)
+			{
+				$this->injectJoomlaPowers($actual_file);
+			}
+
 			if ($found_super_powers)
 			{
 				$this->injectSuperPowers($actual_file);
@@ -207,6 +233,28 @@ final class FileInjector
 		ftruncate($actual_file, 0);
 		rewind($actual_file);
 
+		fwrite($actual_file, $power_data);
+	}
+
+	/**
+	 * Injects Joomla powers into the file content, if found, and updates the file.
+	 *
+	 * @param resource  $actual_file   The file handle of the actual file.
+	 * 
+	 * @return void
+	 * @since 3.2.1
+	 */
+	private function injectJoomlaPowers($actual_file): void
+	{
+		rewind($actual_file);
+
+		$power_data = $this->joomla->power(
+			stream_get_contents($actual_file)
+		);
+
+		ftruncate($actual_file, 0);
+		rewind($actual_file);
+
 		fwrite($actual_file, $power_data);
 	}
 }
diff --git a/media/js/help_document.js b/media/js/help_document.js
index fbb7d0711..45298f99c 100644
--- a/media/js/help_document.js
+++ b/media/js/help_document.js
@@ -9,11 +9,11 @@
  */
 
 // Some Global Values
-jform_vvvvwcqvye_required = false;
-jform_vvvvwcrvyf_required = false;
-jform_vvvvwcsvyg_required = false;
-jform_vvvvwctvyh_required = false;
-jform_vvvvwcvvyi_required = false;
+jform_vvvvwcqvyd_required = false;
+jform_vvvvwcrvye_required = false;
+jform_vvvvwcsvyf_required = false;
+jform_vvvvwctvyg_required = false;
+jform_vvvvwcvvyh_required = false;
 
 // Initial Script
 document.addEventListener('DOMContentLoaded', function()
@@ -45,26 +45,26 @@ function vvvvwcq(location_vvvvwcq)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 		// add required attribute to admin_view field
-		if (jform_vvvvwcqvye_required)
+		if (jform_vvvvwcqvyd_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwcqvye_required = false;
+			jform_vvvvwcqvyd_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
 		// remove required attribute from admin_view field
-		if (!jform_vvvvwcqvye_required)
+		if (!jform_vvvvwcqvyd_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwcqvye_required = true;
+			jform_vvvvwcqvyd_required = true;
 		}
 	}
 }
@@ -77,26 +77,26 @@ function vvvvwcr(location_vvvvwcr)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
 		// add required attribute to site_view field
-		if (jform_vvvvwcrvyf_required)
+		if (jform_vvvvwcrvye_required)
 		{
 			updateFieldRequired('site_view',0);
 			jQuery('#jform_site_view').prop('required','required');
 			jQuery('#jform_site_view').attr('aria-required',true);
 			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwcrvyf_required = false;
+			jform_vvvvwcrvye_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
 		// remove required attribute from site_view field
-		if (!jform_vvvvwcrvyf_required)
+		if (!jform_vvvvwcrvye_required)
 		{
 			updateFieldRequired('site_view',1);
 			jQuery('#jform_site_view').removeAttr('required');
 			jQuery('#jform_site_view').removeAttr('aria-required');
 			jQuery('#jform_site_view').removeClass('required');
-			jform_vvvvwcrvyf_required = true;
+			jform_vvvvwcrvye_required = true;
 		}
 	}
 }
@@ -122,26 +122,26 @@ function vvvvwcs(type_vvvvwcs)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
 		// add required attribute to url field
-		if (jform_vvvvwcsvyg_required)
+		if (jform_vvvvwcsvyf_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_vvvvwcsvyg_required = false;
+			jform_vvvvwcsvyf_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
 		// remove required attribute from url field
-		if (!jform_vvvvwcsvyg_required)
+		if (!jform_vvvvwcsvyf_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwcsvyg_required = true;
+			jform_vvvvwcsvyf_required = true;
 		}
 	}
 }
@@ -178,26 +178,26 @@ function vvvvwct(type_vvvvwct)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
 		// add required attribute to article field
-		if (jform_vvvvwctvyh_required)
+		if (jform_vvvvwctvyg_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_vvvvwctvyh_required = false;
+			jform_vvvvwctvyg_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
 		// remove required attribute from article field
-		if (!jform_vvvvwctvyh_required)
+		if (!jform_vvvvwctvyg_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwctvyh_required = true;
+			jform_vvvvwctvyg_required = true;
 		}
 	}
 }
@@ -259,26 +259,26 @@ function vvvvwcv(target_vvvvwcv)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
 		// add required attribute to groups field
-		if (jform_vvvvwcvvyi_required)
+		if (jform_vvvvwcvvyh_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwcvvyi_required = false;
+			jform_vvvvwcvvyh_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
 		// remove required attribute from groups field
-		if (!jform_vvvvwcvvyi_required)
+		if (!jform_vvvvwcvvyh_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwcvvyi_required = true;
+			jform_vvvvwcvvyh_required = true;
 		}
 	}
 }
diff --git a/script.php b/script.php
index 2ab530ac7..6b5554254 100644
--- a/script.php
+++ b/script.php
@@ -9810,7 +9810,7 @@ class Com_ComponentbuilderInstallerScript
 			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 3.2.1-rc1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 3.2.1-rc2 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Set db if not set already.
 			if (!isset($db))