diff --git a/README.md b/README.md
index 0e9ef68..4c63d6d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Component Builder Package (v3.2.1-rc3)
+# Component Builder Package (v3.2.1-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.
 
@@ -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: J3.10
 - Minimum Joomla Version: J3.8
 
diff --git a/pkg_component_builder.xml b/pkg_component_builder.xml
index 8aed3c9..2f92bcd 100644
--- a/pkg_component_builder.xml
+++ b/pkg_component_builder.xml
@@ -2,8 +2,8 @@
 <extension version="3.8" type="package" method="upgrade">
 	<name>PKG_COMPONENT_BUILDER</name>
 	<packagename>component_builder</packagename>
-	<version>3.2.1-rc3</version>
-	<creationDate>April 2024</creationDate>
+	<version>3.2.1-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__3.x.zip b/src/joomla__Component-Builder__3.x.zip
index 6fe6220..4872a38 100644
Binary files a/src/joomla__Component-Builder__3.x.zip and b/src/joomla__Component-Builder__3.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderadminheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuilderadminheaderstabs__3.x.zip
index 5f2bea0..1094f3b 100644
Binary files a/src/joomla__plg_content_componentbuilderadminheaderstabs__3.x.zip and b/src/joomla__plg_content_componentbuilderadminheaderstabs__3.x.zip differ
diff --git a/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__3.x.zip
index 9f79011..9c768a4 100644
Binary files a/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__3.x.zip and b/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__3.x.zip differ
diff --git a/src/joomla__plg_content_componentbuildercomponentheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuildercomponentheaderstabs__3.x.zip
index 0b037a8..a0e98f4 100644
Binary files a/src/joomla__plg_content_componentbuildercomponentheaderstabs__3.x.zip and b/src/joomla__plg_content_componentbuildercomponentheaderstabs__3.x.zip differ
diff --git a/src/joomla__plg_content_componentbuildercustomadminheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuildercustomadminheaderstabs__3.x.zip
index b04e100..f8c2289 100644
Binary files a/src/joomla__plg_content_componentbuildercustomadminheaderstabs__3.x.zip and b/src/joomla__plg_content_componentbuildercustomadminheaderstabs__3.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__3.x.zip
index e4bccf5..e4e0440 100644
Binary files a/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__3.x.zip and b/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__3.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderfieldorderingtabs__3.x.zip b/src/joomla__plg_content_componentbuilderfieldorderingtabs__3.x.zip
index 3f8a70f..d78df0e 100644
Binary files a/src/joomla__plg_content_componentbuilderfieldorderingtabs__3.x.zip and b/src/joomla__plg_content_componentbuilderfieldorderingtabs__3.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderlanguagetabs__3.x.zip b/src/joomla__plg_content_componentbuilderlanguagetabs__3.x.zip
index 90c26e3..d49bab4 100644
Binary files a/src/joomla__plg_content_componentbuilderlanguagetabs__3.x.zip and b/src/joomla__plg_content_componentbuilderlanguagetabs__3.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderprivacytabs__3.x.zip b/src/joomla__plg_content_componentbuilderprivacytabs__3.x.zip
index 809b9a9..0cb53e8 100644
Binary files a/src/joomla__plg_content_componentbuilderprivacytabs__3.x.zip and b/src/joomla__plg_content_componentbuilderprivacytabs__3.x.zip differ
diff --git a/src/joomla__plg_content_componentbuildersiteheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuildersiteheaderstabs__3.x.zip
index 208b614..ea9c971 100644
Binary files a/src/joomla__plg_content_componentbuildersiteheaderstabs__3.x.zip and b/src/joomla__plg_content_componentbuildersiteheaderstabs__3.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderactionlogcompiler__3.x.zip b/src/joomla__plg_extension_componentbuilderactionlogcompiler__3.x.zip
index 55e0f1a..226e7b5 100644
Binary files a/src/joomla__plg_extension_componentbuilderactionlogcompiler__3.x.zip and b/src/joomla__plg_extension_componentbuilderactionlogcompiler__3.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderexportcompiler__3.x.zip b/src/joomla__plg_extension_componentbuilderexportcompiler__3.x.zip
index f3a99b7..b02e2be 100644
Binary files a/src/joomla__plg_extension_componentbuilderexportcompiler__3.x.zip and b/src/joomla__plg_extension_componentbuilderexportcompiler__3.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__3.x.zip b/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__3.x.zip
index 8f46c8e..4306a3f 100644
Binary files a/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__3.x.zip and b/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__3.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderheaderscompiler__3.x.zip b/src/joomla__plg_extension_componentbuilderheaderscompiler__3.x.zip
index 0fe3b3e..2f07a52 100644
Binary files a/src/joomla__plg_extension_componentbuilderheaderscompiler__3.x.zip and b/src/joomla__plg_extension_componentbuilderheaderscompiler__3.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderlanguagepackaging__3.x.zip b/src/joomla__plg_extension_componentbuilderlanguagepackaging__3.x.zip
index 9867f0f..c997b87 100644
Binary files a/src/joomla__plg_extension_componentbuilderlanguagepackaging__3.x.zip and b/src/joomla__plg_extension_componentbuilderlanguagepackaging__3.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__3.x.zip b/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__3.x.zip
index 58fa0e0..baf6067 100644
Binary files a/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__3.x.zip and b/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__3.x.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderprivacycompiler__3.x.zip b/src/joomla__plg_extension_componentbuilderprivacycompiler__3.x.zip
index 7cc570c..d8fa35c 100644
Binary files a/src/joomla__plg_extension_componentbuilderprivacycompiler__3.x.zip and b/src/joomla__plg_extension_componentbuilderprivacycompiler__3.x.zip differ