diff --git a/README.md b/README.md
index 117423a..c7861d0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Component Builder Package (v4.0.0-rc6)
+# Component Builder Package (v4.0.0)
 
 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 7e9dbd7..d5dbdeb 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-rc6</version>
+	<version>4.0.0</version>
 	<creationDate>May 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 4fb9ca5..1a954b1 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 b1b44b5..bab6f53 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 96b9a74..539bac2 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 f7421ee..9cae092 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 179b055..0ad2552 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 30526b4..ffb535a 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 56208e6..3354430 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 be3a86b..794b231 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 48db17b..df79baa 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 ecb59d9..876dffd 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 1117d64..fe9bddd 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 77ada76..6dd3d5c 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 fa96b75..c334d42 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 49692dd..198ba13 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 442345a..3f1a770 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 2b5cde5..e55481b 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 65be19f..2da1581 100644
Binary files a/src/joomla__plg_extension_componentbuilderprivacycompiler__4.x.zip and b/src/joomla__plg_extension_componentbuilderprivacycompiler__4.x.zip differ