diff --git a/README.md b/README.md
index a51b8b9..e159a2d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Component Builder Package (v4.0.0-rc3)
+# Component Builder Package (v4.0.0-rc4)
 
 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.
 
@@ -6,7 +6,7 @@ The Joomla Component Builder Package that bundles JCB Component and all the plug
 
 - Packager: [Vast Development Method](https://dev.vdm.io/)
 - Author: [Llewellyn van der Merwe](https://io.vdm.dev/)
-- Creation Date: April 2024
+- Creation Date: May 2024
 - Max Joomla Version: J4.4
 - Minimum Joomla Version: J4.3
 
diff --git a/pkg_component_builder.xml b/pkg_component_builder.xml
index 78ef14f..8d33ae1 100644
--- a/pkg_component_builder.xml
+++ b/pkg_component_builder.xml
@@ -2,8 +2,8 @@
 <extension version="4.3" type="package" method="upgrade">
 	<name>PKG_COMPONENT_BUILDER</name>
 	<packagename>component_builder</packagename>
-	<version>4.0.0-rc3</version>
-	<creationDate>April 2024</creationDate>
+	<version>4.0.0-rc4</version>
+	<creationDate>May 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://io.vdm.dev/</authorUrl>
diff --git a/src/joomla__Component-Builder__4.x.zip b/src/joomla__Component-Builder__4.x.zip
index 799897b..b9043b6 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 1597d63..16d0d54 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 c7f10fb..16c879f 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 4a13b97..f68de66 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 3bc9f05..5694586 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 a05e82c..85dce15 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 95ac0f6..6048460 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 1563211..b67ac29 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 b48bb75..e635385 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 dc79fd7..9266774 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 586e299..080d46d 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 b9541f2..952877a 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 ce1c78c..79d7707 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 6ec8804..30ce5d1 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 7bf53c3..006a5fa 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 91363a4..75e7e24 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 2f8981f..53a6249 100644
Binary files a/src/joomla__plg_extension_componentbuilderprivacycompiler__4.x.zip and b/src/joomla__plg_extension_componentbuilderprivacycompiler__4.x.zip differ