diff --git a/componentbuildercomponentheaderstabs.php b/componentbuildercomponentheaderstabs.php
index 4989b42..cb2c59b 100644
--- a/componentbuildercomponentheaderstabs.php
+++ b/componentbuildercomponentheaderstabs.php
@@ -12,18 +12,18 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php'); 
+
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Plugin\CMSPlugin;
 use VDM\Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Component\ComponentHelper;
-
-JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php'); 
+use Joomla\CMS\Component\ComponentHelper;
 
 /**
  * Content - Componentbuilder Component Headers Tabs plugin.
  *
  * @package   ComponentbuilderComponentHeadersTabs
- * @since     2.0.1
+ * @since     2.0.2
  */
 class PlgContentComponentbuilderComponentHeadersTabs extends CMSPlugin
 {
diff --git a/componentbuildercomponentheaderstabs.xml b/componentbuildercomponentheaderstabs.xml
index f81c024..4c17226 100644
--- a/componentbuildercomponentheaderstabs.xml
+++ b/componentbuildercomponentheaderstabs.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="3.10" group="content" method="upgrade">
 	<name>PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS</name>
-	<creationDate>27th July, 2024</creationDate>
+	<creationDate>14th August, 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<description>PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
@@ -17,6 +17,8 @@
 	<languages folder="language">
 		<language tag="en-GB">en-GB/en-GB.plg_content_componentbuildercomponentheaderstabs.ini</language>
 		<language tag="en-GB">en-GB/en-GB.plg_content_componentbuildercomponentheaderstabs.sys.ini</language>
+		<language tag="af-ZA">af-ZA/af-ZA.plg_content_componentbuildercomponentheaderstabs.ini</language>
+		<language tag="af-ZA">af-ZA/af-ZA.plg_content_componentbuildercomponentheaderstabs.sys.ini</language>
 	</languages>
 
 	<!-- Plugin files -->
diff --git a/language/af-ZA/af-ZA.plg_content_componentbuildercomponentheaderstabs.ini b/language/af-ZA/af-ZA.plg_content_componentbuildercomponentheaderstabs.ini
new file mode 100644
index 0000000..3f17087
--- /dev/null
+++ b/language/af-ZA/af-ZA.plg_content_componentbuildercomponentheaderstabs.ini
@@ -0,0 +1,18 @@
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_NO="Nee"
\ No newline at end of file
diff --git a/language/af-ZA/af-ZA.plg_content_componentbuildercomponentheaderstabs.sys.ini b/language/af-ZA/af-ZA.plg_content_componentbuildercomponentheaderstabs.sys.ini
new file mode 100644
index 0000000..3f17087
--- /dev/null
+++ b/language/af-ZA/af-ZA.plg_content_componentbuildercomponentheaderstabs.sys.ini
@@ -0,0 +1,18 @@
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_NO="Nee"
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_content_componentbuildercomponentheaderstabs.ini b/language/en-GB/en-GB.plg_content_componentbuildercomponentheaderstabs.ini
index 0878a50..843da92 100644
--- a/language/en-GB/en-GB.plg_content_componentbuildercomponentheaderstabs.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuildercomponentheaderstabs.ini
@@ -1,6 +1,6 @@
 PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS="Content - Componentbuilder Component Headers Tabs"
 PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_DESCRIPTION="This plugin is used to set component class custom headers."
-PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Component Headers Tabs (v.2.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set component class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 26th December, 2020</small></p>"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Component Headers Tabs (v.2.0.2)</h1> <div style='clear: both;'></div><p>This plugin is used to set component class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 26th December, 2020</small></p>"
 PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_CLASS_HEADERS="Class Headers"
 PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_ADD_ADMIN_COMPONENT_LABEL="Admin Component<br />Header"
 PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_YES="Yes"
diff --git a/language/en-GB/en-GB.plg_content_componentbuildercomponentheaderstabs.sys.ini b/language/en-GB/en-GB.plg_content_componentbuildercomponentheaderstabs.sys.ini
index 0878a50..843da92 100644
--- a/language/en-GB/en-GB.plg_content_componentbuildercomponentheaderstabs.sys.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuildercomponentheaderstabs.sys.ini
@@ -1,6 +1,6 @@
 PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS="Content - Componentbuilder Component Headers Tabs"
 PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_DESCRIPTION="This plugin is used to set component class custom headers."
-PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Component Headers Tabs (v.2.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set component class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 26th December, 2020</small></p>"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Component Headers Tabs (v.2.0.2)</h1> <div style='clear: both;'></div><p>This plugin is used to set component class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 26th December, 2020</small></p>"
 PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_CLASS_HEADERS="Class Headers"
 PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_ADD_ADMIN_COMPONENT_LABEL="Admin Component<br />Header"
 PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_YES="Yes"