diff --git a/componentbuilderlanguagetabs.xml b/componentbuilderlanguagetabs.xml
index 78afa24..f1b3dbf 100644
--- a/componentbuilderlanguagetabs.xml
+++ b/componentbuilderlanguagetabs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension type="plugin" version="4" group="content" method="upgrade">
+<extension type="plugin" version="3.10" group="content" method="upgrade">
 	<name>PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS</name>
-	<creationDate>24th October, 2023</creationDate>
+	<creationDate>2nd March, 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
diff --git a/fields/excludedlanguages.php b/fields/excludedlanguages.php
index d0be7d5..231117c 100644
--- a/fields/excludedlanguages.php
+++ b/fields/excludedlanguages.php
@@ -12,6 +12,10 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
 // import the list field type
 jimport('joomla.form.helper');
 JFormHelper::loadFieldClass('list');
@@ -24,7 +28,7 @@ class JFormFieldExcludedlanguages extends JFormFieldList
 	/**
 	 * The excludedlanguages field type.
 	 *
-	 * @var		string
+	 * @var        string
 	 */
 	public $type = 'excludedlanguages';
 
@@ -48,7 +52,7 @@ class JFormFieldExcludedlanguages extends JFormFieldList
 			$script = array();
 			$button_code_name = $this->getAttribute('name');
 			// get the input from url
-			$app = JFactory::getApplication();
+			$app = Factory::getApplication();
 			$jinput = $app->input;
 			// get the view name & id
 			$values = $jinput->getArray(array(
@@ -64,7 +68,7 @@ class JFormFieldExcludedlanguages extends JFormFieldList
 				$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) JUri::getInstance();
+				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&amp;return=' . $_return;
@@ -77,20 +81,20 @@ class JFormFieldExcludedlanguages extends JFormFieldList
 			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
 			$button_label = ucfirst(strtolower($button_label));
 			// get user object
-			$user = JFactory::getUser();
+			$user = Factory::getUser();
 			// only add if user allowed to create language
-			if ($user->authorise('language.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('language.create', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
 			{
 				// build Create button
-				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.Text::sprintf('PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=language&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
 			// only add if user allowed to edit language
-			if ($user->authorise('language.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('language.edit', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
 			{
 				// build edit button
-				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.Text::sprintf('PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
@@ -123,7 +127,7 @@ class JFormFieldExcludedlanguages extends JFormFieldList
 			if (is_array($button) && count($button) > 0)
 			{
 				// Load the needed script.
-				$document = JFactory::getDocument();
+				$document = Factory::getDocument();
 				$document->addScriptDeclaration(implode(' ',$script));
 				// return the button attached to input field.
 				return '<div class="input-append">' .$html . implode('',$button).'</div>';
@@ -135,7 +139,7 @@ class JFormFieldExcludedlanguages extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array    An array of JHtml options.
+	 * @return    array    An array of Html options.
 	 */
 	protected function getOptions()
 	{
diff --git a/script.php b/script.php
index f6fe598..8b1142d 100644
--- a/script.php
+++ b/script.php
@@ -12,6 +12,11 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Filesystem\Folder;
+
 /**
  * Content - Componentbuilder Language Tabs script file.
  *
@@ -31,7 +36,7 @@ class plgContentComponentbuilderLanguageTabsInstallerScript
 	public function preflight($route, $adapter)
 	{
 		// get application
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 
 		// the default for both install and update
 		$jversion = new JVersion();