diff --git a/README.md b/README.md
index f4082f9..244376d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Component Builder Package (v3.2.1-rc6)
+# Component Builder Package (v3.2.1)
 
 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.
 
diff --git a/pkg_component_builder.xml b/pkg_component_builder.xml
index 0d72e2c..d5be64c 100644
--- a/pkg_component_builder.xml
+++ b/pkg_component_builder.xml
@@ -2,7 +2,7 @@
 <extension version="3.8" type="package" method="upgrade">
 	<name>PKG_COMPONENT_BUILDER</name>
 	<packagename>component_builder</packagename>
-	<version>3.2.1-rc6</version>
+	<version>3.2.1</version>
 	<creationDate>May 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
diff --git a/src/joomla__Component-Builder__3.x.zip b/src/joomla__Component-Builder__3.x.zip
index 13019b8..8759828 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 4015a79..140d636 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 5394ad6..7a6f9eb 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 1035f18..6ba2877 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 8cbc883..d74b924 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 752f33f..bea8e81 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 8697a32..2e30c48 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 42a7662..97d8e33 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 653b68f..29405e4 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 118fa8d..962d517 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 b874571..5b758fe 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 dd9d797..cd74d7a 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 79d3482..042e33d 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 347ca47..92bb7ad 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 d89d358..52a9a7b 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 751620c..53e3971 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 39a11cd..06ebe87 100644
Binary files a/src/joomla__plg_extension_componentbuilderprivacycompiler__3.x.zip and b/src/joomla__plg_extension_componentbuilderprivacycompiler__3.x.zip differ