diff --git a/README.md b/README.md
index a8576f6..10d97a9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Component Builder Package (v4.0.0-beta5)
+# Component Builder Package (v4.0.0-rc1)
 
 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 d878079..dfb34ab 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-beta5</version>
+	<version>4.0.0-rc1</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 86d88b8..fc608d3 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 b3cd63b..88b9722 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 e0e74c8..72bb484 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 122618d..73253cf 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 4042888..30ce763 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 ee524e7..66a60a9 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 df57946..1ce3b65 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 858519b..337bcb8 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 c7d7445..17368ab 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 291abfa..c72c175 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 241aa7d..917127a 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 e013dc2..e8f02d3 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 8b7ea6d..b11d932 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 194df44..efa8189 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 77b8713..2164696 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 9304cc4..a8c9802 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 0f9e70f..e588ab5 100644
Binary files a/src/joomla__plg_extension_componentbuilderprivacycompiler__4.x.zip and b/src/joomla__plg_extension_componentbuilderprivacycompiler__4.x.zip differ