diff --git a/README.md b/README.md
index 10d97a9..f68f09b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Component Builder Package (v4.0.0-rc1)
+# Component Builder Package (v4.0.0-rc2)
 
 The Joomla Component Builder Package that bundles JCB Component and all the plugins and features available into one package for easy install and update of your JCB system for Joomla 4.
 
diff --git a/pkg_component_builder.xml b/pkg_component_builder.xml
index dfb34ab..4e67a4a 100644
--- a/pkg_component_builder.xml
+++ b/pkg_component_builder.xml
@@ -2,7 +2,7 @@
 <extension version="4.3" type="package" method="upgrade">
 	<name>PKG_COMPONENT_BUILDER</name>
 	<packagename>component_builder</packagename>
-	<version>4.0.0-rc1</version>
+	<version>4.0.0-rc2</version>
 	<creationDate>April 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
diff --git a/src/joomla__Component-Builder__4.x.zip b/src/joomla__Component-Builder__4.x.zip
index fc608d3..f41a0a4 100644
Binary files a/src/joomla__Component-Builder__4.x.zip and b/src/joomla__Component-Builder__4.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderadminheaderstabs__4.x.zip b/src/joomla__plg_content_componentbuilderadminheaderstabs__4.x.zip
index 88b9722..1597d63 100644
Binary files a/src/joomla__plg_content_componentbuilderadminheaderstabs__4.x.zip and b/src/joomla__plg_content_componentbuilderadminheaderstabs__4.x.zip differ
diff --git a/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__4.x.zip b/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__4.x.zip
index 72bb484..c7f10fb 100644
Binary files a/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__4.x.zip and b/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__4.x.zip differ
diff --git a/src/joomla__plg_content_componentbuildercomponentheaderstabs__4.x.zip b/src/joomla__plg_content_componentbuildercomponentheaderstabs__4.x.zip
index 73253cf..4a13b97 100644
Binary files a/src/joomla__plg_content_componentbuildercomponentheaderstabs__4.x.zip and b/src/joomla__plg_content_componentbuildercomponentheaderstabs__4.x.zip differ
diff --git a/src/joomla__plg_content_componentbuildercustomadminheaderstabs__4.x.zip b/src/joomla__plg_content_componentbuildercustomadminheaderstabs__4.x.zip
index 30ce763..3bc9f05 100644
Binary files a/src/joomla__plg_content_componentbuildercustomadminheaderstabs__4.x.zip and b/src/joomla__plg_content_componentbuildercustomadminheaderstabs__4.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__4.x.zip b/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__4.x.zip
index 66a60a9..a05e82c 100644
Binary files a/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__4.x.zip and b/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__4.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderfieldorderingtabs__4.x.zip b/src/joomla__plg_content_componentbuilderfieldorderingtabs__4.x.zip
index 1ce3b65..95ac0f6 100644
Binary files a/src/joomla__plg_content_componentbuilderfieldorderingtabs__4.x.zip and b/src/joomla__plg_content_componentbuilderfieldorderingtabs__4.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderlanguagetabs__4.x.zip b/src/joomla__plg_content_componentbuilderlanguagetabs__4.x.zip
index 337bcb8..1563211 100644
Binary files a/src/joomla__plg_content_componentbuilderlanguagetabs__4.x.zip and b/src/joomla__plg_content_componentbuilderlanguagetabs__4.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderprivacytabs__4.x.zip b/src/joomla__plg_content_componentbuilderprivacytabs__4.x.zip
index 17368ab..b48bb75 100644
Binary files a/src/joomla__plg_content_componentbuilderprivacytabs__4.x.zip and b/src/joomla__plg_content_componentbuilderprivacytabs__4.x.zip differ
diff --git a/src/joomla__plg_content_componentbuildersiteheaderstabs__4.x.zip b/src/joomla__plg_content_componentbuildersiteheaderstabs__4.x.zip
index c72c175..dc79fd7 100644
Binary files a/src/joomla__plg_content_componentbuildersiteheaderstabs__4.x.zip and b/src/joomla__plg_content_componentbuildersiteheaderstabs__4.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderactionlogcompiler__4.x.zip b/src/joomla__plg_extension_componentbuilderactionlogcompiler__4.x.zip
index 917127a..586e299 100644
Binary files a/src/joomla__plg_extension_componentbuilderactionlogcompiler__4.x.zip and b/src/joomla__plg_extension_componentbuilderactionlogcompiler__4.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderexportcompiler__4.x.zip b/src/joomla__plg_extension_componentbuilderexportcompiler__4.x.zip
index e8f02d3..b9541f2 100644
Binary files a/src/joomla__plg_extension_componentbuilderexportcompiler__4.x.zip and b/src/joomla__plg_extension_componentbuilderexportcompiler__4.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__4.x.zip b/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__4.x.zip
index b11d932..ce1c78c 100644
Binary files a/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__4.x.zip and b/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__4.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderheaderscompiler__4.x.zip b/src/joomla__plg_extension_componentbuilderheaderscompiler__4.x.zip
index efa8189..6ec8804 100644
Binary files a/src/joomla__plg_extension_componentbuilderheaderscompiler__4.x.zip and b/src/joomla__plg_extension_componentbuilderheaderscompiler__4.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderlanguagepackaging__4.x.zip b/src/joomla__plg_extension_componentbuilderlanguagepackaging__4.x.zip
index 2164696..7bf53c3 100644
Binary files a/src/joomla__plg_extension_componentbuilderlanguagepackaging__4.x.zip and b/src/joomla__plg_extension_componentbuilderlanguagepackaging__4.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__4.x.zip b/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__4.x.zip
index a8c9802..91363a4 100644
Binary files a/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__4.x.zip and b/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__4.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderprivacycompiler__4.x.zip b/src/joomla__plg_extension_componentbuilderprivacycompiler__4.x.zip
index e588ab5..2f8981f 100644
Binary files a/src/joomla__plg_extension_componentbuilderprivacycompiler__4.x.zip and b/src/joomla__plg_extension_componentbuilderprivacycompiler__4.x.zip differ