diff --git a/src/com_tjvendors/admin/controller.php b/src/com_tjvendors/admin/controller.php
index c71d49e5..bb62591b 100755
--- a/src/com_tjvendors/admin/controller.php
+++ b/src/com_tjvendors/admin/controller.php
@@ -10,19 +10,21 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\BaseController;
 
 /**
  * Class TjvendorsController
  *
  * @since  1.6
  */
-class TjvendorsController extends JControllerLegacy
+class TjvendorsController extends BaseController
 {
 	/**
 	 * Method to display a view.
 	 *
 	 * @param   boolean  $cachable   If true, the view output will be cached
-	 * @param   mixed    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   mixed    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link InputFilter::clean()}.
 	 *
 	 * @return   JController This object to support chaining.
 	 *
@@ -30,8 +32,8 @@ class TjvendorsController extends JControllerLegacy
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
-		$view = JFactory::getApplication()->input->getCmd('view', 'vendors');
-		JFactory::getApplication()->input->set('view', $view);
+		$view = Factory::getApplication()->input->getCmd('view', 'vendors');
+		Factory::getApplication()->input->set('view', $view);
 
 		parent::display($cachable, $urlparams);
 
diff --git a/src/com_tjvendors/admin/controllers/payout.php b/src/com_tjvendors/admin/controllers/payout.php
index f35d053c..56dff7c0 100644
--- a/src/com_tjvendors/admin/controllers/payout.php
+++ b/src/com_tjvendors/admin/controllers/payout.php
@@ -10,15 +10,15 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.controllerform');
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\FormController;
 
 /**
  * Vendor controller class.
  *
  * @since  1.6
  */
-class TjvendorsControllerPayout extends JControllerForm
+class TjvendorsControllerPayout extends FormController
 {
 	/**
 	 * Constructor
@@ -28,7 +28,7 @@ class TjvendorsControllerPayout extends JControllerForm
 	public function __construct()
 	{
 		$this->view_list = 'payouts';
-		$this->input = JFactory::getApplication()->input;
+		$this->input = Factory::getApplication()->input;
 
 		if (empty($this->client))
 		{
@@ -48,7 +48,7 @@ public function __construct()
 
 	protected function getRedirectToListAppend()
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$vendor_id = $input->get('vendor_id', '', 'INTEGER');
 		$client = $input->get('client', '', 'STRING');
 		$append = parent::getRedirectToListAppend();
@@ -80,7 +80,7 @@ public function addCreditEntry()
 	 */
 	public function changePayoutStatus()
 	{
-		$input  = JFactory::getApplication()->input->post;
+		$input  = Factory::getApplication()->input->post;
 		$payout_id = $input->get('payout_id', '', 'STRING');
 		$paidUnpaid = $input->get('paidUnpaid', '', 'STRING');
 		$model = $this->getModel('Payout');
diff --git a/src/com_tjvendors/admin/controllers/payouts.php b/src/com_tjvendors/admin/controllers/payouts.php
index 40f91e2c..1f8e13de 100644
--- a/src/com_tjvendors/admin/controllers/payouts.php
+++ b/src/com_tjvendors/admin/controllers/payouts.php
@@ -10,15 +10,14 @@
 
 // No direct access.
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.controlleradmin');
+use Joomla\CMS\MVC\Controller\AdminController;
 
 /**
  * Vendors list controller class.
  *
  * @since  1.6
  */
-class TjvendorsControllerPayouts extends JControllerAdmin
+class TjvendorsControllerPayouts extends AdminController
 {
 	/**
 	 * Proxy for getModel.
diff --git a/src/com_tjvendors/admin/controllers/reports.php b/src/com_tjvendors/admin/controllers/reports.php
index e18f305f..4919ae19 100644
--- a/src/com_tjvendors/admin/controllers/reports.php
+++ b/src/com_tjvendors/admin/controllers/reports.php
@@ -10,15 +10,14 @@
 
 // No direct access.
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.controlleradmin');
+use Joomla\CMS\MVC\Controller\AdminController;
 
 /**
  * Vendors list controller class.
  *
  * @since  1.6
  */
-class TjvendorsControllerReports extends JControllerAdmin
+class TjvendorsControllerReports extends AdminController
 {
 	/**
 	 * Proxy for getModel.
diff --git a/src/com_tjvendors/admin/controllers/vendor.php b/src/com_tjvendors/admin/controllers/vendor.php
index 1d1ff2df..a2315adb 100755
--- a/src/com_tjvendors/admin/controllers/vendor.php
+++ b/src/com_tjvendors/admin/controllers/vendor.php
@@ -10,16 +10,21 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Router\Route;
 
-jimport('joomla.application.component.controllerform');
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/tjvendors.php');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/tjvendors.php');
 
 /**
  * Vendor controller class.
  *
  * @since  1.6
  */
-class TjvendorsControllerVendor extends JControllerForm
+class TjvendorsControllerVendor extends FormController
 {
 	/**
 	 * Constructor
@@ -45,7 +50,7 @@ public function __construct()
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'vendor_id')
 	{
-		$input  = JFactory::getApplication()->input;
+		$input  = Factory::getApplication()->input;
 		$client = $input->get('client', '', 'STRING');
 		$vendor_id = $input->get('vendor_id', '', 'STRING');
 		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
@@ -63,7 +68,7 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'vendor_i
 	 */
 	public function checkDuplicateUser()
 	{
-		$input  = JFactory::getApplication()->input->post;
+		$input  = Factory::getApplication()->input->post;
 		$user = $input->get('user', '', 'STRING');
 		$model = $this->getModel('vendor');
 		$results = $model->checkDuplicateUser($user);
@@ -81,7 +86,7 @@ public function checkDuplicateUser()
 	 */
 	public function vendorApprove()
 	{
-		$input  = JFactory::getApplication()->input;
+		$input  = Factory::getApplication()->input;
 		$vendor_id = $input->post->get('vendor_id', '', 'INTEGER');
 		$vendorApprove = $input->post->get('vendorApprove', '', 'INTEGER');
 		$client = $input->get('client', '', 'STRING');
@@ -91,7 +96,7 @@ public function vendorApprove()
 		$data['approved'] = $vendorApprove;
 		$result = $model->save($data);
 
-		echo new JResponseJson($result, JText::_('COM_TJVENDORS_VENDOR_APPROVAL_ERROR'), true);
+		echo new JsonResponse($result, Text::_('COM_TJVENDORS_VENDOR_APPROVAL_ERROR'), true);
 	}
 
 	/**
@@ -103,7 +108,7 @@ public function vendorApprove()
 	 */
 	public function generateGatewayFields()
 	{
-		$input  = JFactory::getApplication()->input->post;
+		$input  = Factory::getApplication()->input->post;
 		$payment_gateway = $input->get('payment_gateway', '', 'STRING');
 		$parentTag = $input->get('parent_tag', '', 'STRING');
 		$vendor_id = $input->get('vendor_id', '', 'INTEGER');
@@ -122,7 +127,7 @@ public function generateGatewayFields()
 	 */
 	protected function getRedirectToListAppend()
 	{
-		$input  = JFactory::getApplication()->input->post;
+		$input  = Factory::getApplication()->input->post;
 		$client = $input->get('client', '', 'STRING');
 		$append = parent::getRedirectToListAppend();
 		$append .= '&client=' . $client;
@@ -144,13 +149,13 @@ protected function getRedirectToListAppend()
 	public function save($key = null, $urlVar = null)
 	{
 		// Initialise variables.
-		$app    = JFactory::getApplication();
+		$app    = Factory::getApplication();
 		$model  = $this->getModel('Vendor', 'TjvendorsModel');
 		$input  = $app->input;
 		$client = $input->get('client', '', 'STRING');
 
 		// Get the user data.
-		$data = JFactory::getApplication()->input->get('jform', array(), 'array');
+		$data = Factory::getApplication()->input->get('jform', array(), 'array');
 
 		// Validate the posted data.
 		$form = $model->getForm();
@@ -187,7 +192,7 @@ public function save($key = null, $urlVar = null)
 			$id = (int) $app->getUserState('com_tjvendors.edit.vendor.id');
 			$app->setUserState('com_tjvendors.edit.vendor.data', $data);
 
-			$this->setRedirect(JRoute::_('index.php?option=com_tjvendors&view=vendor&layout=edit&client=' . $client . '&vendor_id=' . $id, false));
+			$this->setRedirect(Route::_('index.php?option=com_tjvendors&view=vendor&layout=edit&client=' . $client . '&vendor_id=' . $id, false));
 
 			return false;
 		}
@@ -201,13 +206,13 @@ public function save($key = null, $urlVar = null)
 
 			// Redirect back to the edit screen.
 			$id = (int) $app->getUserState('com_tjvendors.edit.vendor.id');
-			$this->setMessage(JText::sprintf('COM_TJVENDORS_VENDOR_ERROR_MSG_SAVE', $model->getError()), 'warning');
-			$this->setRedirect(JRoute::_('index.php?option=com_tjvendors&view=vendor&layout=edit&client=' . $client . '&vendor_id=' . $id, false));
+			$this->setMessage(Text::sprintf('COM_TJVENDORS_VENDOR_ERROR_MSG_SAVE', $model->getError()), 'warning');
+			$this->setRedirect(Route::_('index.php?option=com_tjvendors&view=vendor&layout=edit&client=' . $client . '&vendor_id=' . $id, false));
 
 			return false;
 		}
 
-		$msg = JText::_('COM_TJVENDORS_MSG_SUCCESS_SAVE_VENDOR');
+		$msg = Text::_('COM_TJVENDORS_MSG_SUCCESS_SAVE_VENDOR');
 		$id = $input->get('vendor_id');
 
 		if (empty($id))
@@ -219,13 +224,13 @@ public function save($key = null, $urlVar = null)
 
 		if ($task == 'apply')
 		{
-			$redirect = JRoute::_('index.php?option=com_tjvendors&view=vendor&layout=update&client=' . $client . '&vendor_id=' . $id, false);
+			$redirect = Route::_('index.php?option=com_tjvendors&view=vendor&layout=update&client=' . $client . '&vendor_id=' . $id, false);
 			$app->redirect($redirect, $msg);
 		}
 
 		if ($task == 'save2new')
 		{
-			$redirect = JRoute::_('index.php?option=com_tjvendors&view=vendor&layout=edit&client=' . $client, false);
+			$redirect = Route::_('index.php?option=com_tjvendors&view=vendor&layout=edit&client=' . $client, false);
 			$app->redirect($redirect, $msg);
 		}
 
@@ -239,7 +244,7 @@ public function save($key = null, $urlVar = null)
 		}
 
 		// Redirect to the list screen.
-		$redirect = JRoute::_('index.php?option=com_tjvendors&view=vendors&client=' . $client, false);
+		$redirect = Route::_('index.php?option=com_tjvendors&view=vendors&client=' . $client, false);
 		$app->redirect($redirect, $msg);
 
 		// Flush the data from the session.
diff --git a/src/com_tjvendors/admin/controllers/vendorfee.php b/src/com_tjvendors/admin/controllers/vendorfee.php
index 1fe90cb3..b02167cf 100644
--- a/src/com_tjvendors/admin/controllers/vendorfee.php
+++ b/src/com_tjvendors/admin/controllers/vendorfee.php
@@ -10,15 +10,17 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.controllerform');
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
 
 /**
  * Vendor controller class.
  *
  * @since  1.6
  */
-class TjvendorsControllerVendorFee extends JControllerForm
+class TjvendorsControllerVendorFee extends FormController
 {
 	/**
 	 * Constructor
@@ -28,7 +30,7 @@ class TjvendorsControllerVendorFee extends JControllerForm
 	public function __construct()
 	{
 			$this->view_list = 'vendorfees';
-		$this->input = JFactory::getApplication()->input;
+		$this->input = Factory::getApplication()->input;
 
 		if (empty($this->client))
 		{
@@ -50,9 +52,9 @@ public function __construct()
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$cid = $input->post->get('cid', array(), 'array');
-		$formData = new JRegistry($input->get('jform', '', 'array'));
+		$formData = new Registry($input->get('jform', '', 'array'));
 		$client = $input->get('client', '', 'STRING');
 		$vendor_id = $input->get('vendor_id', '', 'INTEGER');
 		$append = parent::getRedirectToItemAppend($recordId);
@@ -70,9 +72,9 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	 */
 	protected function getRedirectToListAppend()
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$cid = $input->post->get('cid', array(), 'array');
-		$formData = new JRegistry($input->get('jform', '', 'array'));
+		$formData = new Registry($input->get('jform', '', 'array'));
 		$client = $input->get('client', '', 'STRING');
 		$vendor_id = $input->get('vendor_id', '', 'STRING');
 
@@ -87,19 +89,19 @@ protected function getRedirectToListAppend()
 	 * Function to edit field data
 	 *
 	 * @param   integer  $key     null.
-	 * 
+	 *
 	 * @param   integer  $urlVar  null.
-	 * 
+	 *
 	 * @return  void
 	 */
 	public function edit($key = null, $urlVar = null)
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$cid = $input->post->get('cid', array(), 'array');
 		$vendorId = (int) (count($cid) ? $cid[0] : $input->getInt('vendor_id'));
 		$client = $input->get('client', '', 'STRING');
 		$feeId = (int) (count($cid) ? $cid[0] : $input->getInt('fee_id'));
-		$link = JRoute::_(
+		$link = Route::_(
 		'index.php?option=com_tjvendors&view=vendorfee&layout=edit&id=' . $feeId . '&vendor_id=' . $vendorId . '&client=' . $client, false
 		);
 		$this->setRedirect($link);
diff --git a/src/com_tjvendors/admin/controllers/vendorfees.php b/src/com_tjvendors/admin/controllers/vendorfees.php
index d083b197..5081a9f2 100644
--- a/src/com_tjvendors/admin/controllers/vendorfees.php
+++ b/src/com_tjvendors/admin/controllers/vendorfees.php
@@ -10,15 +10,16 @@
 
 // No direct access.
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.controlleradmin');
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\CMS\Router\Route;
 
 /**
  * Vendors list controller class.
  *
  * @since  1.6
  */
-class TjvendorsControllerVendorFees extends JControllerAdmin
+class TjvendorsControllerVendorFees extends AdminController
 {
 	/**
 	 * Proxy for getModel.
@@ -46,10 +47,10 @@ public function getModel($name = 'vendorfee', $prefix = 'TjvendorsModel', $confi
 	public function back()
 	{
 		// Get the input
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$pks = $input->post->get('cid', array(), 'array');
 
 		// Redirect to the list screen.
-		$this->setRedirect(JRoute::_('index.php?option=com_tjvendors&view=vendors&client=' . $input->get('client', '', 'STRING'), false));
+		$this->setRedirect(Route::_('index.php?option=com_tjvendors&view=vendors&client=' . $input->get('client', '', 'STRING'), false));
 	}
 }
diff --git a/src/com_tjvendors/admin/controllers/vendors.php b/src/com_tjvendors/admin/controllers/vendors.php
index 6e4d32a2..4b98285e 100755
--- a/src/com_tjvendors/admin/controllers/vendors.php
+++ b/src/com_tjvendors/admin/controllers/vendors.php
@@ -10,15 +10,17 @@
 
 // No direct access.
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.controlleradmin');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\MVC\Controller\AdminController;
 
 /**
  * Vendors list controller class.
  *
  * @since  1.6
  */
-class TjvendorsControllerVendors extends JControllerAdmin
+class TjvendorsControllerVendors extends AdminController
 {
 	/**
 	 * Proxy for getModel.
@@ -45,9 +47,9 @@ public function getModel($name = 'vendor', $prefix = 'TjvendorsModel', $config =
 	 */
 	public function delete()
 	{
-		$input  = JFactory::getApplication()->input;
+		$input  = Factory::getApplication()->input;
 		$client = $input->get('client', '', 'STRING');
-		$cid = JFactory::getApplication()->input->get('cid', array(), 'array');
+		$cid = Factory::getApplication()->input->get('cid', array(), 'array');
 		$model = $this->getModel("vendors");
 
 		foreach ($cid as $vendor_id)
@@ -66,10 +68,10 @@ public function delete()
 	 */
 	public function publish()
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$post = $input->post;
 		$client = $input->get('client', '', 'STRING');
-		$cid = JFactory::getApplication()->input->get('cid', array(), 'array');
+		$cid = Factory::getApplication()->input->get('cid', array(), 'array');
 		$data = array('publish' => 1, 'unpublish' => 0, 'archive' => 2, 'trash' => -2, 'report' => -3);
 		$task = $this->getTask();
 		$value = JArrayHelper::getValue($data, $task, 0, 'int');
@@ -78,7 +80,7 @@ public function publish()
 
 		if (empty($cid))
 		{
-			JLog::add(JText::_($this->text_prefix . '_NO_ITEM_SELECTED'), JLog::WARNING, 'jerror');
+			Log::add(Text::_($this->text_prefix . '_NO_ITEM_SELECTED'), Log::WARNING, 'jerror');
 		}
 		else
 		{
@@ -102,11 +104,11 @@ public function publish()
 					$ntext = $this->text_prefix . '_N_ITEMS_UNPUBLISHED';
 				}
 
-				$this->setMessage(JText::plural($ntext, count($cid)));
+				$this->setMessage(Text::plural($ntext, count($cid)));
 			}
 			catch (Exception $e)
 			{
-				$this->setMessage(JText::_('JLIB_DATABASE_ERROR_ANCESTOR_NODES_LOWER_STATE'), 'error');
+				$this->setMessage(Text::_('JLIB_DATABASE_ERROR_ANCESTOR_NODES_LOWER_STATE'), 'error');
 			}
 		}
 
diff --git a/src/com_tjvendors/admin/helpers/listhelper.php b/src/com_tjvendors/admin/helpers/listhelper.php
index 03815a5e..3fcd4309 100755
--- a/src/com_tjvendors/admin/helpers/listhelper.php
+++ b/src/com_tjvendors/admin/helpers/listhelper.php
@@ -10,6 +10,7 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Language\Text;
 
 /**
  * Tjvendors Listhelper.
@@ -34,15 +35,15 @@ abstract class JHtmlListhelper
 	public static function toggle($view, $field, $i, $value = 0)
 	{
 		$states = array(
-			0 => array('icon-remove', JText::_('Toggle'), 'inactive btn-danger'),
-			1 => array('icon-checkmark', JText::_('Toggle'), 'active btn-success'),
+			0 => array('icon-remove', Text::_('Toggle'), 'inactive btn-danger'),
+			1 => array('icon-checkmark', Text::_('Toggle'), 'active btn-success'),
 		);
 
 		$state  = \Joomla\Utilities\ArrayHelper::getValue($states, (int) $value, $states[0]);
 		$text   = '<span aria-hidden="true" class="' . $state[0] . '"></span>';
 		$html   = '<a href="#" class="btn btn-micro ' . $state[2] . '"';
 		$html  .= 'onclick="return toggleField(\'cb' . $i . '\',\'' . $view . '.toggle\',\'' .
-		$field . '\')" title="' . JText::_($state[1]) . '">' . $text . '</a>';
+		$field . '\')" title="' . Text::_($state[1]) . '">' . $text . '</a>';
 
 		return $html;
 	}
diff --git a/src/com_tjvendors/admin/helpers/tjvendors.php b/src/com_tjvendors/admin/helpers/tjvendors.php
index f1dc03c0..959b3bf1 100644
--- a/src/com_tjvendors/admin/helpers/tjvendors.php
+++ b/src/com_tjvendors/admin/helpers/tjvendors.php
@@ -10,6 +10,13 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Filesystem\Path;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Table\Table;
 
 /**
  * Tjvendors helper.
@@ -27,13 +34,13 @@ class TjvendorsHelper
 	 */
 	public static function addSubmenu($vName = '')
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$full_client = $input->get('client', '', 'STRING');
 		$full_client = explode('.', $full_client);
 
 		$component = $full_client[0];
 		$eName = str_replace('com_', '', $component);
-		$file = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/helpers/' . $eName . '.php');
+		$file = Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/helpers/' . $eName . '.php');
 
 		if (file_exists($file))
 		{
@@ -47,12 +54,12 @@ public static function addSubmenu($vName = '')
 			{
 				if (is_callable(array($cName, 'addSubmenu')))
 				{
-					$lang = JFactory::getLanguage();
+					$lang = Factory::getLanguage();
 
 					$lang->load($component, JPATH_BASE, null, false, false)
-					|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, false)
+					|| $lang->load($component, Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, false)
 					|| $lang->load($component, JPATH_BASE, $lang->getDefault(), false, false)
-					|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), $lang->getDefault(), false, false);
+					|| $lang->load($component, Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component), $lang->getDefault(), false, false);
 
 					call_user_func(array($cName, 'addSubmenu'), $vName . (isset($section) ? '.' . $section : ''));
 				}
@@ -73,27 +80,27 @@ public static function addSubmenu($vName = '')
 			}
 
 			JHtmlSidebar::addEntry(
-				JText::_('COM_TJVENDORS_TJNOTIFICATIONS_MENU'), 'index.php?option=com_tjnotifications&extension=com_tjvendors',
+				Text::_('COM_TJVENDORS_TJNOTIFICATIONS_MENU'), 'index.php?option=com_tjnotifications&extension=com_tjvendors',
 				$notifications
 			);
 
 			// Load bootsraped filter
 
-			JHtml::_('bootstrap.tooltip');
+			HTMLHelper::_('bootstrap.tooltip');
 		}
 	}
 
 	/**
 	 * Gets a list of the actions that can be performed.
 	 *
-	 * @return    JObject
+	 * @return    CMSObject
 	 *
 	 * @since    1.6
 	 */
 	public static function getActions()
 	{
-		$user   = JFactory::getUser();
-		$result = new JObject;
+		$user   = Factory::getUser();
+		$result = new CMSObject;
 
 		$assetName = 'com_tjvendors';
 
@@ -116,7 +123,7 @@ public static function getActions()
 	 */
 	public static function getUniqueClients()
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$columns = $db->quoteName('client');
 		$query->select('distinct' . $columns);
@@ -129,7 +136,7 @@ public static function getUniqueClients()
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($rows))
@@ -138,7 +145,7 @@ public static function getUniqueClients()
 		}
 
 		$uniqueClient   = array();
-		$uniqueClient[] = array("vendor_client" => JText::_('JFILTER_PAYOUT_CHOOSE_CLIENT'), "client_value" => '');
+		$uniqueClient[] = array("vendor_client" => Text::_('JFILTER_PAYOUT_CHOOSE_CLIENT'), "client_value" => '');
 
 		foreach ($rows as $row)
 		{
@@ -163,7 +170,7 @@ public static function getUniqueClients()
 	 */
 	public static function getTotalAmount($vendor_id, $currency, $client)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$subQuery = $db->getQuery(true);
 		$subQuery->select('max(' . $db->quoteName('id') . ')');
@@ -196,7 +203,7 @@ public static function getTotalAmount($vendor_id, $currency, $client)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($result))
@@ -218,8 +225,8 @@ public static function getTotalAmount($vendor_id, $currency, $client)
 	 */
 	public static function bulkPendingAmount($vendor_id, $currency)
 	{
-		JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_tjvendors/models');
-		$tjvendorsModelVendor     = JModelLegacy::getInstance('Vendor', 'TjvendorsModel');
+		BaseDatabaseModel::addIncludePath(JPATH_SITE . '/components/com_tjvendors/models');
+		$tjvendorsModelVendor     = BaseDatabaseModel::getInstance('Vendor', 'TjvendorsModel');
 
 		$vendorClients = self::getClients($vendor_id);
 		$bulkPendingAmount = 0;
@@ -246,7 +253,7 @@ public static function bulkPendingAmount($vendor_id, $currency)
 	 */
 	public static function getClients($vendor_id)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('distinct' . $db->quoteName('client'));
 		$query->from($db->quoteName('#__tjvendors_passbook'));
@@ -264,7 +271,7 @@ public static function getClients($vendor_id)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($clients))
@@ -289,7 +296,7 @@ public static function getClients($vendor_id)
 
 	public static function checkUniqueCurrency($currency, $vendor_id, $client)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select($db->quoteName('currency'));
 		$query->from($db->quoteName('#__tjvendors_fee'));
@@ -312,7 +319,7 @@ public static function checkUniqueCurrency($currency, $vendor_id, $client)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		foreach ($currencies as $i)
@@ -340,7 +347,7 @@ public static function checkUniqueCurrency($currency, $vendor_id, $client)
 	 */
 	public static function getCurrencies($vendor_id)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('DISTINCT' . $db->quoteName('currency'));
 		$query->from($db->quoteName('#__tjvendors_passbook'));
@@ -358,7 +365,7 @@ public static function getCurrencies($vendor_id)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($currencies))
@@ -378,12 +385,12 @@ public static function getCurrencies($vendor_id)
 	 */
 	public static function addVendor($data)
 	{
-		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'vendor');
-		$tjvendorsModelVendors = JModelLegacy::getInstance('Vendor', 'TjvendorsModel');
-		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables', 'vendor');
+		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'vendor');
+		$tjvendorsModelVendors = BaseDatabaseModel::getInstance('Vendor', 'TjvendorsModel');
+		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables', 'vendor');
 		$vendorsDetail = $tjvendorsModelVendors->save($data);
-		JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjvendors/tables');
-		$table = JTable::getInstance('vendor', 'TJVendorsTable', array());
+		Table::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjvendors/tables');
+		$table = Table::getInstance('vendor', 'TJVendorsTable', array());
 		$table->load(array('user_id' => $data['user_id']));
 
 		return $table->vendor_id;
diff --git a/src/com_tjvendors/admin/models/fields/createdby.php b/src/com_tjvendors/admin/models/fields/createdby.php
index 24f113de..0b547b52 100755
--- a/src/com_tjvendors/admin/models/fields/createdby.php
+++ b/src/com_tjvendors/admin/models/fields/createdby.php
@@ -1,3 +1,6 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Factory;
 <?php
 /**
  * @package     TJVendors
@@ -44,11 +47,11 @@ protected function getInput()
 
 		if ($user_id)
 		{
-			$user = JFactory::getUser($user_id);
+			$user = Factory::getUser($user_id);
 		}
 		else
 		{
-			$user   = JFactory::getUser();
+			$user   = Factory::getUser();
 			$html[] = '<input type="hidden" name="' . $this->name . '" value="' . $user->id . '" />';
 		}
 
diff --git a/src/com_tjvendors/admin/models/fields/custom_field.php b/src/com_tjvendors/admin/models/fields/custom_field.php
index 5be748b6..9a5c115b 100755
--- a/src/com_tjvendors/admin/models/fields/custom_field.php
+++ b/src/com_tjvendors/admin/models/fields/custom_field.php
@@ -1,3 +1,5 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
 <?php
 /**
  * @package     TJVendors
diff --git a/src/com_tjvendors/admin/models/fields/filemultiple.php b/src/com_tjvendors/admin/models/fields/filemultiple.php
index ef5edb7d..08606fc3 100755
--- a/src/com_tjvendors/admin/models/fields/filemultiple.php
+++ b/src/com_tjvendors/admin/models/fields/filemultiple.php
@@ -1,3 +1,5 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
 <?php
 /**
  * @package     TJVendors
diff --git a/src/com_tjvendors/admin/models/fields/foreignkey.php b/src/com_tjvendors/admin/models/fields/foreignkey.php
index c6b9a155..964030df 100755
--- a/src/com_tjvendors/admin/models/fields/foreignkey.php
+++ b/src/com_tjvendors/admin/models/fields/foreignkey.php
@@ -1,3 +1,7 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
 <?php
 /**
  * @package     TJVendors
@@ -65,7 +69,7 @@ protected function getInput()
 		$fk_value = '';
 
 		// Load all the field options
-		$db    = JFactory::getDbo();
+		$db    = Factory::getDbo();
 		$query = $db->getQuery(true);
 
 		// Support for multiple fields on fk_values
@@ -114,7 +118,7 @@ protected function getInput()
 				// Iterate through all the results
 				foreach ($results as $result)
 				{
-					$options[] = JHtml::_('select.option', $result->{$this->key_field}, $result->{$this->value_field});
+					$options[] = HTMLHelper::_('select.option', $result->{$this->key_field}, $result->{$this->value_field});
 				}
 
 				$value = $this->value;
@@ -137,10 +141,10 @@ protected function getInput()
 				}
 				else
 				{
-					array_unshift($options, JHtml::_('select.option', '', ''));
+					array_unshift($options, HTMLHelper::_('select.option', '', ''));
 				}
 
-				$html = JHtml::_('select.genericlist', $options, $this->name, $input_options, 'value', 'text', $value, $this->id);
+				$html = HTMLHelper::_('select.genericlist', $options, $this->name, $input_options, 'value', 'text', $value, $this->id);
 				break;
 		}
 
diff --git a/src/com_tjvendors/admin/models/fields/modifiedby.php b/src/com_tjvendors/admin/models/fields/modifiedby.php
index ff1ff99f..3404f723 100755
--- a/src/com_tjvendors/admin/models/fields/modifiedby.php
+++ b/src/com_tjvendors/admin/models/fields/modifiedby.php
@@ -1,3 +1,6 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Factory;
 <?php
 /**
  * @package     TJVendors
@@ -38,7 +41,7 @@ protected function getInput()
 	{
 		// Initialize variables.
 		$html   = array();
-		$user   = JFactory::getUser();
+		$user   = Factory::getUser();
 		$html[] = '<input type="hidden" name="' . $this->name . '" value="' . $user->id . '" />';
 		$html[] = "<div>" . $user->name . " (" . $user->username . ")</div>";
 
diff --git a/src/com_tjvendors/admin/models/fields/paymentgateway.php b/src/com_tjvendors/admin/models/fields/paymentgateway.php
index b7d30164..20f28c0a 100644
--- a/src/com_tjvendors/admin/models/fields/paymentgateway.php
+++ b/src/com_tjvendors/admin/models/fields/paymentgateway.php
@@ -10,9 +10,15 @@
 
 // No direct access.
 defined('_JEXEC') or die();
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\PluginHelper;
 
 jimport('joomla.form.helper');
-JFormHelper::loadFieldClass('list');
+FormHelper::loadFieldClass('list');
 
 /**
  * Supports an HTML select list of courses
@@ -40,38 +46,38 @@ class JFormFieldPaymentGateway 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 HTMLHelper options.
 	 *
 	 * @since   11.4
 	 */
 	protected function getOptions()
 	{
 		$type = "payment";
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$client = $input->get('client', '', 'STRING');
 		$options = array();
-		$options[] = JHtml::_('select.option', '', JText::_('COM_TJVENDOR_PAYMENT_DETAILS_DEFAULT'));
+		$options[] = HTMLHelper::_('select.option', '', Text::_('COM_TJVENDOR_PAYMENT_DETAILS_DEFAULT'));
 
 		if (!empty($client))
 		{
-			$com_params = JComponentHelper::getParams($client);
+			$com_params = ComponentHelper::getParams($client);
 			$gateways = (array) $com_params->get('gateways');
 
 			if (!empty($gateways))
 			{
 				foreach ($gateways as $detail)
 				{
-					$options[] = JHtml::_('select.option', $detail, $detail);
+					$options[] = HTMLHelper::_('select.option', $detail, $detail);
 				}
 			}
 		}
 		else
 		{
-			$gateways = JPluginHelper::getPlugin($type, $plugin = null);
+			$gateways = PluginHelper::getPlugin($type, $plugin = null);
 
 			foreach ($gateways as $detail)
 			{
-				$options[] = JHtml::_('select.option', $detail->name, $detail->name);
+				$options[] = HTMLHelper::_('select.option', $detail->name, $detail->name);
 			}
 		}
 
diff --git a/src/com_tjvendors/admin/models/fields/timecreated.php b/src/com_tjvendors/admin/models/fields/timecreated.php
index 835591bb..5ed86fc1 100755
--- a/src/com_tjvendors/admin/models/fields/timecreated.php
+++ b/src/com_tjvendors/admin/models/fields/timecreated.php
@@ -1,3 +1,8 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Language\Text;
 <?php
 /**
  * @package     TJVendors
@@ -43,7 +48,7 @@ protected function getInput()
 
 		if (!strtotime($time_created))
 		{
-			$time_created = JFactory::getDate('now', JFactory::getConfig()->get('offset'))->toSql(true);
+			$time_created = Factory::getDate('now', Factory::getConfig()->get('offset'))->toSql(true);
 			$html[]       = '<input type="hidden" name="' . $this->name . '" value="' . $time_created . '" />';
 		}
 
@@ -51,8 +56,8 @@ protected function getInput()
 
 		if ($hidden == null || !$hidden)
 		{
-			$jdate       = new JDate($time_created);
-			$pretty_date = $jdate->format(JText::_('DATE_FORMAT_LC2'));
+			$jdate       = new Date($time_created);
+			$pretty_date = $jdate->format(Text::_('DATE_FORMAT_LC2'));
 			$html[]      = "<div>" . $pretty_date . "</div>";
 		}
 
diff --git a/src/com_tjvendors/admin/models/fields/timeupdated.php b/src/com_tjvendors/admin/models/fields/timeupdated.php
index e1d51a2a..56c82849 100755
--- a/src/com_tjvendors/admin/models/fields/timeupdated.php
+++ b/src/com_tjvendors/admin/models/fields/timeupdated.php
@@ -1,3 +1,8 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Factory;
 <?php
 /**
  * @package     TJVendors
@@ -50,13 +55,13 @@ protected function getInput()
 			}
 			else
 			{
-				$jdate       = new JDate($old_time_updated);
-				$pretty_date = $jdate->format(JText::_('DATE_FORMAT_LC2'));
+				$jdate       = new Date($old_time_updated);
+				$pretty_date = $jdate->format(Text::_('DATE_FORMAT_LC2'));
 				$html[]      = "<div>" . $pretty_date . "</div>";
 			}
 		}
 
-		$time_updated = JFactory::getDate('now', JFactory::getConfig()->get('offset'))->toSql(true);
+		$time_updated = Factory::getDate('now', Factory::getConfig()->get('offset'))->toSql(true);
 		$html[]       = '<input type="hidden" name="' . $this->name . '" value="' . $time_updated . '" />';
 
 		return implode($html);
diff --git a/src/com_tjvendors/admin/models/fields/vendorslist.php b/src/com_tjvendors/admin/models/fields/vendorslist.php
index 4ffcc82c..facbab78 100644
--- a/src/com_tjvendors/admin/models/fields/vendorslist.php
+++ b/src/com_tjvendors/admin/models/fields/vendorslist.php
@@ -10,13 +10,12 @@
 
 // No direct access.
 defined('_JEXEC') or die();
-
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 
 jimport('joomla.form.helper');
-\JFormHelper::loadFieldClass('list');
+\FormHelper::loadFieldClass('list');
 
 /**
  * Supports an HTML select list of vendors
@@ -36,7 +35,7 @@ class JFormFieldVendorsList 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 HTMLHelper options.
 	 *
 	 * @since  1.3.2
 	 */
diff --git a/src/com_tjvendors/admin/models/payout.php b/src/com_tjvendors/admin/models/payout.php
index fbbf9fbd..d3e4dcdd 100644
--- a/src/com_tjvendors/admin/models/payout.php
+++ b/src/com_tjvendors/admin/models/payout.php
@@ -10,8 +10,13 @@
 
 // No direct access.
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Table\Table;
 
-jimport('joomla.application.component.modeladmin');
 JLoader::import('com_tjvendors.helpers.fronthelper', JPATH_SITE . '/components');
 
 /**
@@ -19,7 +24,7 @@
  *
  * @since  1.6
  */
-class TjvendorsModelPayout extends JModelAdmin
+class TjvendorsModelPayout extends AdminModel
 {
 	/**
 	 * @var      string    The prefix to use with controller messages.
@@ -46,13 +51,13 @@ class TjvendorsModelPayout extends JModelAdmin
 	 * @param   string  $prefix  A prefix for the table class name. Optional.
 	 * @param   array   $config  Configuration array for model. Optional.
 	 *
-	 * @return    JTable    A database object
+	 * @return    Table    A database object
 	 *
 	 * @since    1.6
 	 */
 	public function getTable($type = 'payout', $prefix = 'TjvendorsTable', $config = array())
 	{
-		return JTable::getInstance($type, $prefix, $config);
+		return Table::getInstance($type, $prefix, $config);
 	}
 
 	/**
@@ -61,14 +66,14 @@ public function getTable($type = 'payout', $prefix = 'TjvendorsTable', $config =
 	 * @param   array    $data      An optional array of data for the form to interogate.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
 	 *
-	 * @return  JForm  A JForm object on success, false on failure
+	 * @return  Form  A Form object on success, false on failure
 	 *
 	 * @since    1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 
 		// Get the form.
 		$form = $this->loadForm(
@@ -95,12 +100,12 @@ public function getForm($data = array(), $loadData = true)
 	 */
 	protected function loadFormData()
 	{
-		JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_tjvendors/models');
-		$tjvendorsModelVendor     = JModelLegacy::getInstance('Vendor', 'TjvendorsModel');
+		BaseDatabaseModel::addIncludePath(JPATH_SITE . '/components/com_tjvendors/models');
+		$tjvendorsModelVendor     = BaseDatabaseModel::getInstance('Vendor', 'TjvendorsModel');
 
 		// Check the session for previously entered form data.
-		$data = JFactory::getApplication()->getUserState('com_tjvendors.edit.payout.data', array());
-		$com_params = JComponentHelper::getParams('com_tjvendors');
+		$data = Factory::getApplication()->getUserState('com_tjvendors.edit.payout.data', array());
+		$com_params = ComponentHelper::getParams('com_tjvendors');
 		$bulkPayoutStatus = $com_params->get('bulk_payout');
 
 		if (empty($data))
@@ -126,8 +131,8 @@ protected function loadFormData()
 		}
 
 			$this->item->reference_order_id = '';
-			JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'vendor');
-			$tjvendorsModelVendor = JModelLegacy::getInstance('Vendor', 'TjvendorsModel');
+			BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'vendor');
+			$tjvendorsModelVendor = BaseDatabaseModel::getInstance('Vendor', 'TjvendorsModel');
 			$vendorDetail = $tjvendorsModelVendor->getItem();
 			$this->item->vendor_title = $vendorDetail->vendor_title;
 		}
@@ -146,12 +151,12 @@ public function save($data)
 	{
 		if (!isset($data['adaptive_payout']))
 		{
-			$com_params = JComponentHelper::getParams('com_tjvendors');
+			$com_params = ComponentHelper::getParams('com_tjvendors');
 			$bulkPayoutStatus = $com_params->get('bulk_payout');
 			$tjvendorFrontHelper = new TjvendorFrontHelper;
 
-			JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'payout');
-			$tjvendorsModelPayout = JModelLegacy::getInstance('Payout', 'TjvendorsModel');
+			BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'payout');
+			$tjvendorsModelPayout = BaseDatabaseModel::getInstance('Payout', 'TjvendorsModel');
 
 			$vendorDetail = $tjvendorsModelPayout->getItem();
 
@@ -169,7 +174,7 @@ public function save($data)
 					$pending_amount = TjvendorsHelper::getTotalAmount($vendorDetail->vendor_id, $vendorDetail->currency, $client['client']);
 					$data['debit'] = $pending_amount['total'];
 					$data['total'] = 0;
-					$data['transaction_time'] = JFactory::getDate()->toSql();
+					$data['transaction_time'] = Factory::getDate()->toSql();
 					$data['client'] = $client['client'];
 					$transactionClient = $tjvendorFrontHelper->getClientName($client['client']);
 					$data['transaction_id'] = $transactionClient . '-' . $vendorDetail->currency . '-' . $vendorDetail->vendor_id . '-';
@@ -189,11 +194,11 @@ public function save($data)
 						$payout_update->transaction_id = $data['transaction_id'] . $payout_update->id;
 
 						// Update their details in the users table using id as the primary key.
-						JFactory::getDbo()->updateObject('#__tjvendors_passbook', $payout_update, 'id');
+						Factory::getDbo()->updateObject('#__tjvendors_passbook', $payout_update, 'id');
 					}
 
-					$message = JText::_('COM_TJVENDORS_PAYOUT_SUCCESSFULL_MESSAGE');
-					JFactory::getApplication()->enqueueMessage($message);
+					$message = Text::_('COM_TJVENDORS_PAYOUT_SUCCESSFULL_MESSAGE');
+					Factory::getApplication()->enqueueMessage($message);
 				}
 
 				return true;
@@ -202,7 +207,7 @@ public function save($data)
 			$data['debit'] = $data['total'];
 			$payableAmount = TjvendorsHelper::getTotalAmount($item->vendor_id, $item->currency, $item->client);
 			$data['total'] = $payableAmount['total'] - $data['debit'];
-			$data['transaction_time'] = JFactory::getDate()->toSql();
+			$data['transaction_time'] = Factory::getDate()->toSql();
 			$data['client'] = $vendorDetail->client;
 			$transactionClient = $tjvendorFrontHelper->getClientName($data['client']);
 			$data['transaction_id'] = $transactionClient . '-' . $vendorDetail->currency . '-' . $vendorDetail->vendor_id . '-';
@@ -223,10 +228,10 @@ public function save($data)
 			$payout_update->transaction_id = $data['transaction_id'] . $payout_update->id;
 
 			// Update their details in the users table using id as the primary key.
-			$result = JFactory::getDbo()->updateObject('#__tjvendors_passbook', $payout_update, 'id');
+			$result = Factory::getDbo()->updateObject('#__tjvendors_passbook', $payout_update, 'id');
 
-			$message = JText::_('COM_TJVENDORS_PAYOUT_SUCCESSFULL_MESSAGE');
-			JFactory::getApplication()->enqueueMessage($message);
+			$message = Text::_('COM_TJVENDORS_PAYOUT_SUCCESSFULL_MESSAGE');
+			Factory::getApplication()->enqueueMessage($message);
 
 			return true;
 		}
@@ -256,11 +261,11 @@ public function updatingCreditData($data)
 		try
 		{
 			// Update their details in the users table using id as the primary key.
-			$result = JFactory::getDbo()->updateObject('#__tjvendors_passbook', $object, 'id');
+			$result = Factory::getDbo()->updateObject('#__tjvendors_passbook', $object, 'id');
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($result))
@@ -295,11 +300,11 @@ public function addCreditEntry($data)
 		try
 		{
 			// Insert the object into the passbook table.
-			$result = JFactory::getDbo()->insertObject('#__tjvendors_passbook', $creditEntry);
+			$result = Factory::getDbo()->insertObject('#__tjvendors_passbook', $creditEntry);
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($result))
@@ -335,13 +340,13 @@ public function changePayoutStatus($payout_id, $paidUnpaid)
 		try
 		{
 			// Update their details in the users table using id as the primary key.
-			$result = JFactory::getDbo()->updateObject('#__tjvendors_passbook', $object, 'id');
+			$result = Factory::getDbo()->updateObject('#__tjvendors_passbook', $object, 'id');
 
 			return true;
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 	}
 }
diff --git a/src/com_tjvendors/admin/models/payouts.php b/src/com_tjvendors/admin/models/payouts.php
index 6ed3a64c..68275807 100644
--- a/src/com_tjvendors/admin/models/payouts.php
+++ b/src/com_tjvendors/admin/models/payouts.php
@@ -9,15 +9,16 @@
  */
 
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.modellist');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\MVC\Model\ListModel;
 
 /**
  * Methods supporting a list of Tjvendors records.
  *
  * @since  1.6
  */
-class TjvendorsModelPayouts extends JModelList
+class TjvendorsModelPayouts extends ListModel
 {
 /**
 	* Constructor.
@@ -58,7 +59,7 @@ public function __construct($config = array())
 	protected function populateState($ordering = null, $direction = null)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication('administrator');
+		$app = Factory::getApplication('administrator');
 
 		// Set ordering.
 		$orderCol = $app->getUserStateFromRequest($this->context . '.filter_order', 'filter_order');
@@ -88,7 +89,7 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('filter.search', $search);
 
 		// Load the parameters.
-		$params = JComponentHelper::getParams('com_tjvendors');
+		$params = ComponentHelper::getParams('com_tjvendors');
 		$this->setState('params', $params);
 
 		$this->setState('list.limit', '0');
@@ -107,24 +108,24 @@ protected function populateState($ordering = null, $direction = null)
 
 	public function getListQuery()
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$vendor_id = $input->get('vendor_id', '', 'INTEGER');
 		$urlClient = $input->get('client', '', 'STRING');
 		$filterClient = $this->getState('filter.vendor_client');
-		$com_params = JComponentHelper::getParams('com_tjvendors');
+		$com_params = ComponentHelper::getParams('com_tjvendors');
 		$payout_day_limit = $com_params->get('payout_limit_days', '0', 'INT');
-		$date = JFactory::getDate();
+		$date = Factory::getDate();
 		$payout_date_limit = $date->modify("-" . $payout_day_limit . " day");
 		$bulkPayoutStatus = $com_params->get('bulk_payout');
 		$vendor = $this->getState('filter.vendor_id');
 
 		if (!empty($urlClient))
 		{
-			$component_params = JComponentHelper::getParams($urlClient);
+			$component_params = ComponentHelper::getParams($urlClient);
 			$com_currency = $component_params->get('currency');
 		}
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 
 		$query = $db->getQuery(true);
 		$query->select(array('vendors.vendor_id', 'vendors.vendor_title', 'pass.*'));
diff --git a/src/com_tjvendors/admin/models/reports.php b/src/com_tjvendors/admin/models/reports.php
index f01f0d4f..39f3aa58 100644
--- a/src/com_tjvendors/admin/models/reports.php
+++ b/src/com_tjvendors/admin/models/reports.php
@@ -9,15 +9,16 @@
  */
 
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.modellist');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\MVC\Model\ListModel;
 
 /**
  * Methods supporting a list of Tjvendors records.
  *
  * @since  1.6
  */
-class TjvendorsModelReports extends JModelList
+class TjvendorsModelReports extends ListModel
 {
 /**
 	* Constructor.
@@ -65,7 +66,7 @@ public function __construct($config = array())
 	protected function populateState($ordering = null, $direction = null)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication('administrator');
+		$app = Factory::getApplication('administrator');
 
 		// Set ordering.
 		$orderCol = $app->getUserStateFromRequest($this->context . '.filter_order', 'filter_order');
@@ -103,7 +104,7 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('filter.search', $search);
 
 		// Load the parameters.
-		$params = JComponentHelper::getParams('com_tjvendors');
+		$params = ComponentHelper::getParams('com_tjvendors');
 		$this->setState('params', $params);
 
 		// List state information.
@@ -125,7 +126,7 @@ public function getListQuery()
 		$currency = $this->getState('filter.currency', '');
 		$vendor_id = $this->getState('filter.vendor_id', '');
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 
 		$query = $db->getQuery(true);
 		$query->select(array('vendors.vendor_id', 'vendors.vendor_title', 'pass.*'));
diff --git a/src/com_tjvendors/admin/models/vendor.php b/src/com_tjvendors/admin/models/vendor.php
index 5f1d7eba..d2a4c1f0 100644
--- a/src/com_tjvendors/admin/models/vendor.php
+++ b/src/com_tjvendors/admin/models/vendor.php
@@ -11,7 +11,6 @@
 // No direct access.
 defined('_JEXEC') or die;
 
-jimport('joomla.application.component.modeladmin');
 /**
  * Tjvendors model.
  *
diff --git a/src/com_tjvendors/admin/models/vendorfee.php b/src/com_tjvendors/admin/models/vendorfee.php
index eb7d7cab..a7103e0a 100644
--- a/src/com_tjvendors/admin/models/vendorfee.php
+++ b/src/com_tjvendors/admin/models/vendorfee.php
@@ -10,15 +10,19 @@
 
 // No direct access.
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.modeladmin');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Table\Table;
 
 /**
  * Tjvendors model.
  *
  * @since  1.6
  */
-class TjvendorsModelVendorFee extends JModelAdmin
+class TjvendorsModelVendorFee extends AdminModel
 {
 	/**
 	 * @var      string    The prefix to use with controller messages.
@@ -45,16 +49,16 @@ class TjvendorsModelVendorFee extends JModelAdmin
 	 * @param   string  $prefix  A prefix for the table class name. Optional.
 	 * @param   array   $config  Configuration array for model. Optional.
 	 *
-	 * @return    JTable    A database object
+	 * @return    Table    A database object
 	 *
 	 * @since    1.6
 	 */
 	public function getTable($type = 'Vendorfee', $prefix = 'TjvendorsTable', $config = array())
 	{
-		$db     = JFactory::getDbo();
+		$db     = Factory::getDbo();
 		$tables = $db->getTableList();
 
-		return JTable::getInstance($type, $prefix, $config);
+		return Table::getInstance($type, $prefix, $config);
 	}
 
 	/**
@@ -63,14 +67,14 @@ public function getTable($type = 'Vendorfee', $prefix = 'TjvendorsTable', $confi
 	 * @param   array    $data      An optional array of data for the form to interogate.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
 	 *
-	 * @return  JForm  A JForm object on success, false on failure
+	 * @return  Form  A Form object on success, false on failure
 	 *
 	 * @since    1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 
 		// Get the form.
 		$form = $this->loadForm('com_tjvendors.vendorfee', 'vendorfee', array('control' => 'jform', 'load_data' => $loadData));
@@ -95,8 +99,8 @@ public function getForm($data = array(), $loadData = true)
 	public function getItem($pk = null)
 	{
 		$data = parent::getItem($pk);
-		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'vendor');
-		$TjvendorsModelVendor = JModelLegacy::getInstance('Vendor', 'TjvendorsModel');
+		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'vendor');
+		$TjvendorsModelVendor = BaseDatabaseModel::getInstance('Vendor', 'TjvendorsModel');
 		$vendorDetail         = $TjvendorsModelVendor->getItem();
 		$data->vendor_title   = $vendorDetail->vendor_title;
 
@@ -113,7 +117,7 @@ public function getItem($pk = null)
 	protected function loadFormData()
 	{
 		// Check the session for previously entered form data.
-		$data = JFactory::getApplication()->getUserState('com_tjvendors.edit.vendorfee.data', array());
+		$data = Factory::getApplication()->getUserState('com_tjvendors.edit.vendorfee.data', array());
 
 		if (empty($data))
 		{
@@ -139,9 +143,9 @@ protected function loadFormData()
 	public function save($data)
 	{
 		$isNew             = (empty($data['id']))? true : false;
-		$app               = JFactory::getApplication();
+		$app               = Factory::getApplication();
 		$table             = $this->getTable();
-		$db                = JFactory::getDbo();
+		$db                = Factory::getDbo();
 		$input             = $app->input;
 		$data['vendor_id'] = $input->get('vendor_id', '', 'INTEGER');
 		$uniqueCurrency    = TjvendorsHelper::checkUniqueCurrency($data['currency'], $data['vendor_id'], $data['client']);
@@ -156,7 +160,7 @@ public function save($data)
 				}
 
 				$dispatcher = JDispatcher::getInstance();
-				JPluginHelper::importPlugin('tjvendors');
+				PluginHelper::importPlugin('tjvendors');
 				$dispatcher->trigger('tjVendorsOnAfterVendorFeeSave', array($data, $isNew));
 
 				return true;
@@ -164,7 +168,7 @@ public function save($data)
 		}
 		else
 		{
-			$app->enqueueMessage(JText::_('COM_TJVENDORS_VENDORFEE_DUPLICATE_CURRENCY'), 'error');
+			$app->enqueueMessage(Text::_('COM_TJVENDORS_VENDORFEE_DUPLICATE_CURRENCY'), 'error');
 		}
 
 		return false;
diff --git a/src/com_tjvendors/admin/models/vendorfees.php b/src/com_tjvendors/admin/models/vendorfees.php
index bd21bcc2..e8e236ff 100644
--- a/src/com_tjvendors/admin/models/vendorfees.php
+++ b/src/com_tjvendors/admin/models/vendorfees.php
@@ -9,16 +9,16 @@
  */
 
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.modellist');
-jimport('joomla.application.component.model');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\MVC\Model\ListModel;
 
 /**
  * Methods supporting a list of Tjvendors records.
  *
  * @since  1.6
  */
-class TjvendorsModelVendorFees extends JModelList
+class TjvendorsModelVendorFees extends ListModel
 {
 /**
 	* Constructor.
@@ -58,7 +58,7 @@ public function __construct($config = array())
 	protected function populateState($ordering = null, $direction = null)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication('administrator');
+		$app = Factory::getApplication('administrator');
 
 		// Set ordering.
 		$orderCol = $app->getUserStateFromRequest($this->context . '.filter_order', 'filter_order');
@@ -75,7 +75,7 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('filter.search', $search);
 
 		// Load the parameters.
-		$params = JComponentHelper::getParams('com_tjvendors');
+		$params = ComponentHelper::getParams('com_tjvendors');
 		$this->setState('params', $params);
 
 		// List state information.
@@ -91,7 +91,7 @@ protected function populateState($ordering = null, $direction = null)
 	 */
 	protected function getListQuery()
 	{
-		$input           = JFactory::getApplication()->input;
+		$input           = Factory::getApplication()->input;
 		$this->vendor_id = $input->get('vendor_id', '', 'INT');
 		$vendor_id       = $this->vendor_id ? $this->vendor_id : $this->getState('vendor_id');
 		$client          = $input->get('client', '', 'STRING');
diff --git a/src/com_tjvendors/admin/models/vendors.php b/src/com_tjvendors/admin/models/vendors.php
index 584289e7..967b2607 100755
--- a/src/com_tjvendors/admin/models/vendors.php
+++ b/src/com_tjvendors/admin/models/vendors.php
@@ -10,15 +10,20 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.modellist');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Table\Table;
 
 /**
  * Methods supporting a list of Tjvendors records.
  *
  * @since  1.6
  */
-class TjvendorsModelVendors extends JModelList
+class TjvendorsModelVendors extends ListModel
 {
 /**
 	* Constructor.
@@ -58,7 +63,7 @@ public function __construct($config = array())
 	protected function populateState($ordering = null, $direction = null)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication('administrator');
+		$app = Factory::getApplication('administrator');
 
 		// Set ordering.
 		$orderCol = $app->getUserStateFromRequest($this->context . '.filter_order', 'filter_order');
@@ -78,7 +83,7 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('filter.state', $published);
 
 		// Load the parameters.
-		$params = JComponentHelper::getParams('com_tjvendors');
+		$params = ComponentHelper::getParams('com_tjvendors');
 		$this->setState('params', $params);
 
 		// List state information.
@@ -95,7 +100,7 @@ protected function populateState($ordering = null, $direction = null)
 	protected function getListQuery()
 	{
 		// Get client
-		$input  = JFactory::getApplication()->input;
+		$input  = Factory::getApplication()->input;
 		$client = $input->get('client', '', 'STRING');
 
 		// Create a new query object.
@@ -163,7 +168,7 @@ public function checkForAvailableRecords($vendor_id)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($result))
@@ -206,9 +211,9 @@ public function deleteVendor($vendor_id)
 	 */
 	public function deleteClientFromVendor($vendor_id, $client)
 	{
-		JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_tjvendors/models');
-		$tjvendorsModelVendor     = JModelLegacy::getInstance('Vendor', 'TjvendorsModel');
-		$tjvendorsModelVendorFees = JModelLegacy::getInstance('VendorFees', 'TjvendorsModel');
+		BaseDatabaseModel::addIncludePath(JPATH_SITE . '/components/com_tjvendors/models');
+		$tjvendorsModelVendor     = BaseDatabaseModel::getInstance('Vendor', 'TjvendorsModel');
+		$tjvendorsModelVendorFees = BaseDatabaseModel::getInstance('VendorFees', 'TjvendorsModel');
 		$vendorData               = $tjvendorsModelVendor->getItem($vendor_id);
 		$db                       = $this->getDbo();
 
@@ -226,7 +231,7 @@ public function deleteClientFromVendor($vendor_id, $client)
 				// If Vendor Payable amount is remaining then don't allow to delete vendor
 				if (!empty($result))
 				{
-					JFactory::getApplication()->enqueueMessage(sprintf(JText::_("COM_TJVENDORS_VENDOR_DELETE_ERROR_MESSAGE"), $vendorData->vendor_title), 'error');
+					Factory::getApplication()->enqueueMessage(sprintf(Text::_("COM_TJVENDORS_VENDOR_DELETE_ERROR_MESSAGE"), $vendorData->vendor_title), 'error');
 
 					return false;
 				}
@@ -250,7 +255,7 @@ public function deleteClientFromVendor($vendor_id, $client)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($result))
@@ -266,7 +271,7 @@ public function deleteClientFromVendor($vendor_id, $client)
 		}
 
 		$dispatcher = JDispatcher::getInstance();
-		JPluginHelper::importPlugin('tjvendors');
+		PluginHelper::importPlugin('tjvendors');
 		$dispatcher->trigger('tjvendorOnAfterVendorDelete', array($vendorData, $client));
 	}
 
@@ -283,12 +288,12 @@ public function deleteClientFromVendor($vendor_id, $client)
 	 */
 	public function setItemState($items, $state, $client)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 
 		foreach ($items as $id)
 		{
-			JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjvendors/tables');
-			$tjvendorsTablevendorclientxref = JTable::getInstance('vendorclientxref', 'TjvendorsTable', array());
+			Table::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjvendors/tables');
+			$tjvendorsTablevendorclientxref = Table::getInstance('vendorclientxref', 'TjvendorsTable', array());
 			$tjvendorsTablevendorclientxref->load(array('vendor_id' => $id, 'client'    => $client));
 			$updateState = new stdClass;
 
@@ -297,7 +302,7 @@ public function setItemState($items, $state, $client)
 			$updateState->state = $state;
 
 			// Update their details in the users table using id as the primary key.
-			JFactory::getDbo()->updateObject('#__vendor_client_xref', $updateState, 'id');
+			Factory::getDbo()->updateObject('#__vendor_client_xref', $updateState, 'id');
 
 			/* Send Mail when Admin users change vendor state of vendor, these mails are not needed.. */
 			/*
@@ -315,7 +320,7 @@ public function setItemState($items, $state, $client)
 		}
 
 		$dispatcher = JDispatcher::getInstance();
-		JPluginHelper::importPlugin('tjvendors');
+		PluginHelper::importPlugin('tjvendors');
 		$dispatcher->trigger('tjVendorsOnAfterVendorStateChange', array($items, $state, $client));
 
 		return true;
diff --git a/src/com_tjvendors/admin/tables/payout.php b/src/com_tjvendors/admin/tables/payout.php
index 19c6fff7..5c5182bd 100644
--- a/src/com_tjvendors/admin/tables/payout.php
+++ b/src/com_tjvendors/admin/tables/payout.php
@@ -10,7 +10,11 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
+use Joomla\CMS\Factory;
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Table\Table;
+use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -18,7 +22,7 @@
  *
  * @since  1.6
  */
-class TjvendorsTablePayout extends JTable
+class TjvendorsTablePayout extends Table
 {
 	/**
 	 * Constructor
@@ -39,32 +43,32 @@ public function __construct(&$db)
 	 *
 	 * @return  null|string  null is operation was satisfactory, otherwise returns an error
 	 *
-	 * @see     JTable:bind
+	 * @see     Table:bind
 	 * @since   1.5
 	 */
 	public function bind($array, $ignore = '')
 	{
 		if (isset($array['params']) && is_array($array['params']))
 		{
-			$registry = new JRegistry;
+			$registry = new Registry;
 			$registry->loadArray($array['params']);
 			$array['params'] = (string) $registry;
 		}
 
 		if (isset($array['metadata']) && is_array($array['metadata']))
 		{
-			$registry = new JRegistry;
+			$registry = new Registry;
 			$registry->loadArray($array['metadata']);
 			$array['metadata'] = (string) $registry;
 		}
 
-		if (!JFactory::getUser()->authorise('core.admin', 'com_tjvendors.payout.' . $array['id']))
+		if (!Factory::getUser()->authorise('core.admin', 'com_tjvendors.payout.' . $array['id']))
 		{
-			$actions = JAccess::getActionsFromFile(
+			$actions = Access::getActionsFromFile(
 				JPATH_ADMINISTRATOR . '/components/com_tjvendors/access.xml',
 				"/access/section[@name='payout']/"
 			);
-			$default_actions = JAccess::getAssetRules('com_tjvendors.payout.' . $array['id'])->getData();
+			$default_actions = Access::getAssetRules('com_tjvendors.payout.' . $array['id'])->getData();
 			$array_jaccess   = array();
 
 			foreach ($actions as $action)
@@ -85,9 +89,9 @@ public function bind($array, $ignore = '')
 	}
 
 	/**
-	 * This function convert an array of JAccessRule objects into an rules array.
+	 * This function convert an array of Rule objects into an rules array.
 	 *
-	 * @param   array  $jaccessrules  An array of JAccessRule objects.
+	 * @param   array  $jaccessrules  An array of Rule objects.
 	 *
 	 * @return  array
 	 */
@@ -162,7 +166,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 			// Nothing to set publishing state on, return false.
 			else
 			{
-				throw new Exception(500, JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+				throw new Exception(500, Text::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
 			}
 		}
 
@@ -198,7 +202,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 			}
 		}
 
-		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		// If the Table instance value is in the list of primary keys that were set, set the instance.
 		if (in_array($this->$k, $pks))
 		{
 			$this->state = $state;
@@ -212,7 +216,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 	 *
 	 * @return string The asset name
 	 *
-	 * @see JTable::_getAssetName
+	 * @see Table::_getAssetName
 	 */
 	protected function _getAssetName()
 	{
@@ -224,17 +228,17 @@ protected function _getAssetName()
 	/**
 	 * Returns the parent asset's id. If you have a tree structure, retrieve the parent's id using the external key field
 	 *
-	 * @param   JTable   $table  Table name
+	 * @param   Table    $table  Table name
 	 * @param   integer  $id     Id
 	 *
-	 * @see JTable::_getAssetParentId
+	 * @see Table::_getAssetParentId
 	 *
 	 * @return mixed The id on success, false on failure.
 	 */
-	protected function _getAssetParentId(JTable $table = null, $id = null)
+	protected function _getAssetParentId(Table $table = null, $id = null)
 	{
 		// We will retrieve the parent-asset from the Asset-table
-		$assetParent = JTable::getInstance('Asset');
+		$assetParent = Table::getInstance('Asset');
 
 		// Default: if no asset-parent can be found we take the global asset
 		$assetParentId = $assetParent->getRootId();
diff --git a/src/com_tjvendors/admin/tables/vendor.php b/src/com_tjvendors/admin/tables/vendor.php
index 54ec97f9..48f613ec 100644
--- a/src/com_tjvendors/admin/tables/vendor.php
+++ b/src/com_tjvendors/admin/tables/vendor.php
@@ -10,7 +10,13 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
+use Joomla\CMS\Factory;
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Filter\OutputFilter;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Table\Table;
+use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -18,7 +24,7 @@
  *
  * @since  1.6
  */
-class TjvendorsTablevendor extends JTable
+class TjvendorsTablevendor extends Table
 {
 	/**
 	 * Constructor
@@ -40,32 +46,32 @@ public function __construct(&$db)
 	 *
 	 * @return  null|string  null is operation was satisfactory, otherwise returns an error
 	 *
-	 * @see     JTable:bind
+	 * @see     Table:bind
 	 * @since   1.5
 	 */
 	public function bind($array, $ignore = '')
 	{
 		if (isset($array['params']) && is_array($array['params']))
 		{
-			$registry = new JRegistry;
+			$registry = new Registry;
 			$registry->loadArray($array['params']);
 			$array['params'] = (string) $registry;
 		}
 
 		if (isset($array['metadata']) && is_array($array['metadata']))
 		{
-			$registry = new JRegistry;
+			$registry = new Registry;
 			$registry->loadArray($array['metadata']);
 			$array['metadata'] = (string) $registry;
 		}
 
-		if (!JFactory::getUser()->authorise('core.admin', 'com_tjvendors.vendor.' . $array['vendor_id']))
+		if (!Factory::getUser()->authorise('core.admin', 'com_tjvendors.vendor.' . $array['vendor_id']))
 		{
-			$actions = JAccess::getActionsFromFile(
+			$actions = Access::getActionsFromFile(
 				JPATH_ADMINISTRATOR . '/components/com_tjvendors/access.xml',
 				"/access/section[@name='vendor']/"
 			);
-			$default_actions = JAccess::getAssetRules('com_tjvendors.vendor.' . $array['vendor_id'])->getData();
+			$default_actions = Access::getAssetRules('com_tjvendors.vendor.' . $array['vendor_id'])->getData();
 			$array_jaccess   = array();
 
 			foreach ($actions as $action)
@@ -86,9 +92,9 @@ public function bind($array, $ignore = '')
 	}
 
 	/**
-	 * This function convert an array of JAccessRule objects into an rules array.
+	 * This function convert an array of Rule objects into an rules array.
 	 *
-	 * @param   array  $jaccessrules  An array of JAccessRule objects.
+	 * @param   array  $jaccessrules  An array of Rule objects.
 	 *
 	 * @return  array
 	 */
@@ -120,7 +126,7 @@ public function check()
 	{
 		jimport('joomla.filesystem.file');
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$this->alias = trim($this->alias);
 
 		if (!$this->alias)
@@ -130,29 +136,29 @@ public function check()
 
 		if ($this->alias)
 		{
-			if (JFactory::getConfig()->get('unicodeslugs') == 1)
+			if (Factory::getConfig()->get('unicodeslugs') == 1)
 			{
-				$this->alias = JFilterOutput::stringURLUnicodeSlug($this->alias);
+				$this->alias = OutputFilter::stringURLUnicodeSlug($this->alias);
 			}
 			else
 			{
-				$this->alias = JFilterOutput::stringURLSafe($this->alias);
+				$this->alias = OutputFilter::stringURLSafe($this->alias);
 			}
 		}
 
 		// Check if event with same alias is present
-		$table = JTable::getInstance('Vendor', 'TjVendorsTable', array('dbo', $db));
+		$table = Table::getInstance('Vendor', 'TjVendorsTable', array('dbo', $db));
 
 		if ($table->load(array('alias' => $this->alias)) && ($table->vendor_id != $this->vendor_id || $this->vendor_id == 0))
 		{
-			$msg = JText::_('COM_TJVENDORS_SAVE_ALIAS_WARNING');
+			$msg = Text::_('COM_TJVENDORS_SAVE_ALIAS_WARNING');
 
 			while ($table->load(array('alias' => $this->alias)))
 			{
 				$this->alias = JString::increment($this->alias, 'dash');
 			}
 
-			JFactory::getApplication()->enqueueMessage($msg, 'warning');
+			Factory::getApplication()->enqueueMessage($msg, 'warning');
 		}
 
 		// If there is an ordering column and this is a new row then get the next ordering value
@@ -161,7 +167,7 @@ public function check()
 			$this->ordering = self::getNextOrder();
 		}
 
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 		$vendor_id = $app->input->get('vendor_id');
 
 		$files = $app->input->files->get('jform', array(), 'raw');
@@ -181,13 +187,13 @@ public function check()
 				switch ($fileError)
 				{
 					case 1:
-						$message = JText::_('COM_TJVENDOR_FILE_SIZE_EXCEEDS');
+						$message = Text::_('COM_TJVENDOR_FILE_SIZE_EXCEEDS');
 						break;
 					case 2:
-						$message = JText::_('COM_TJVENDOR_FILE_SIZE_EXCEEDS_FORM');
+						$message = Text::_('COM_TJVENDOR_FILE_SIZE_EXCEEDS_FORM');
 						break;
 					case 3:
-						$message = JText::_('COM_TJVENDOR_FILE_PARTIAL_UPLOAD_ERROR');
+						$message = Text::_('COM_TJVENDOR_FILE_PARTIAL_UPLOAD_ERROR');
 						break;
 				}
 
@@ -212,14 +218,14 @@ public function check()
 
 				if ($fileSize > 26214400)
 				{
-					$app->enqueueMessage(JText::_('COM_TJVENDOR_FILE_BIGGER_UPLOAD_ERROR'), 'warning');
-					$this->setError(JText::_('COM_TJVENDOR_FILE_BIGGER_UPLOAD_ERROR'));
+					$app->enqueueMessage(Text::_('COM_TJVENDOR_FILE_BIGGER_UPLOAD_ERROR'), 'warning');
+					$this->setError(Text::_('COM_TJVENDOR_FILE_BIGGER_UPLOAD_ERROR'));
 
 					return false;
 				}
 
-				$filename   = JFile::stripExt($singleFile['name']);
-				$extension  = JFile::getExt($singleFile['name']);
+				$filename   = File::stripExt($singleFile['name']);
+				$extension  = File::getExt($singleFile['name']);
 				$fileType   = $singleFile['type'];
 				$filename   = md5(time()) . $filename;
 				$filepath   = '/media/com_tjvendor/vendor/' . $filename . '.' . $extension;
@@ -240,24 +246,24 @@ public function check()
 						// If the mime type is not allowed we don't upload it and show the mime code error to the user
 						if ($result === false)
 						{
-							$app->enqueueMessage(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
-							$this->setError(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
+							$app->enqueueMessage(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
+							$this->setError(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
 
 							return false;
 						}
 					}
 					else
 					{
-						$app->enqueueMessage(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
-						$this->setError(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
+						$app->enqueueMessage(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
+						$this->setError(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
 
 						return false;
 					}
 				}
 				else
 				{
-					$app->enqueueMessage(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
-					$this->setError(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
+					$app->enqueueMessage(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
+					$this->setError(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
 
 					return false;
 				}
@@ -267,16 +273,16 @@ public function check()
 				{
 					if (($extension !== "png") && ($extension !== "jpg") && ($extension !== "jpeg"))
 					{
-						$app->enqueueMessage(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
-						$this->setError(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
+						$app->enqueueMessage(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
+						$this->setError(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
 
 						return false;
 					}
 				}
 				else
 				{
-					$app->enqueueMessage(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
-					$this->setError(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
+					$app->enqueueMessage(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
+					$this->setError(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
 
 					return false;
 				}
@@ -286,26 +292,26 @@ public function check()
 				{
 					if (($fileType !== "image/png") && ($fileType !== "image/jpg") && ($fileType !== "image/jpeg"))
 					{
-						$app->enqueueMessage(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
-						$this->setError(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
+						$app->enqueueMessage(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
+						$this->setError(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
 
 						return false;
 					}
 				}
 				else
 				{
-					$app->enqueueMessage(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
-					$this->setError(JText::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
+					$app->enqueueMessage(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'), 'warning');
+					$this->setError(Text::_('COM_TJVENDORS_WRONG_FILE_UPLOAD'));
 
 					return false;
 				}
 
-				if (! JFile::exists($uploadPath))
+				if (! File::exists($uploadPath))
 				{
-					if (! JFile::upload($fileTemp, $uploadPath))
+					if (! File::upload($fileTemp, $uploadPath))
 					{
-						$app->enqueueMessage(JText::_('COM_TJVENDOR_FILE_MOVING_ERROR'), 'warning');
-						$this->setError(JText::_('COM_TJVENDOR_FILE_MOVING_ERROR'));
+						$app->enqueueMessage(Text::_('COM_TJVENDOR_FILE_MOVING_ERROR'), 'warning');
+						$this->setError(Text::_('COM_TJVENDOR_FILE_MOVING_ERROR'));
 
 						return false;
 					}
@@ -411,7 +417,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 			// Nothing to set publishing state on, return false.
 			else
 			{
-				throw new Exception(500, JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+				throw new Exception(500, Text::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
 			}
 		}
 
@@ -442,7 +448,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 			}
 		}
 
-		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		// If the Table instance value is in the list of primary keys that were set, set the instance.
 		if (in_array($this->$k, $pks))
 		{
 			$this->state = $state;
@@ -456,7 +462,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 	 *
 	 * @return string The asset name
 	 *
-	 * @see JTable::_getAssetName
+	 * @see Table::_getAssetName
 	 */
 	protected function _getAssetName()
 	{
@@ -468,17 +474,17 @@ protected function _getAssetName()
 	/**
 	 * Returns the parent asset's id. If you have a tree structure, retrieve the parent's id using the external key field
 	 *
-	 * @param   JTable   $table  Table name
+	 * @param   Table    $table  Table name
 	 * @param   integer  $id     Id
 	 *
-	 * @see JTable::_getAssetParentId
+	 * @see Table::_getAssetParentId
 	 *
 	 * @return mixed The id on success, false on failure.
 	 */
-	protected function _getAssetParentId(JTable $table = null, $id = null)
+	protected function _getAssetParentId(Table $table = null, $id = null)
 	{
 		// We will retrieve the parent-asset from the Asset-table
-		$assetParent = JTable::getInstance('Asset');
+		$assetParent = Table::getInstance('Asset');
 
 		// Default: if no asset-parent can be found we take the global asset
 		$assetParentId = $assetParent->getRootId();
diff --git a/src/com_tjvendors/admin/tables/vendorclientxref.php b/src/com_tjvendors/admin/tables/vendorclientxref.php
index 341288a8..1e015d11 100644
--- a/src/com_tjvendors/admin/tables/vendorclientxref.php
+++ b/src/com_tjvendors/admin/tables/vendorclientxref.php
@@ -10,13 +10,14 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Table\Table;
 
 /**
  * vendor Table class
  *
  * @since  1.6
  */
-class TjvendorsTablevendorclientxref extends JTable
+class TjvendorsTablevendorclientxref extends Table
 {
 	/**
 	 * Constructor
diff --git a/src/com_tjvendors/admin/tables/vendorfee.php b/src/com_tjvendors/admin/tables/vendorfee.php
index 5991fb52..27f7874f 100644
--- a/src/com_tjvendors/admin/tables/vendorfee.php
+++ b/src/com_tjvendors/admin/tables/vendorfee.php
@@ -10,13 +10,17 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Table\Table;
+use Joomla\Registry\Registry;
 
 /**
  * vendor Table class
  *
  * @since  1.6
  */
-class TjvendorsTablevendorfee extends JTable
+class TjvendorsTablevendorfee extends Table
 {
 	/**
 	 * Constructor
@@ -37,32 +41,32 @@ public function __construct(&$db)
 	 *
 	 * @return  null|string  null is operation was satisfactory, otherwise returns an error
 	 *
-	 * @see     JTable:bind
+	 * @see     Table:bind
 	 * @since   1.5
 	 */
 	public function bind($array, $ignore = '')
 	{
 		if (isset($array['params']) && is_array($array['params']))
 		{
-			$registry = new JRegistry;
+			$registry = new Registry;
 			$registry->loadArray($array['params']);
 			$array['params'] = (string) $registry;
 		}
 
 		if (isset($array['metadata']) && is_array($array['metadata']))
 		{
-			$registry = new JRegistry;
+			$registry = new Registry;
 			$registry->loadArray($array['metadata']);
 			$array['metadata'] = (string) $registry;
 		}
 
-		if (!JFactory::getUser()->authorise('core.admin', 'com_tjvendors.vendorfee.' . $array['id']))
+		if (!Factory::getUser()->authorise('core.admin', 'com_tjvendors.vendorfee.' . $array['id']))
 		{
-			$actions = JAccess::getActionsFromFile(
+			$actions = Access::getActionsFromFile(
 				JPATH_ADMINISTRATOR . '/components/com_tjvendors/access.xml',
 				"/access/section[@name='vendor']/"
 			);
-			$default_actions = JAccess::getAssetRules('com_tjvendors.vendorfee.' . $array['id'])->getData();
+			$default_actions = Access::getAssetRules('com_tjvendors.vendorfee.' . $array['id'])->getData();
 			$array_jaccess   = array();
 
 			foreach ($actions as $action)
@@ -83,9 +87,9 @@ public function bind($array, $ignore = '')
 	}
 
 	/**
-	 * This function convert an array of JAccessRule objects into an rules array.
+	 * This function convert an array of Rule objects into an rules array.
 	 *
-	 * @param   array  $jaccessrules  An array of JAccessRule objects.
+	 * @param   array  $jaccessrules  An array of Rule objects.
 	 *
 	 * @return  array
 	 */
@@ -129,7 +133,7 @@ public function check()
 	 *
 	 * @return string The asset name
 	 *
-	 * @see JTable::_getAssetName
+	 * @see Table::_getAssetName
 	 */
 	protected function _getAssetName()
 	{
diff --git a/src/com_tjvendors/admin/tjvendors.php b/src/com_tjvendors/admin/tjvendors.php
index c1c24d9e..8b8e4b74 100755
--- a/src/com_tjvendors/admin/tjvendors.php
+++ b/src/com_tjvendors/admin/tjvendors.php
@@ -10,11 +10,15 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Uri\Uri;
 
 // Access check.
-if (!JFactory::getUser()->authorise('core.manage', 'com_tjvendors'))
+if (!Factory::getUser()->authorise('core.manage', 'com_tjvendors'))
 {
-	throw new Exception(JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new Exception(Text::_('JERROR_ALERTNOAUTHOR'));
 }
 
 // Include dependancies
@@ -22,11 +26,11 @@
 
 JLoader::registerPrefix('Tjvendors', JPATH_COMPONENT_ADMINISTRATOR);
 
-$controller = JControllerLegacy::getInstance('Tjvendors');
-$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller = BaseController::getInstance('Tjvendors');
+$controller->execute(Factory::getApplication()->input->get('task'));
 $controller->redirect();
-$document = JFactory::getDocument();
-$document->addScript(JUri::root(true) . '/media/com_tjvendor/js/tjvendors.js');
+$document = Factory::getDocument();
+$document->addScript(Uri::root(true) . '/media/com_tjvendor/js/tjvendors.js');
 
 $tjvendorFrontHelper = JPATH_ROOT . '/components/com_tjvendors/helpers/fronthelper.php';
 
diff --git a/src/com_tjvendors/admin/views/payout/tmpl/edit.php b/src/com_tjvendors/admin/views/payout/tmpl/edit.php
index 9ff186f5..1208fe78 100644
--- a/src/com_tjvendors/admin/views/payout/tmpl/edit.php
+++ b/src/com_tjvendors/admin/views/payout/tmpl/edit.php
@@ -8,16 +8,20 @@
  */
 	// No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
 
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
-JHtml::_('formbehavior.chosen', 'select');
-JHtml::_('behavior.keepalive');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+HTMLHelper::_('behavior.tooltip');
+HTMLHelper::_('behavior.formvalidation');
+HTMLHelper::_('formbehavior.chosen', 'select');
+HTMLHelper::_('behavior.keepalive');
 
 // Import CSS
-$document = JFactory::getDocument();
-$document->addStyleSheet(JUri::root() . 'media/com_tjvendors/css/form.css');
+$document = Factory::getDocument();
+$document->addStyleSheet(Uri::root() . 'media/com_tjvendors/css/form.css');
 ?>
 <script type="text/javascript">
 
@@ -35,7 +39,7 @@
 	function confirmationMsg()
 	{
 		var txt;
-		var r = confirm("<?php echo JText::_('CONFIRM_MESSAGE_YES_NO'); ?>");
+		var r = confirm("<?php echo Text::_('CONFIRM_MESSAGE_YES_NO'); ?>");
 
 		if (r == true)
 		{
@@ -50,8 +54,8 @@ function confirmationMsg()
 </script>
 <form method="post" enctype="multipart/form-data" name="adminForm" id="payout-form" class="form-validate">
 	<div class="form-horizontal">
-		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', JText::_('COM_TJVENDORS_TITLE_PAYOUT', true)); ?>
+		<?php echo HTMLHelper::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'general', Text::_('COM_TJVENDORS_TITLE_PAYOUT', true)); ?>
 		<div class="row-fluid">
 			<div class="span10 form-horizontal">
 				<fieldset class="adminform">
@@ -74,10 +78,10 @@ function confirmationMsg()
 				</fieldset>
 			</div>
 		</div>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
-		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTabSet'); ?>
 		<input type="hidden" name="task" value="payout.save"/>
 		<input type="hidden" name="client" value="<?php echo $this->input->get('client', '', 'STRING');?>"/>
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
diff --git a/src/com_tjvendors/admin/views/payout/view.html.php b/src/com_tjvendors/admin/views/payout/view.html.php
index 0ea40a5b..78d0ce13 100644
--- a/src/com_tjvendors/admin/views/payout/view.html.php
+++ b/src/com_tjvendors/admin/views/payout/view.html.php
@@ -10,15 +10,18 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.view');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
 /**
  * View to edit
  *
  * @since  1.6
  */
-class TjvendorsViewPayout extends JViewLegacy
+class TjvendorsViewPayout extends HtmlView
 {
 	protected $state;
 
@@ -40,8 +43,8 @@ public function display($tpl = null)
 		$this->state = $this->get('State');
 		$this->item  = $this->get('Item');
 		$this->form  = $this->get('Form');
-		$this->input = JFactory::getApplication()->input;
-		$com_params = JComponentHelper::getParams('com_tjvendors');
+		$this->input = Factory::getApplication()->input;
+		$com_params = ComponentHelper::getParams('com_tjvendors');
 		$this->bulkPayoutStatus = $com_params->get('bulk_payout');
 
 		// Check for errors.
@@ -63,16 +66,16 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		JFactory::getApplication()->input->set('hidemainmenu', true);
+		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user  = JFactory::getUser();
+		$user  = Factory::getUser();
 
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 
 		// Let's get the extension name
 		$client = $input->get('client', '', 'STRING');
 
-		$viewTitle = JText::_('COM_TJVENDOR_EDIT_PAYOUT');
+		$viewTitle = Text::_('COM_TJVENDOR_EDIT_PAYOUT');
 
 		if (isset($this->item->checked_out))
 		{
@@ -84,7 +87,7 @@ protected function addToolbar()
 		}
 
 		$clientTitle = TjvendorFrontHelper::getClientName($client);
-		JToolbarHelper::title($clientTitle . '  ' . $viewTitle, 'pencil.png');
+		ToolbarHelper::title($clientTitle . '  ' . $viewTitle, 'pencil.png');
 
 		if (empty($this->item->id))
 		{
diff --git a/src/com_tjvendors/admin/views/payouts/tmpl/default.php b/src/com_tjvendors/admin/views/payouts/tmpl/default.php
index 1a61f8a5..a1ef1a13 100644
--- a/src/com_tjvendors/admin/views/payouts/tmpl/default.php
+++ b/src/com_tjvendors/admin/views/payouts/tmpl/default.php
@@ -9,32 +9,37 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 
-JHtml::_('bootstrap.tooltip');
-JHtml::_('behavior.multiselect');
-JHtml::_('formbehavior.chosen', 'select');
+HTMLHelper::_('bootstrap.tooltip');
+HTMLHelper::_('behavior.multiselect');
+HTMLHelper::_('formbehavior.chosen', 'select');
 
 JLoader::import('vendor', JPATH_SITE . '/components/com_tjvendors/models');
 $tjvendorsModelVendor = new TjvendorsModelVendor;
 
 // Import CSS
-$document = JFactory::getDocument();
-$document->addStyleSheet(JUri::root() . 'administrator/components/com_tjvendors/assets/css/tjvendors.css');
-$document->addStyleSheet(JUri::root() . 'media/com_tjvendors/css/list.css');
+$document = Factory::getDocument();
+$document->addStyleSheet(Uri::root() . 'administrator/components/com_tjvendors/assets/css/tjvendors.css');
+$document->addStyleSheet(Uri::root() . 'media/com_tjvendors/css/list.css');
 
-$user      = JFactory::getUser();
+$user      = Factory::getUser();
 $userId    = $user->get('id');
 $listOrder = $this->state->get('list.ordering');
 $listDirn  = $this->state->get('list.direction');
 $canOrder  = $user->authorise('core.edit.state', 'com_tjvendors');
 $saveOrder = $listOrder == 'a.`ordering`';
-$input = JFactory::getApplication()->input;
+$input = Factory::getApplication()->input;
 $client = $input->get('client', '', 'STRING');
 
 if ($saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_tjvendors&task=payouts.saveOrderAjax&tmpl=component';
-	JHtml::_('sortablelist.sortable', 'payoutList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+	HTMLHelper::_('sortablelist.sortable', 'payoutList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
 }
 
 ?>
@@ -65,7 +70,7 @@
 }
 ?>
 
-<form action="<?php echo JRoute::_('index.php?option=com_tjvendors&view=payouts&vendor_id=' . $this->input->get('vendor_id', '', 'INTEGER') . '&client=' . $this->input->get('client', '', 'STRING')); ?>"
+<form action="<?php echo Route::_('index.php?option=com_tjvendors&view=payouts&vendor_id=' . $this->input->get('vendor_id', '', 'INTEGER') . '&client=' . $this->input->get('client', '', 'STRING')); ?>"
 method="post" name="adminForm" id="adminForm">
 <?php
 if(!empty($this->sidebar))
@@ -86,30 +91,30 @@
 		<?php
 			if($this->bulkPayoutStatus != 0)
 			{
-				echo JText::_('COM_TJVENDOR_PAYOUTS_BULK_PAYOUT_NOTICE');
+				echo Text::_('COM_TJVENDOR_PAYOUTS_BULK_PAYOUT_NOTICE');
 			}
 			else
 			{
-				echo JText::_('COM_TJVENDOR_PAYOUTS_SINGLE_CLIENT_PAYOUT_NOTICE');
+				echo Text::_('COM_TJVENDOR_PAYOUTS_SINGLE_CLIENT_PAYOUT_NOTICE');
 			}
 		?>
 	</div>
 	<div id="filter-bar" class="btn-toolbar">
 		<div class="filter-search btn-group pull-left">
 			<label for="filter_search" class="element-invisible">
-				<?php echo JText::_('JSEARCH_FILTER'); ?>
+				<?php echo Text::_('JSEARCH_FILTER'); ?>
 			</label>
 			<input type="text" name="filter_search" id="filter_search"
-				placeholder="<?php echo JText::_('COM_TJVENDOR_PAYOUTS_SEARCH_BY_VENDOR_TITLE'); ?>"
+				placeholder="<?php echo Text::_('COM_TJVENDOR_PAYOUTS_SEARCH_BY_VENDOR_TITLE'); ?>"
 				value="<?php echo $this->escape($this->state->get('filter.search')); ?>"
-				title="<?php echo JText::_('JSEARCH_FILTER'); ?>"/>
+				title="<?php echo Text::_('JSEARCH_FILTER'); ?>"/>
 		</div>
 
 		<div class="btn-group pull-left">
-			<button class="btn hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>">
+			<button class="btn hasTooltip" type="submit" title="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>">
 				<i class="icon-search"></i>
 			</button>
-			<button class="btn hasTooltip" id="clear-search-button" type="button" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>">
+			<button class="btn hasTooltip" id="clear-search-button" type="button" title="<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>">
 				<i class="icon-remove"></i>
 			</button>
 		</div>
@@ -121,11 +126,11 @@
 			<?php
 			if ($this->bulkPayoutStatus != 0)
 			{
-				echo JText::_('COM_TJVENDOR_PAYOUTS_BULK_PAYOUT_NOTICE');
+				echo Text::_('COM_TJVENDOR_PAYOUTS_BULK_PAYOUT_NOTICE');
 			}
 			else
 			{
-				echo JHtml::_('select.genericlist', $this->uniqueClients, "vendor_client", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "client_value", "vendor_client", $this->state->get('filter.vendor_client'));
+				echo HTMLHelper::_('select.genericlist', $this->uniqueClients, "vendor_client", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "client_value", "vendor_client", $this->state->get('filter.vendor_client'));
 				$filterClient = $this->state->get('filter.vendor_client');
 			}
 			?>
@@ -138,7 +143,7 @@
 				<div class="btn-group pull-right hidden-phone">
 					<?php
 						// Making custom filter list
-					 echo JHtml::_('select.genericlist', $this->vendor_details, "vendor_id", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "vendor_id", "vendor_title", $this->state->get('filter.vendor_id'));?>
+					 echo HTMLHelper::_('select.genericlist', $this->vendor_details, "vendor_id", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "vendor_id", "vendor_title", $this->state->get('filter.vendor_id'));?>
 				</div>
 		<?php
 			}
@@ -154,28 +159,28 @@
 				<tr>
 					<?php if (isset($this->items[0]->ordering)): ?>
 					<th width="1%" class="nowrap center hidden-phone">
-						<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.`ordering`', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+						<?php echo HTMLHelper::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.`ordering`', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 					</th>
 					<?php endif; ?>
 
 					<?php if (isset($this->items[0]->state)){} ?>
 
 					<th width="8%">
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_PAYOUT_TITLE', 'vendors.`vendor_title`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_PAYOUT_TITLE', 'vendors.`vendor_title`', $listDirn, $listOrder); ?>
 					</th>
 
 					<th  width="5%">
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_CURRENCY', 'fees.`currency`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_CURRENCY', 'fees.`currency`', $listDirn, $listOrder); ?>
 					</th>
 					<th width="10%">
-						<?php echo JText::_('COM_TJVENDORS_PAYOUTS_PAID_UPTO');  ?>
+						<?php echo Text::_('COM_TJVENDORS_PAYOUTS_PAID_UPTO');  ?>
 					</th>
 					<th  width="10%">
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_PAYABLE_AMOUNT', 'pass.`total`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_PAYABLE_AMOUNT', 'pass.`total`', $listDirn, $listOrder); ?>
 					</th>
 
 					<th  width="10%">
-						<?php echo JText::_('COM_TJVENDORS_PAYOUTS_ACTION'); ?>
+						<?php echo Text::_('COM_TJVENDORS_PAYOUTS_ACTION'); ?>
 					</th>
 				</tr>
 			</thead>
@@ -260,7 +265,7 @@
 						</td>
 
 						<td>
-							<a href= "<?php echo JRoute::_('index.php?option=com_tjvendors&view=payout&layout=edit&vendor_id=' . $item->vendor_id . '&id=' . $item->id . '&client=' . $this->input->get('client', '', 'STRING'));?>"
+							<a href= "<?php echo Route::_('index.php?option=com_tjvendors&view=payout&layout=edit&vendor_id=' . $item->vendor_id . '&id=' . $item->id . '&client=' . $this->input->get('client', '', 'STRING'));?>"
 							<button class="validate btn btn-primary">PAY</button>
 						</td>
 					</tr>
@@ -274,7 +279,7 @@
 		{
 		?>
 			<div class="alert alert-no-items">
-				<?php echo JText::_('COM_TJVENDOR_NO_MATCHING_RESULTS'); ?>
+				<?php echo Text::_('COM_TJVENDOR_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php
 		}
@@ -283,6 +288,6 @@
 		<input type="hidden" name="boxchecked" value="0"/>
 		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>"/>
 		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>"/>
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
diff --git a/src/com_tjvendors/admin/views/payouts/view.html.php b/src/com_tjvendors/admin/views/payouts/view.html.php
index e2cd8a22..803ccc4e 100644
--- a/src/com_tjvendors/admin/views/payouts/view.html.php
+++ b/src/com_tjvendors/admin/views/payouts/view.html.php
@@ -10,8 +10,13 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
-jimport('joomla.application.component.view');
 JLoader::import('com_tjvendors.helpers.fronthelper', JPATH_SITE . '/components');
 
 /**
@@ -19,7 +24,7 @@
  *
  * @since  1.6
  */
-class TjvendorsViewPayouts extends JViewLegacy
+class TjvendorsViewPayouts extends HtmlView
 {
 	protected $items;
 
@@ -47,16 +52,16 @@ public function display($tpl = null)
 		$this->state = $this->get('State');
 		$this->items = $this->get('Items');
 		$this->model = $this->getModel('payouts');
-		$this->input = JFactory::getApplication()->input;
+		$this->input = Factory::getApplication()->input;
 
 		// Getting vendor id from url
 		$vendor_id = $this->input->get('vendor_id', '', 'INT');
-		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'vendors');
-		$tjvendorsModelVendors = JModelLegacy::getInstance('Vendors', 'TjvendorsModel');
+		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'vendors');
+		$tjvendorsModelVendors = BaseDatabaseModel::getInstance('Vendors', 'TjvendorsModel');
 		$vendorsDetail = $tjvendorsModelVendors->getItems();
 		$this->vendor_details = $vendorsDetail;
 		$this->uniqueClients = TjvendorsHelper::getUniqueClients();
-		$com_params = JComponentHelper::getParams('com_tjvendors');
+		$com_params = ComponentHelper::getParams('com_tjvendors');
 		$this->bulkPayoutStatus = $com_params->get('bulk_payout');
 
 		// Check for errors.
@@ -82,7 +87,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$client = $input->get('client', '', 'STRING');
 
 		$state = $this->get('State');
@@ -94,7 +99,7 @@ protected function addToolbar()
 
 		$title = !empty($client) ? $clientTitle . ' : ' : '';
 
-		JToolbarHelper::title($title . JText::_('COM_TJVENDORS_TITLE_PAYOUTS'), 'list.png');
+		ToolbarHelper::title($title . Text::_('COM_TJVENDORS_TITLE_PAYOUTS'), 'list.png');
 
 		if ($canDo->get('core.admin'))
 		{
diff --git a/src/com_tjvendors/admin/views/reports/tmpl/default.php b/src/com_tjvendors/admin/views/reports/tmpl/default.php
index cd367c12..8175a4d4 100644
--- a/src/com_tjvendors/admin/views/reports/tmpl/default.php
+++ b/src/com_tjvendors/admin/views/reports/tmpl/default.php
@@ -9,22 +9,27 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 
-JHtml::_('bootstrap.tooltip');
-JHtml::_('behavior.multiselect');
-JHtml::_('formbehavior.chosen', 'select');
+HTMLHelper::_('bootstrap.tooltip');
+HTMLHelper::_('behavior.multiselect');
+HTMLHelper::_('formbehavior.chosen', 'select');
 
 // Import CSS
-$document = JFactory::getDocument();
-$document->addStyleSheet(JUri::root() . 'administrator/components/com_tjvendors/assets/css/tjvendors.css');
-$document->addStyleSheet(JUri::root() . 'media/com_tjvendors/css/list.css');
+$document = Factory::getDocument();
+$document->addStyleSheet(Uri::root() . 'administrator/components/com_tjvendors/assets/css/tjvendors.css');
+$document->addStyleSheet(Uri::root() . 'media/com_tjvendors/css/list.css');
 
-$user      = JFactory::getUser();
+$user      = Factory::getUser();
 $userId    = $user->get('id');
 $listOrder = $this->state->get('list.ordering');
 $listDirn  = $this->state->get('list.direction');
 $canOrder  = $user->authorise('core.edit.state', 'com_tjvendors');
-$input = JFactory::getApplication()->input;
+$input = Factory::getApplication()->input;
 $client = $input->get('client', '', 'STRING');
 ?>
 <script type="text/javascript">
@@ -77,7 +82,7 @@
 <?php
 }
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_tjvendors&view=reports&vendor_id=' . $this->input->get('vendor_id', '', 'STRING') . '&client=' . $this->input->get('client', '', 'STRING')); ?>"
+<form action="<?php echo Route::_('index.php?option=com_tjvendors&view=reports&vendor_id=' . $this->input->get('vendor_id', '', 'STRING') . '&client=' . $this->input->get('client', '', 'STRING')); ?>"
 method="post" name="adminForm" id="adminForm">
 <?php
 if(!empty($this->sidebar))
@@ -97,7 +102,7 @@
 	if(empty($this->items))
 	{?>
 			<div class="alert alert-no-items">
-				<?php echo JText::_('COM_TJVENDOR_NO_MATCHING_RESULTS'); ?>
+				<?php echo Text::_('COM_TJVENDOR_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php
 	}
@@ -106,19 +111,19 @@
 
 		<div class="filter-search btn-group pull-left">
 			<label for="filter_search" class="element-invisible">
-				<?php echo JText::_('JSEARCH_FILTER'); ?>
+				<?php echo Text::_('JSEARCH_FILTER'); ?>
 			</label>
 			<input type="text" name="filter_search" id="filter_search"
-				placeholder="<?php echo JText::_('COM_TJVENDOR_PAYOUTS_SEARCH_BY_VENDOR_TITLE'); ?>"
+				placeholder="<?php echo Text::_('COM_TJVENDOR_PAYOUTS_SEARCH_BY_VENDOR_TITLE'); ?>"
 				value="<?php echo $this->escape($this->state->get('filter.search')); ?>"
-				title="<?php echo JText::_('JSEARCH_FILTER'); ?>"/>
+				title="<?php echo Text::_('JSEARCH_FILTER'); ?>"/>
 		</div>
 
 		<div class="btn-group pull-left">
-			<button class="btn hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>">
+			<button class="btn hasTooltip" type="submit" title="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>">
 				<i class="icon-search"></i>
 			</button>
-			<button class="btn hasTooltip" id="clear-search-button" type="button" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>">
+			<button class="btn hasTooltip" id="clear-search-button" type="button" title="<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>">
 				<i class="icon-remove"></i>
 			</button>
 		</div>
@@ -134,7 +139,7 @@
 		</div>
 
 		<div class="btn-group pull-left hidden-phone">
-			<button class="btn hasTooltip" id="clear-calendar" type="button" title="<?php echo JText::_('JSEARCH_CALENDAR_CLEAR'); ?>">
+			<button class="btn hasTooltip" id="clear-calendar" type="button" title="<?php echo Text::_('JSEARCH_CALENDAR_CLEAR'); ?>">
 				<i class="icon-remove"></i>
 			</button>
 		</div>
@@ -143,28 +148,28 @@
 		<div class="row-fluid btn-group pull-left hidden-phone">
 				<div class="btn-group hidden-phone">
 					<label for="limit" class="element-invisible">
-						<?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?>
+						<?php echo Text::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?>
 					</label>
 					<?php echo $this->pagination->getLimitBox(); ?>
 				</div>
 				<div class="btn-group hidden-phone">
 				<?php
-				echo JHtml::_('select.genericlist', $this->uniqueClients, "vendor_client", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "client_value", "vendor_client", $this->state->get('filter.vendor_client'));
+				echo HTMLHelper::_('select.genericlist', $this->uniqueClients, "vendor_client", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "client_value", "vendor_client", $this->state->get('filter.vendor_client'));
 				echo $filterClient = $this->state->get('filter.vendor_client'); 	?>
 				</div>
 
 			<div class="btn-group hidden-phone">
 				<?php
-				$transactionType[] = array("transactionType"=>JText::_('COM_TJVENDORS_REPORTS_FILTER_ALL_TRANSACTIONS'), "transactionValue" => "0");
-				$transactionType[] = array("transactionType"=>JText::_('COM_TJVENDORS_REPORTS_FILTER_CREDIT'), "transactionValue" => JText::_('COM_TJVENDORS_REPORTS_FILTER_CREDIT'));
-				$transactionType[] = array("transactionType"=>JText::_('COM_TJVENDORS_REPORTS_FILTER_DEBIT'), "transactionValue" => JText::_('COM_TJVENDORS_REPORTS_FILTER_DEBIT'));
-				echo JHtml::_('select.genericlist', $transactionType, "transactionType", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "transactionValue", "transactionType", $this->state->get('filter.transactionType'));?>
+				$transactionType[] = array("transactionType"=>Text::_('COM_TJVENDORS_REPORTS_FILTER_ALL_TRANSACTIONS'), "transactionValue" => "0");
+				$transactionType[] = array("transactionType"=>Text::_('COM_TJVENDORS_REPORTS_FILTER_CREDIT'), "transactionValue" => Text::_('COM_TJVENDORS_REPORTS_FILTER_CREDIT'));
+				$transactionType[] = array("transactionType"=>Text::_('COM_TJVENDORS_REPORTS_FILTER_DEBIT'), "transactionValue" => Text::_('COM_TJVENDORS_REPORTS_FILTER_DEBIT'));
+				echo HTMLHelper::_('select.genericlist', $transactionType, "transactionType", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "transactionValue", "transactionType", $this->state->get('filter.transactionType'));?>
 			</div>
 			<div class="btn-group hidden-phone">
 				<?php
 					// Making custom filter list
 					$this->currencies = TjvendorsHelper::getCurrencies($this->state->get('filter.vendor_id'));
-					$currencyList[] = JText::_('JFILTER_PAYOUT_CHOOSE_CURRENCY');
+					$currencyList[] = Text::_('JFILTER_PAYOUT_CHOOSE_CURRENCY');
 
 					if ($this->currencies !== false)
 					{
@@ -174,21 +179,21 @@
 						}
 					}
 
-				 echo JHtml::_('select.genericlist', $currencyList, "currency", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "currency", "currency", $this->state->get('filter.currency'));?>
+				 echo HTMLHelper::_('select.genericlist', $currencyList, "currency", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "currency", "currency", $this->state->get('filter.currency'));?>
 			</div>
 			<div class="btn-group hidden-phone">
 				<?php
 					// Making custom filter list
-				 echo JHtml::_('select.genericlist', $this->vendor_details, "vendor_id", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "vendor_id", "vendor_title", $this->state->get('filter.vendor_id'));?>
+				 echo HTMLHelper::_('select.genericlist', $this->vendor_details, "vendor_id", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "vendor_id", "vendor_title", $this->state->get('filter.vendor_id'));?>
 			</div>
 		</div>
 
 	<div class="pull-left alert alert-info">
 		<div>
-			<?php echo JText::_('COM_TJVENDORS_REPORTS_CREDIT_NOTE');?>
+			<?php echo Text::_('COM_TJVENDORS_REPORTS_CREDIT_NOTE');?>
 		</div>
 		<div>
-			<?php echo JText::_('COM_TJVENDORS_REPORTS_DEBIT_NOTE'); ?>
+			<?php echo Text::_('COM_TJVENDORS_REPORTS_DEBIT_NOTE'); ?>
 		</div>
 	</div>
 	</div>
@@ -204,24 +209,24 @@
 				<tr>
 					<?php if (isset($this->items[0]->ordering)): ?>
 					<th width="1%" class="nowrap center hidden-phone">
-						<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.`ordering`', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+						<?php echo HTMLHelper::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.`ordering`', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 					</th>
 					<?php endif; ?>
 
 					<?php if (isset($this->items[0]->state)){} ?>
 
 					<th class='left' width="10%">
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_TRANSACTION_ID', 'pass.`transaction_id`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_TRANSACTION_ID', 'pass.`transaction_id`', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left' width="8%">
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_PAYOUT_TITLE', 'vendors.`vendor_title`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_PAYOUT_TITLE', 'vendors.`vendor_title`', $listDirn, $listOrder); ?>
 					</th>
 					<?php
 						$filterClient = $this->state->get('filter.vendor_client');
 						if(empty($filterClient))
 						{?>
 							<th class='left' width="5%">
-								<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_CLIENT', 'vendors.`vendor_client`', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_CLIENT', 'vendors.`vendor_client`', $listDirn, $listOrder); ?>
 							</th>
 					<?php
 						}
@@ -230,7 +235,7 @@
 						if(empty($filterCurrency))
 						{?>
 							<th class='left' width="5%">
-							<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_CURRENCY', 'pass.`currency`', $listDirn, $listOrder); ?>
+							<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_CURRENCY', 'pass.`currency`', $listDirn, $listOrder); ?>
 							</th>
 					<?php
 						}
@@ -240,7 +245,7 @@
 						if($transactionType == "credit" || empty($transactionType))
 						{?>
 							<th class='left' width="10%">
-								<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_CREDIT_AMOUNT', 'pass.`credit`', $listDirn, $listOrder);?>
+								<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_CREDIT_AMOUNT', 'pass.`credit`', $listDirn, $listOrder);?>
 							</th>
 					<?php
 						}
@@ -248,27 +253,27 @@
 						if($transactionType == "debit" || empty($transactionType))
 						{?>
 							<th class='left' width="10%">
-								<?php	echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_DEBIT_AMOUNT', 'pass.`debit`', $listDirn, $listOrder);?>
+								<?php	echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_DEBIT_AMOUNT', 'pass.`debit`', $listDirn, $listOrder);?>
 							</th>
 					<?php
 						}
 					?>
 					<th class='left' width="12%">
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_REFERENCE_ORDER_ID', 'pass.`reference_order_id`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_REFERENCE_ORDER_ID', 'pass.`reference_order_id`', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left' width="10%">
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_PAYABLE_AMOUNT', 'pass.`total`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_PAYOUTS_PAYABLE_AMOUNT', 'pass.`total`', $listDirn, $listOrder); ?>
 					</th>
 
 					<th class='left' width="10%">
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_TRANSACTION_TIME', 'pass.`transaction_time`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_TRANSACTION_TIME', 'pass.`transaction_time`', $listDirn, $listOrder); ?>
 					</th>
 
 					<th class='left' width="10%">
-						<?php echo JText::_('COM_TJVENDORS_REPORTS_CUSTOMER_NOTE'); ?>
+						<?php echo Text::_('COM_TJVENDORS_REPORTS_CUSTOMER_NOTE'); ?>
 					</th>
 					<th class='left' width="10%">
-						<?php echo JText::_('COM_TJVENDORS_REPORTS_STATUS'); ?>
+						<?php echo Text::_('COM_TJVENDORS_REPORTS_STATUS'); ?>
 					</th>
 				</tr>
 			</thead>
@@ -280,19 +285,19 @@
 						<tr>
 							<th colspan="8"></th>
 							<th colspan="12">
-									<?php echo JText::_('COM_TJVENDORS_REPORTS_TOTAL_CREDIT_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['creditAmount'] . '&nbsp' . $filterCurrency;?>
+									<?php echo Text::_('COM_TJVENDORS_REPORTS_TOTAL_CREDIT_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['creditAmount'] . '&nbsp' . $filterCurrency;?>
 							</th>
 						</tr>
 						<tr>
 							<th colspan="8"></th>
 							<th colspan="12">
-									<?php echo JText::_('COM_TJVENDORS_REPORTS_TOTAL_DEBIT_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['debitAmount'] . '&nbsp' . $filterCurrency;?>
+									<?php echo Text::_('COM_TJVENDORS_REPORTS_TOTAL_DEBIT_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['debitAmount'] . '&nbsp' . $filterCurrency;?>
 							</th>
 						</tr>
 						<tr>
 							<th colspan="8"></th>
 							<th colspan="12">
-									<?php echo JText::_('COM_TJVENDORS_REPORTS_TOTAL_PENDING_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['pendingAmount'] . '&nbsp' . $filterCurrency?>
+									<?php echo Text::_('COM_TJVENDORS_REPORTS_TOTAL_PENDING_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['pendingAmount'] . '&nbsp' . $filterCurrency?>
 							</th>
 						</tr>
 				</div>
@@ -307,9 +312,9 @@
 			</tfoot>
 			<tbody>
 				<?php
-				$options[] = array("type"=>JText::_('COM_TJVENDORS_STATUS_PAID'), "value" => "1");
-				$options[] = array("type"=>JText::_('COM_TJVENDORS_STATUS_UNPAID'), "value" => "0");
-				$doneOptions = JText::_('COM_TJVENDORS_STATUS_CREDIT_DONE');
+				$options[] = array("type"=>Text::_('COM_TJVENDORS_STATUS_PAID'), "value" => "1");
+				$options[] = array("type"=>Text::_('COM_TJVENDORS_STATUS_UNPAID'), "value" => "0");
+				$doneOptions = Text::_('COM_TJVENDORS_STATUS_CREDIT_DONE');
 
 				foreach ($this->items as $i => $item)
 				{
@@ -413,6 +418,6 @@
 		<input type="hidden" name="boxchecked" value="0"/>
 		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>"/>
 		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>"/>
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
diff --git a/src/com_tjvendors/admin/views/reports/view.html.php b/src/com_tjvendors/admin/views/reports/view.html.php
index b310797b..ff75c67c 100644
--- a/src/com_tjvendors/admin/views/reports/view.html.php
+++ b/src/com_tjvendors/admin/views/reports/view.html.php
@@ -10,8 +10,12 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
-jimport('joomla.application.component.view');
 JLoader::import('com_tjvendors.helpers.fronthelper', JPATH_SITE . '/components');
 
 /**
@@ -19,7 +23,7 @@
  *
  * @since  1.6
  */
-class TjvendorsViewReports extends JViewLegacy
+class TjvendorsViewReports extends HtmlView
 {
 	protected $items;
 
@@ -47,12 +51,12 @@ public function display($tpl = null)
 		$this->items = $this->get('Items');
 		$this->model = $this->getModel('reports');
 		$this->pagination = $this->get('Pagination');
-		$this->input = JFactory::getApplication()->input;
+		$this->input = Factory::getApplication()->input;
 
 		// Getting vendor id from url
 		$vendor_id = $this->input->get('vendor_id', '', 'INT');
-		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'vendors');
-		$tjvendorsModelVendors = JModelLegacy::getInstance('Vendors', 'TjvendorsModel');
+		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'vendors');
+		$tjvendorsModelVendors = BaseDatabaseModel::getInstance('Vendors', 'TjvendorsModel');
 		$vendorsDetail = $tjvendorsModelVendors->getItems();
 		$this->vendor_details = $vendorsDetail;
 		$this->uniqueClients = TjvendorsHelper::getUniqueClients();
@@ -86,7 +90,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$this->client = $input->get('client', '', 'STRING');
 
 		$state = $this->get('State');
@@ -98,7 +102,7 @@ protected function addToolbar()
 
 		$title = !empty($this->client) ? $clientTitle . ' : ' : '';
 
-		JToolbarHelper::title($title . JText::_('COM_TJVENDORS_TITLE_REPORTS'), 'list.png');
+		ToolbarHelper::title($title . Text::_('COM_TJVENDORS_TITLE_REPORTS'), 'list.png');
 
 		if ($canDo->get('core.admin'))
 		{
diff --git a/src/com_tjvendors/admin/views/vendor/tmpl/edit.php b/src/com_tjvendors/admin/views/vendor/tmpl/edit.php
index 44f46c57..7ae9a899 100644
--- a/src/com_tjvendors/admin/views/vendor/tmpl/edit.php
+++ b/src/com_tjvendors/admin/views/vendor/tmpl/edit.php
@@ -1,29 +1,36 @@
 <?php
 /**
- * @version    SVN:
- * @package    Com_Tjvendors
- * @author     Techjoomla <contact@techjoomla.com>
- * @copyright  Copyright  2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJVendors
+ * @subpackage  com_tjvendors
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
+
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
-JHtml::_('formbehavior.chosen', 'select');
-JHtml::_('behavior.keepalive');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+HTMLHelper::_('behavior.tooltip');
+HTMLHelper::_('behavior.formvalidation');
+HTMLHelper::_('formbehavior.chosen', 'select');
+HTMLHelper::_('behavior.keepalive');
 
-$lang = JFactory::getLanguage();
+$lang = Factory::getLanguage();
 $lang->load('plg_payment_paypal', JPATH_ADMINISTRATOR);
 
 ?>
 <script type="text/javascript">
 var _URL                              = window.URL || window.webkitURL;
-var allowedMediaSizeErrorMessage      = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_SIZE_VALIDATE") . $this->params->get('image_size') . 'KB';?>";
-var allowedImageDimensionErrorMessage = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_DIMENSIONS_VALIDATE");?>";
-var allowedImageTypeErrorMessage      = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_IMAGE_TYPE_VALIDATION");?>";
+var allowedMediaSizeErrorMessage      = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_SIZE_VALIDATE") . $this->params->get('image_size') . 'KB';?>";
+var allowedImageDimensionErrorMessage = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_DIMENSIONS_VALIDATE");?>";
+var allowedImageTypeErrorMessage      = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_IMAGE_TYPE_VALIDATION");?>";
 const vendorAllowedMediaSize          = '<?php echo $max_images_size = $this->params->get('image_size') * 1024; ?>';
 var vendor_id                         = '<?php echo $this->item->vendor_id;?>';
 var client                            = '<?php echo $this->client;?>';
@@ -31,11 +38,11 @@
 tjVAdmin.vendor.initVendorJs();
 </script>
 
-<form action="<?php echo JRoute::_('index.php?option=com_tjvendors&layout=edit&client='.$this->input->get('client', '', 'INTEGER').'&vendor_id=' . (int) $this->item->vendor_id); ?>"
+<form action="<?php echo Route::_('index.php?option=com_tjvendors&layout=edit&client='.$this->input->get('client', '', 'INTEGER').'&vendor_id=' . (int) $this->item->vendor_id); ?>"
 	method="post" enctype="multipart/form-data" name="adminForm" id="adminForm" class="form-validate">
 	<div class="form-horizontal">
-		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'personal')); ?>
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'personal', JText::_('COM_TJVENDORS_TITLE_PERSONAL', true)); ?>
+		<?php echo HTMLHelper::_('bootstrap.startTabSet', 'myTab', array('active' => 'personal')); ?>
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'personal', Text::_('COM_TJVENDORS_TITLE_PERSONAL', true)); ?>
 		<div class="row-fluid">
 			<div class="span10 form-horizontal">
 				<fieldset class="adminform">
@@ -49,7 +56,7 @@
 					<?php
 						if ($this->item->vendor_id != 0)
 						{
-							$input=JFactory::getApplication()->input;
+							$input=Factory::getApplication()->input;
 							$client=$input->get('client', '', 'STRING');
 						?>
 							<input type="hidden" name="jform[vendor_title]" id="jform_vendor_titile_hidden" value="<?php echo $this->item->vendor_title; ?>" />
@@ -57,14 +64,14 @@
 							<input type="hidden" name="jform[vendor_logo]" id="jform_vendor_logo_hidden" value="<?php echo $this->item->vendor_logo; ?>" />
 						<?php echo $this->form->renderField('user_id');?>
 							<div class="pull-left alert alert-info">
-						<?php echo JText::_('COM_TJVENDORS_DISPLAY_YOU_ARE_ALREADY_A_VENDOR_AS');?>
-							<a href="<?php echo JRoute::_(JURI::root() . '/administrator/index.php?option=com_tjvendors&view=vendor&layout=update&client=' . $client . '&vendor_id='.$this->item->vendor_id);?>"><strong>
+						<?php echo Text::_('COM_TJVENDORS_DISPLAY_YOU_ARE_ALREADY_A_VENDOR_AS');?>
+							<a href="<?php echo Route::_(JURI::root() . '/administrator/index.php?option=com_tjvendors&view=vendor&layout=update&client=' . $client . '&vendor_id='.$this->item->vendor_id);?>"><strong>
 							<?php
 								echo $this->item->vendor_title."</a></strong>";
-								echo " ".JText::_('COM_TJVENDORS_DISPLAY_DO_YOU_WANT_TO_ADD');
+								echo " ".Text::_('COM_TJVENDORS_DISPLAY_DO_YOU_WANT_TO_ADD');
 								$tjvendorFrontHelper = new TjvendorFrontHelper();
 								echo $clientTitle = $tjvendorFrontHelper->getClientName($client);
-								echo JText::_('COM_TJVENDORS_DISPLAY_AS_A_CLIENT');
+								echo Text::_('COM_TJVENDORS_DISPLAY_AS_A_CLIENT');
 							?>
 							</div>
 					<?php }
@@ -80,7 +87,7 @@
 							if(empty($this->item->vendor_logo)) :?>
 								<input type="hidden" name="jform[vendor_logo]" id="jform_vendor_logo_hidden" value="/administrator/components/com_tjvendors/assets/images/default.png" />
 									<div class="control-group">
-											<div class="controls "><img src="<?php echo JUri::root() . "/administrator/components/com_tjvendors/assets/images/default.png"; ?>" class="span3 col-md-3 img-thumbnail marginb10 img-polaroid"></div>
+											<div class="controls "><img src="<?php echo Uri::root() . "/administrator/components/com_tjvendors/assets/images/default.png"; ?>" class="span3 col-md-3 img-thumbnail marginb10 img-polaroid"></div>
 										</div>
 
 							<?php endif;
@@ -88,7 +95,7 @@
 							<div class="controls">
 							<div class="alert alert-warning">
 							<?php
-							echo sprintf(JText::_("COM_TJVENDORS_FILE_UPLOAD_ALLOWED_EXTENSIONS"), 'jpg, jpeg, png');
+							echo sprintf(Text::_("COM_TJVENDORS_FILE_UPLOAD_ALLOWED_EXTENSIONS"), 'jpg, jpeg, png');
 							?>
 							</div>
 							<?php
@@ -97,29 +104,29 @@
 				</fieldset>
 			</div>
 		</div>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'name', JText::_('COM_TJVENDORS_TITLE_PAYMENT_DETAILS')); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'name', Text::_('COM_TJVENDORS_TITLE_PAYMENT_DETAILS')); ?>
 				<?php echo $this->form->getInput('payment_gateway'); ?>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
 		<?php
 			if($this->item->vendor_id != 0)
 			{
 			?>
 				<div>
 					<button type="button" class="btn btn-default  btn-primary"  onclick="Joomla.submitbutton('vendor.save')">
-						<span><?php echo JText::_('JSUBMIT'); ?></span>
+						<span><?php echo Text::_('JSUBMIT'); ?></span>
 					</button>
 					<button class="btn  btn-default" onclick="Joomla.submitbutton('vendor.cancel')">
-						<span><?php echo JText::_('JCANCEL'); ?></span>
+						<span><?php echo Text::_('JCANCEL'); ?></span>
 					</button>
 				</div>
 			<?php
 			}
 		?>
-		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTabSet'); ?>
 		<input type="hidden" name="task" value=""/>
 		<input type="hidden" name="client" value="<?php echo $this->input->get('client', '', 'STRING');?>"/>
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
 
diff --git a/src/com_tjvendors/admin/views/vendor/tmpl/update.php b/src/com_tjvendors/admin/views/vendor/tmpl/update.php
index 9c11617a..1b890c16 100644
--- a/src/com_tjvendors/admin/views/vendor/tmpl/update.php
+++ b/src/com_tjvendors/admin/views/vendor/tmpl/update.php
@@ -8,21 +8,26 @@
  */
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
-JHtml::_('formbehavior.chosen', 'select');
-JHtml::_('behavior.keepalive');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+HTMLHelper::_('behavior.tooltip');
+HTMLHelper::_('behavior.formvalidation');
+HTMLHelper::_('formbehavior.chosen', 'select');
+HTMLHelper::_('behavior.keepalive');
 
-$lang = JFactory::getLanguage();
+$lang = Factory::getLanguage();
 $lang->load('plg_payment_paypal', JPATH_ADMINISTRATOR);
 ?>
 <script type="text/javascript">
 var _URL                              = window.URL || window.webkitURL;
-var allowedMediaSizeErrorMessage      = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_SIZE_VALIDATE") . $this->params->get('image_size') . 'KB';?>";
-var allowedImageDimensionErrorMessage = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_DIMENSIONS_VALIDATE");?>";
-var allowedImageTypeErrorMessage      = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_IMAGE_TYPE_VALIDATION");?>";
+var allowedMediaSizeErrorMessage      = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_SIZE_VALIDATE") . $this->params->get('image_size') . 'KB';?>";
+var allowedImageDimensionErrorMessage = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_DIMENSIONS_VALIDATE");?>";
+var allowedImageTypeErrorMessage      = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_IMAGE_TYPE_VALIDATION");?>";
 var vendor_id                         = '<?php echo $this->item->vendor_id;?>';
 var client                            = '<?php echo $this->client;?>';
 var layout                            = '<?php echo "update";?>';
@@ -30,12 +35,12 @@
 tjVAdmin.vendor.initVendorJs();
 </script>
 
-<form action="<?php echo JRoute::_('index.php?option=com_tjvendors&layout=edit&client='.$this->input->get('client', '', 'INTEGER').'&vendor_id=' . (int) $this->item->vendor_id); ?>"
+<form action="<?php echo Route::_('index.php?option=com_tjvendors&layout=edit&client='.$this->input->get('client', '', 'INTEGER').'&vendor_id=' . (int) $this->item->vendor_id); ?>"
 	method="post" enctype="multipart/form-data" name="adminForm" id="adminForm" class="form-validate">
 	<input type="hidden" name="jform[state]" value="<?php echo $this->item->state; ?>" />
 	<div class="form-horizontal">
-		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'personal')); ?>
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'personal', JText::_('COM_TJVENDORS_TITLE_PERSONAL', true)); ?>
+		<?php echo HTMLHelper::_('bootstrap.startTabSet', 'myTab', array('active' => 'personal')); ?>
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'personal', Text::_('COM_TJVENDORS_TITLE_PERSONAL', true)); ?>
 		<div class="row-fluid">
 			<div class="span10 form-horizontal">
 				<fieldset class="adminform">
@@ -58,31 +63,31 @@
 						<div class="controls">
 						<div class="alert alert-warning">
 						<?php
-						echo sprintf(JText::_("COM_TJVENDORS_FILE_UPLOAD_ALLOWED_EXTENSIONS"), 'jpg, jpeg, png');
+						echo sprintf(Text::_("COM_TJVENDORS_FILE_UPLOAD_ALLOWED_EXTENSIONS"), 'jpg, jpeg, png');
 						?>
 						</div>
 
 						<input type="hidden" name="jform[vendor_logo]" id="jform_vendor_logo_hidden" value="<?php echo $this->item->vendor_logo; ?>" />
 						<?php if (!empty($this->item->vendor_logo)) : ?>
 							<div class="control-group">
-								<div><img src="<?php echo JUri::root() . $this->item->vendor_logo; ?>" class="span3 col-md-3 img-thumbnail pull-left marginb10 img-polaroid"></div>
+								<div><img src="<?php echo Uri::root() . $this->item->vendor_logo; ?>" class="span3 col-md-3 img-thumbnail pull-left marginb10 img-polaroid"></div>
 							</div>
 						<?php endif;
 					?>
 				</fieldset>
 			</div>
 		</div>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'name', JText::_('COM_TJVENDORS_TITLE_PAYMENT_DETAILS')); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
+		<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'name', Text::_('COM_TJVENDORS_TITLE_PAYMENT_DETAILS')); ?>
 			<?php echo $this->form->getInput('payment_gateway');?>
 						<div id="payment_details"></div>
 					<input type="hidden" name="jform[primaryEmail]" id="jform_primaryEmail" value="0" />
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
-		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
+		<?php echo HTMLHelper::_('bootstrap.endTabSet'); ?>
 		<input type="hidden" name="task" value=""/>
 		<input type="hidden" name="client" value="<?php echo $this->input->get('client', '', 'STRING');?>"/>
 		<input type="hidden" name="layout" value="<?php echo $this->input->get('layout', '', 'STRING');?>"/>
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
 
diff --git a/src/com_tjvendors/admin/views/vendor/view.html.php b/src/com_tjvendors/admin/views/vendor/view.html.php
index 827d09ad..59205447 100755
--- a/src/com_tjvendors/admin/views/vendor/view.html.php
+++ b/src/com_tjvendors/admin/views/vendor/view.html.php
@@ -1,22 +1,27 @@
 <?php
 /**
- * @version    SVN:
- * @package    Com_Tjvendors
- * @author     Techjoomla <contact@techjoomla.com>
- * @copyright  Copyright  2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJVendors
+ * @subpackage  com_tjvendors
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-// No direct access
+
 defined('_JEXEC') or die;
 
-jimport('joomla.application.component.view');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
 /**
  * View to edit
  *
  * @since  1.6
  */
-class TjvendorsViewVendor extends JViewLegacy
+class TjvendorsViewVendor extends HtmlView
 {
 	protected $state;
 
@@ -37,15 +42,15 @@ class TjvendorsViewVendor extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 		$this->state = $this->get('State');
 		$this->item  = $this->get('Item');
 		$this->form  = $this->get('Form');
-		$this->params = JComponentHelper::getParams('com_tjvendors');
-		$this->input = JFactory::getApplication()->input;
-		JText::script('COM_TJVENDOR_DUPLICARE_VENDOR_ERROR');
-		JText::script('COM_TJVENDOR_PAYMENTGATEWAY_NO_FIELD_MESSAGE');
-		JText::script('COM_TJVENDOR_USER_ERROR');
+		$this->params = ComponentHelper::getParams('com_tjvendors');
+		$this->input = Factory::getApplication()->input;
+		Text::script('COM_TJVENDOR_DUPLICARE_VENDOR_ERROR');
+		Text::script('COM_TJVENDOR_PAYMENTGATEWAY_NO_FIELD_MESSAGE');
+		Text::script('COM_TJVENDOR_USER_ERROR');
 		$this->client = $this->input->get('client', '', 'STRING');
 
 		if (empty($this->item->vendor_id))
@@ -77,21 +82,21 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		JFactory::getApplication()->input->set('hidemainmenu', true);
+		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user  = JFactory::getUser();
+		$user  = Factory::getUser();
 		$isNew = ($this->item->vendor_id == 0);
 
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$this->full_client = $input->get('client', '', 'STRING');
 
 		if ($isNew)
 		{
-			$viewTitle = JText::_('COM_TJVENDOR_VENDORS_ADD_USER_SPECIFIC_COMM');
+			$viewTitle = Text::_('COM_TJVENDOR_VENDORS_ADD_USER_SPECIFIC_COMM');
 		}
 		else
 		{
-			$viewTitle = JText::_('COM_TJVENDOR_VENDORS_EDIT_USER_SPECIFIC_COMM');
+			$viewTitle = Text::_('COM_TJVENDOR_VENDORS_EDIT_USER_SPECIFIC_COMM');
 		}
 
 		if (isset($this->item->checked_out))
@@ -105,7 +110,7 @@ protected function addToolbar()
 
 		$canDo = TjvendorsHelper::getActions();
 		$clientTitle = TjvendorFrontHelper::getClientName($this->client);
-		JToolbarHelper::title($clientTitle . '  ' . $viewTitle, 'pencil.png');
+		ToolbarHelper::title($clientTitle . '  ' . $viewTitle, 'pencil.png');
 
 		// If not checked out, can save the item.
 		if (!$checkedOut && ($canDo->get('core.edit') || ($canDo->get('core.create'))))
diff --git a/src/com_tjvendors/admin/views/vendorfee/tmpl/edit.php b/src/com_tjvendors/admin/views/vendorfee/tmpl/edit.php
index 5812d973..2461a4c7 100644
--- a/src/com_tjvendors/admin/views/vendorfee/tmpl/edit.php
+++ b/src/com_tjvendors/admin/views/vendorfee/tmpl/edit.php
@@ -1,19 +1,22 @@
 <?php
 /**
- * @version    SVN:
- * @package    Com_Tjvendors
- * @author     Techjoomla <contact@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJVendors
+ * @subpackage  com_tjvendors
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-// No direct access
+
 defined('_JEXEC') or die();
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
 
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
-JHtml::_('formbehavior.chosen', 'select');
-JHtml::_('behavior.keepalive');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+HTMLHelper::_('behavior.tooltip');
+HTMLHelper::_('behavior.formvalidation');
+HTMLHelper::_('formbehavior.chosen', 'select');
+HTMLHelper::_('behavior.keepalive');
 
 ?>
 <script type="text/javascript">
@@ -21,7 +24,7 @@
 </script>
 
 <form action="
-<?php echo JRoute::_('index.php?option=com_tjvendors&view=vendorfee&layout=edit&id=' . (int) $this->id . '&vendor_id=' . (int) $this->item->vendor_id);?>"
+<?php echo Route::_('index.php?option=com_tjvendors&view=vendorfee&layout=edit&id=' . (int) $this->id . '&vendor_id=' . (int) $this->item->vendor_id);?>"
 method="post" enctype="multipart/form-data" name="adminform" id="vendorfee-form" class="form-validate">
 
 	<div class="form-horizontal">
@@ -55,7 +58,7 @@
 		<input type="hidden" name="vendor_id" value="<?php echo $this->vendor_id;?>" />
 		<input type="hidden" name="client" value="<?php echo $this->input->get('client', '', 'STRING');?>" />
 		<input type="hidden" name="jform[id]" value="<?php echo $this->id; ?>" />
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
 
diff --git a/src/com_tjvendors/admin/views/vendorfee/view.html.php b/src/com_tjvendors/admin/views/vendorfee/view.html.php
index 03c4ae7e..96ea0de6 100644
--- a/src/com_tjvendors/admin/views/vendorfee/view.html.php
+++ b/src/com_tjvendors/admin/views/vendorfee/view.html.php
@@ -10,15 +10,17 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.view');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
 /**
  * View to edit
  *
  * @since  1.6
  */
-class TjvendorsViewVendorFee extends JViewLegacy
+class TjvendorsViewVendorFee extends HtmlView
 {
 	protected $state;
 
@@ -37,15 +39,15 @@ class TjvendorsViewVendorFee extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$this->vendor_id = $input->get('vendor_id', '', 'INT');
 		$this->id = $input->get('id', '', 'INT');
 		$this->state = $this->get('State');
 		$this->item  = $this->get('Item');
 		$this->form  = $this->get('Form');
-		$this->input = JFactory::getApplication()->input;
-		JText::script('COM_TJVENDORS_FEES_NEGATIVE_NUMBER_ERROR');
-		JText::script('COM_TJVENDORS_FEES_PERCENT_ERROR');
+		$this->input = Factory::getApplication()->input;
+		Text::script('COM_TJVENDORS_FEES_NEGATIVE_NUMBER_ERROR');
+		Text::script('COM_TJVENDORS_FEES_PERCENT_ERROR');
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -66,25 +68,25 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		JFactory::getApplication()->input->set('hidemainmenu', true);
+		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user  = JFactory::getUser();
+		$user  = Factory::getUser();
 		$isNew = ($this->item->vendor_id == 0);
 
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$client = $input->get('client', '', 'STRING');
 
 		if ($isNew)
 		{
-			$viewTitle = JText::_('COM_TJVENDOR_NEW_USER_SPECIFIC_COMMISSION');
+			$viewTitle = Text::_('COM_TJVENDOR_NEW_USER_SPECIFIC_COMMISSION');
 		}
 		else
 		{
-			$viewTitle = JText::_('COM_TJVENDOR_EDIT_USER_SPECIFIC_COMMISSION');
+			$viewTitle = Text::_('COM_TJVENDOR_EDIT_USER_SPECIFIC_COMMISSION');
 		}
 
 		$clientTitle = TjvendorFrontHelper::getClientName($client);
-		JToolbarHelper::title($clientTitle . '  ' . $viewTitle, 'pencil.png');
+		ToolbarHelper::title($clientTitle . '  ' . $viewTitle, 'pencil.png');
 
 		JToolBarHelper::apply('vendorfee.apply', 'JTOOLBAR_APPLY');
 		JToolBarHelper::save('vendorfee.save', 'JTOOLBAR_SAVE');
diff --git a/src/com_tjvendors/admin/views/vendorfees/tmpl/default.php b/src/com_tjvendors/admin/views/vendorfees/tmpl/default.php
index d04253f2..b88e39a5 100644
--- a/src/com_tjvendors/admin/views/vendorfees/tmpl/default.php
+++ b/src/com_tjvendors/admin/views/vendorfees/tmpl/default.php
@@ -1,25 +1,31 @@
 <?php
 /**
- * @version    SVN:
- * @package    Com_Tjvendors
- * @author     Techjoomla <contact@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJVendors
+ * @subpackage  com_tjvendors
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/');
-JHtml::_('bootstrap.tooltip');
-JHtml::_('behavior.multiselect');
-JHtml::_('formbehavior.chosen', 'select');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/');
+HTMLHelper::_('bootstrap.tooltip');
+HTMLHelper::_('behavior.multiselect');
+HTMLHelper::_('formbehavior.chosen', 'select');
 
 // Import CSS
-$document = JFactory::getDocument();
-$document->addStyleSheet(JUri::root() . 'administrator/components/com_tjvendors/assets/css/tjvendors.css');
+$document = Factory::getDocument();
+$document->addStyleSheet(Uri::root() . 'administrator/components/com_tjvendors/assets/css/tjvendors.css');
 
-$user      = JFactory::getUser();
+$user      = Factory::getUser();
 $userId    = $user->get('id');
 $listOrder = $this->state->get('list.ordering');
 $listDirn  = $this->state->get('list.direction');
@@ -29,7 +35,7 @@
 if ($saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_tjvendors&task=vendorfees.saveOrderAjax&tmpl=component';
-	JHtml::_('sortablelist.sortable', 'vendorList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+	HTMLHelper::_('sortablelist.sortable', 'vendorList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
 }
 
 $sortFields = $this->getSortFields();
@@ -112,7 +118,7 @@
 <form
 action="
 <?php
-echo JRoute::_('index.php?option=com_tjvendors&view=vendorfees&vendor_id=' . $this->vendor_id . '&client=' . $this->input->get('client', '', 'STRING')); ?>" 
+echo Route::_('index.php?option=com_tjvendors&view=vendorfees&vendor_id=' . $this->vendor_id . '&client=' . $this->input->get('client', '', 'STRING')); ?>"
 method="post" name="adminForm" id="adminForm">
 <?php
 if (!empty($this->sidebar))
@@ -133,47 +139,47 @@
 		<div id="filter-bar" class="btn-toolbar">
 			<div class="filter-search btn-group pull-left">
 				<label for="filter_search" class="element-invisible">
-					<?php echo JText::_('JSEARCH_FILTER'); ?>
+					<?php echo Text::_('JSEARCH_FILTER'); ?>
 				</label>
 				<input type="text" name="filter_search" id="filter_search"
 
-					placeholder="<?php echo JText::_('COM_TJVENDOR_SEARCH_BY_VENDOR_FEE'); ?>"
+					placeholder="<?php echo Text::_('COM_TJVENDOR_SEARCH_BY_VENDOR_FEE'); ?>"
 					value="<?php echo $this->escape($this->state->get('filter.search')); ?>"
-					title="<?php echo JText::_('JSEARCH_FILTER'); ?>"/>
+					title="<?php echo Text::_('JSEARCH_FILTER'); ?>"/>
 			</div>
 			<div class="btn-group pull-left">
-				<button class="btn hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>">
+				<button class="btn hasTooltip" type="submit" title="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>">
 					<i class="icon-search"></i>
 				</button>
-				<button class="btn hasTooltip" id="clear-search-button" type="button" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>">
+				<button class="btn hasTooltip" id="clear-search-button" type="button" title="<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>">
 					<i class="icon-remove"></i>
 				</button>
 			</div>
 			<div class="btn-group pull-right hidden-phone">
 				<label for="limit" class="element-invisible">
-					<?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?>
+					<?php echo Text::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?>
 				</label>
 				<?php echo $this->pagination->getLimitBox(); ?>
 			</div>
 			<div class="btn-group pull-right hidden-phone">
 				<label for="directionTable" class="element-invisible">
-					<?php echo JText::_('JFIELD_ORDERING_DESC'); ?>
+					<?php echo Text::_('JFIELD_ORDERING_DESC'); ?>
 				</label>
 				<select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">
-					<option value=""><?php echo JText::_('JFIELD_ORDERING_DESC'); ?></option>
+					<option value=""><?php echo Text::_('JFIELD_ORDERING_DESC'); ?></option>
 					<option value="asc" <?php echo $listDirn == 'asc' ? 'selected="selected"' : ''; ?>>
-						<?php echo JText::_('JGLOBAL_ORDER_ASCENDING'); ?>
+						<?php echo Text::_('JGLOBAL_ORDER_ASCENDING'); ?>
 					</option>
 					<option value="desc" <?php echo $listDirn == 'desc' ? 'selected="selected"' : ''; ?>>
-						<?php echo JText::_('JGLOBAL_ORDER_DESCENDING'); ?>
+						<?php echo Text::_('JGLOBAL_ORDER_DESCENDING'); ?>
 					</option>
 				</select>
 			</div>
 			<div class="btn-group pull-right">
-				<label for="sortTable" class="element-invisible"><?php echo JText::_('JGLOBAL_SORT_BY'); ?></label>
+				<label for="sortTable" class="element-invisible"><?php echo Text::_('JGLOBAL_SORT_BY'); ?></label>
 				<select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
-					<option value=""><?php echo JText::_('JGLOBAL_SORT_BY'); ?></option>
-					<?php echo JHtml::_('select.options', $sortFields, 'value', 'text', $listOrder); ?>
+					<option value=""><?php echo Text::_('JGLOBAL_SORT_BY'); ?></option>
+					<?php echo HTMLHelper::_('select.options', $sortFields, 'value', 'text', $listOrder); ?>
 				</select>
 			</div>
 		</div>
@@ -184,7 +190,7 @@
 			?>
 			<div class="clearfix">&nbsp;</div>
 				<div class="alert alert-no-items">
-					<?php echo JText::_('COM_TJVENDOR_NO_MATCHING_RESULTS'); ?>
+					<?php echo Text::_('COM_TJVENDOR_NO_MATCHING_RESULTS'); ?>
 				</div>
 		<?php
 		}
@@ -200,28 +206,28 @@
 					{
 					?>
 					<th width="1%" class="nowrap center hidden-phone">
-					<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.`ordering`', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+					<?php echo HTMLHelper::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.`ordering`', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 					</th>
 					<?php
 					}?>
 					<th width="1%" class="hidden-phone">
-						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)"/>
+						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo Text::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)"/>
 					</th>
 					<th class='left'>
-						<?php echo JText::_('COM_TJVENDORS_FORM_LBL_VENDOR_VENDOR_FEE_TITLE'); ?>
+						<?php echo Text::_('COM_TJVENDORS_FORM_LBL_VENDOR_VENDOR_FEE_TITLE'); ?>
 					</th>
 
 					<th class='left'>
-						<?php echo JText::_('COM_TJVENDORS_FORM_LBL_VENDOR_CURRENCY'); ?>
+						<?php echo Text::_('COM_TJVENDORS_FORM_LBL_VENDOR_CURRENCY'); ?>
 					</th>
 					<th class='left'>
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_VENDORS_PERCENT_COMMISSION', 'b.`percent_commission`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_VENDORS_PERCENT_COMMISSION', 'b.`percent_commission`', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left'>
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_VENDORS_FLAT_COMMISSION', 'b.`flat_commission`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_VENDORS_FLAT_COMMISSION', 'b.`flat_commission`', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left'>
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_VENDOR_FEE_ID', 'b.`id`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_VENDOR_FEE_ID', 'b.`id`', $listDirn, $listOrder); ?>
 					</th>
 				</tr>
 			</thead>
@@ -256,7 +262,7 @@
 
 									if (!$saveOrder)
 									{
-										$disabledLabel    = JText::_('JORDERINGDISABLED');
+										$disabledLabel    = Text::_('JORDERINGDISABLED');
 										$disableClassName = 'inactive tip-top';
 									}
 								?>
@@ -279,7 +285,7 @@
 						}?>
 
 							<td class="hidden-phone">
-								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+								<?php echo HTMLHelper::_('grid.id', $i, $item->id); ?>
 							</td>
 							<td>
 									<?php echo $item->vendor_title; ?>
@@ -287,7 +293,7 @@
 							<td>
 								<a href="
 								<?php
-								echo JRoute::_('index.php?option=com_tjvendors&task=vendorfee.edit&vendor_id=' . (int) $item->vendor_id . '&client=' . $item->client . '&fee_id=' . $item->id);?>">
+								echo Route::_('index.php?option=com_tjvendors&task=vendorfee.edit&vendor_id=' . (int) $item->vendor_id . '&client=' . $item->client . '&fee_id=' . $item->id);?>">
 								<?php echo $item->currency; ?>
 								</a>
 							</td>
@@ -315,6 +321,6 @@
 			<input type="hidden" name="client" value="<?php echo $this->input->get('client', '', 'STRING');?>"/>
 			<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>"/>
 			<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>"/>
-			<?php echo JHtml::_('form.token'); ?>
+			<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
diff --git a/src/com_tjvendors/admin/views/vendorfees/view.html.php b/src/com_tjvendors/admin/views/vendorfees/view.html.php
index 5779a976..b9925048 100644
--- a/src/com_tjvendors/admin/views/vendorfees/view.html.php
+++ b/src/com_tjvendors/admin/views/vendorfees/view.html.php
@@ -10,8 +10,11 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
-jimport('joomla.application.component.view');
 JLoader::import('com_tjvendors.helpers.fronthelper', JPATH_SITE . '/components');
 
 /**
@@ -19,7 +22,7 @@
  *
  * @since  1.6
  */
-class TjvendorsViewVendorFees extends JViewLegacy
+class TjvendorsViewVendorFees extends HtmlView
 {
 	protected $items;
 
@@ -38,12 +41,12 @@ class TjvendorsViewVendorFees extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$this->vendor_id = $input->get('vendor_id', '', 'INT');
 		$this->state = $this->get('State');
 		$this->items = $this->get('Items');
 		$this->pagination = $this->get('Pagination');
-		$this->input = JFactory::getApplication()->input;
+		$this->input = Factory::getApplication()->input;
 		$this->client = $this->input->get('client', '', 'STRING');
 
 		// Check for errors.
@@ -68,7 +71,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 
 		$state = $this->get('State');
 		$canDo = TjvendorsHelper::getActions();
@@ -78,7 +81,7 @@ protected function addToolbar()
 
 		$tjvendorFrontHelper = new TjvendorFrontHelper;
 		$clientTitle = $tjvendorFrontHelper->getClientName($this->client);
-		JToolbarHelper::title($clientTitle . ' : ' . JText::_('COM_TJVENDORS_TITLE_VENDORS_FEES'), 'list.png');
+		ToolbarHelper::title($clientTitle . ' : ' . Text::_('COM_TJVENDORS_TITLE_VENDORS_FEES'), 'list.png');
 
 		if ($canDo->get('core.edit.state'))
 		{
@@ -109,8 +112,8 @@ protected function addToolbar()
 	protected function getSortFields()
 	{
 		return array(
-			'b.`percent_commission`' => JText::_('COM_TJVENDORS_VENDORS_PERCENT_COMMISSION'),
-			'b.`flat_commission`' => JText::_('COM_TJVENDORS_VENDORS_FLAT_COMMISSION'),
+			'b.`percent_commission`' => Text::_('COM_TJVENDORS_VENDORS_PERCENT_COMMISSION'),
+			'b.`flat_commission`' => Text::_('COM_TJVENDORS_VENDORS_FLAT_COMMISSION'),
 		);
 	}
 }
diff --git a/src/com_tjvendors/admin/views/vendors/tmpl/default.php b/src/com_tjvendors/admin/views/vendors/tmpl/default.php
index a9fad5d1..bbac7a52 100755
--- a/src/com_tjvendors/admin/views/vendors/tmpl/default.php
+++ b/src/com_tjvendors/admin/views/vendors/tmpl/default.php
@@ -1,25 +1,32 @@
 <?php
 /**
- * @version    SVN:
- * @package    Com_Tjvendors
- * @author     Techjoomla <contact@techjoomla.com>
- * @copyright  Copyright  2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJVendors
+ * @subpackage  com_tjvendors
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-// No direct access
+
 defined('_JEXEC') or die;
 
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/');
-JHtml::_('bootstrap.tooltip');
-JHtml::_('behavior.multiselect');
-JHtml::_('formbehavior.chosen', 'select');
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
+
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/');
+HTMLHelper::_('bootstrap.tooltip');
+HTMLHelper::_('behavior.multiselect');
+HTMLHelper::_('formbehavior.chosen', 'select');
 
 // Import CSS
-$document = JFactory::getDocument();
-$document->addStyleSheet(JUri::root() . 'administrator/components/com_tjvendors/assets/css/tjvendors.css');
-$document->addStyleSheet(JUri::root() . 'media/com_tjvendors/css/list.css');
+$document = Factory::getDocument();
+$document->addStyleSheet(Uri::root() . 'administrator/components/com_tjvendors/assets/css/tjvendors.css');
+$document->addStyleSheet(Uri::root() . 'media/com_tjvendors/css/list.css');
 
-$user      = JFactory::getUser();
+$user      = Factory::getUser();
 $userId    = $user->id;
 $listOrder = $this->state->get('list.ordering');
 $listDirn  = $this->state->get('list.direction');
@@ -29,7 +36,7 @@
 if ($saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_tjvendors&task=vendors.saveOrderAjax&tmpl=component';
-	JHtml::_('sortablelist.sortable', 'vendorList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+	HTMLHelper::_('sortablelist.sortable', 'vendorList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
 }
 ?>
 <script type="text/javascript">
@@ -94,7 +101,7 @@
 	{
 		if(task == 'vendors.delete')
 		{
-			var msg = "<?php echo JText::_('COM_TJVENDORS_CONFIRM_TO_DELETE_RECORD'); ?>";
+			var msg = "<?php echo Text::_('COM_TJVENDORS_CONFIRM_TO_DELETE_RECORD'); ?>";
 
 			if (confirm(msg) == true)
 			{
@@ -125,7 +132,7 @@
 
 ?>
 <form
-action="<?php echo JRoute::_('index.php?option=com_tjvendors&view=vendors&client=' . $this->input->get('client', '', 'STRING')); ?>" method="post" name="adminForm" id="adminForm">
+action="<?php echo Route::_('index.php?option=com_tjvendors&view=vendors&client=' . $this->input->get('client', '', 'STRING')); ?>" method="post" name="adminForm" id="adminForm">
 <?php
 if (!empty($this->sidebar))
 {?>
@@ -143,24 +150,24 @@
 		<div id="filter-bar" class="btn-toolbar">
 			<div class="filter-search btn-group pull-left">
 				<label for="filter_search" class="element-invisible">
-					<?php echo JText::_('JSEARCH_FILTER'); ?>
+					<?php echo Text::_('JSEARCH_FILTER'); ?>
 				</label>
 				<input type="text" name="filter_search" id="filter_search"
-					placeholder="<?php echo JText::_('COM_TJVENDOR_SEARCH_BY_USERNAME'); ?>"
+					placeholder="<?php echo Text::_('COM_TJVENDOR_SEARCH_BY_USERNAME'); ?>"
 					value="<?php echo $this->escape($this->state->get('filter.search')); ?>"
-					title="<?php echo JText::_('JSEARCH_FILTER'); ?>"/>
+					title="<?php echo Text::_('JSEARCH_FILTER'); ?>"/>
 			</div>
 			<div class="btn-group pull-left">
-				<button class="btn hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>">
+				<button class="btn hasTooltip" type="submit" title="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>">
 					<i class="icon-search"></i>
 				</button>
-				<button class="btn hasTooltip" id="clear-search-button" type="button" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>">
+				<button class="btn hasTooltip" id="clear-search-button" type="button" title="<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>">
 					<i class="icon-remove"></i>
 				</button>
 			</div>
 			<div class="btn-group pull-right hidden-phone">
 				<label for="limit" class="element-invisible">
-					<?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?>
+					<?php echo Text::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?>
 				</label>
 				<?php echo $this->pagination->getLimitBox(); ?>
 			</div>
@@ -171,7 +178,7 @@
 		{?>
 			<div class="clearfix">&nbsp;</div>
 				<div class="alert alert-no-items">
-					<?php echo JText::_('COM_TJVENDOR_NO_MATCHING_RESULTS'); ?>
+					<?php echo Text::_('COM_TJVENDOR_NO_MATCHING_RESULTS'); ?>
 				</div>
 		<?php
 		}
@@ -183,32 +190,32 @@
 				<tr>
 					<?php if (isset($this->items[0]->ordering)) :?>
 					<th width="1%" class="nowrap center hidden-phone">
-						<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'v.`ordering`', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+						<?php echo HTMLHelper::_('grid.sort', '<i class="icon-menu-2"></i>', 'v.`ordering`', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 					</th>
 					<?php endif;?>
 					<th width="1%" class="hidden-phone">
-						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)"/>
+						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo Text::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)"/>
 					</th>
 
 					<?php if (isset($this->items[0]->state)) :?>
 					<th width="1%" >
-						<?php echo JText::_('JSTATUS');?>
+						<?php echo Text::_('JSTATUS');?>
 					</th>
 					<?php endif?>
 
 					<th width="5%">
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_VENDORS_VENDOR_TITLE', 'v.`vendor_title`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_VENDORS_VENDOR_TITLE', 'v.`vendor_title`', $listDirn, $listOrder); ?>
 					</th>
 					<?php	if ($this->vendorApproval) :?>
 					<th width="2%">
-						<?php echo JText::_('COM_TJVENDORS_VENDORS_VENDOR_APPROVE'); ?>
+						<?php echo Text::_('COM_TJVENDORS_VENDORS_VENDOR_APPROVE'); ?>
 					</th>
 					<?php endif?>
 					<th width="5%">
-						<?php echo JText::_('COM_TJVENDORS_VENDORS_ACTION_MENU'); ?>
+						<?php echo Text::_('COM_TJVENDORS_VENDORS_ACTION_MENU'); ?>
 					</th>
 					<th width="5%" >
-						<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_VENDORS_ID', 'v.`vendor_id`', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_VENDORS_ID', 'v.`vendor_id`', $listDirn, $listOrder); ?>
 					</th>
 				</tr>
 			</thead>
@@ -221,8 +228,8 @@
 			</tfoot>
 			<tbody>
 				<?php
-				$options[] = array("type"=>JText::_('Approve'), "value" => "1");
-				$options[] = array("type"=>JText::_('UnApproved'), "value" => "0");
+				$options[] = array("type"=>Text::_('Approve'), "value" => "1");
+				$options[] = array("type"=>Text::_('UnApproved'), "value" => "0");
 				foreach ($this->items as $i => $item)
 				{
 					$ordering   = ($listOrder == 'a.ordering');
@@ -244,7 +251,7 @@
 
 									if (!$saveOrder)
 									{
-										$disabledLabel    = JText::_('JORDERINGDISABLED');
+										$disabledLabel    = Text::_('JORDERINGDISABLED');
 										$disableClassName = 'inactive tip-top';
 									}
 								?>
@@ -266,18 +273,18 @@
 						}?>
 
 							<td class="hidden-phone">
-								<?php echo JHtml::_('grid.id', $i, $item->vendor_id); ?>
+								<?php echo HTMLHelper::_('grid.id', $i, $item->vendor_id); ?>
 							</td>
 							<?php if (isset($this->items[0]->state)) : ?>
 							<?php $class = ($canChange) ? 'active' : 'disabled'; ?>
 							<td >
-								<?php echo JHtml::_('jgrid.published', $item->state, $i, 'vendors.', $canChange, 'cb'); ?>
+								<?php echo HTMLHelper::_('jgrid.published', $item->state, $i, 'vendors.', $canChange, 'cb'); ?>
 							</td>
 							<?php endif; ?>
 
 
 							<td>
-								<a href="<?php echo JRoute::_('index.php?option=com_tjvendors&view=vendor&layout=update&client=' . $this->input->get('client', '', 'STRING') . '&vendor_id=' . (int) $item->vendor_id);?>">
+								<a href="<?php echo Route::_('index.php?option=com_tjvendors&view=vendor&layout=update&client=' . $this->input->get('client', '', 'STRING') . '&vendor_id=' . (int) $item->vendor_id);?>">
 									<?php echo $this->escape($item->vendor_title); ?>
 								</a>
 							</td>
@@ -290,9 +297,9 @@
 							<?php endif;?>
 							<td>
 
-								<a href="<?php echo JRoute::_('index.php?option=com_tjvendors&view=vendorfees&vendor_id=' . (int) $item->vendor_id) . '&client=' . $this->input->get('client', '', 'STRING'); ?>"><?php echo JText::_('COM_TJVENDORS_VENDORS_FEE'); ?></a> |
-								<a href="<?php echo JRoute::_('index.php?option=com_tjvendors&view=payouts&vendor_id=' . (int) $item->vendor_id) . '&client=' . $this->input->get('client', '', 'STRING'); ?>"><?php echo JText::_('COM_TJVENDORS_VENDORS_PAYOUTS'); ?></a> |
-								<a href="<?php echo JRoute::_('index.php?option=com_tjvendors&view=reports&vendor_id=' . (int) $item->vendor_id) . '&client=' . $this->input->get('client', '', 'STRING'); ?>"><?php echo JText::_('COM_TJVENDORS_VENDORS_REPORTS'); ?></a>
+								<a href="<?php echo Route::_('index.php?option=com_tjvendors&view=vendorfees&vendor_id=' . (int) $item->vendor_id) . '&client=' . $this->input->get('client', '', 'STRING'); ?>"><?php echo Text::_('COM_TJVENDORS_VENDORS_FEE'); ?></a> |
+								<a href="<?php echo Route::_('index.php?option=com_tjvendors&view=payouts&vendor_id=' . (int) $item->vendor_id) . '&client=' . $this->input->get('client', '', 'STRING'); ?>"><?php echo Text::_('COM_TJVENDORS_VENDORS_PAYOUTS'); ?></a> |
+								<a href="<?php echo Route::_('index.php?option=com_tjvendors&view=reports&vendor_id=' . (int) $item->vendor_id) . '&client=' . $this->input->get('client', '', 'STRING'); ?>"><?php echo Text::_('COM_TJVENDORS_VENDORS_REPORTS'); ?></a>
 
 							</td>
 							<td >
@@ -309,6 +316,6 @@
 			<input type="hidden" name="boxchecked" value="0"/>
 			<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>"/>
 			<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>"/>
-			<?php echo JHtml::_('form.token'); ?>
+			<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
diff --git a/src/com_tjvendors/admin/views/vendors/view.html.php b/src/com_tjvendors/admin/views/vendors/view.html.php
index 2a6999ed..d6ee2c88 100755
--- a/src/com_tjvendors/admin/views/vendors/view.html.php
+++ b/src/com_tjvendors/admin/views/vendors/view.html.php
@@ -10,8 +10,12 @@
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
-jimport('joomla.application.component.view');
 JLoader::import('com_tjvendors.helpers.fronthelper', JPATH_SITE . '/components');
 
 /**
@@ -19,7 +23,7 @@
  *
  * @since  1.6
  */
-class TjvendorsViewVendors extends JViewLegacy
+class TjvendorsViewVendors extends HtmlView
 {
 	protected $items;
 
@@ -41,10 +45,10 @@ public function display($tpl = null)
 		$this->state = $this->get('State');
 		$this->items = $this->get('Items');
 		$this->pagination = $this->get('Pagination');
-		$this->input = JFactory::getApplication()->input;
-		$this->params = JComponentHelper::getParams('com_tjvendors');
-		JText::script('COM_TJVENDOR_VENDOR_APPROVAL');
-		JText::script('COM_TJVENDOR_VENDOR_DENIAL');
+		$this->input = Factory::getApplication()->input;
+		$this->params = ComponentHelper::getParams('com_tjvendors');
+		Text::script('COM_TJVENDOR_VENDOR_APPROVAL');
+		Text::script('COM_TJVENDOR_VENDOR_DENIAL');
 
 		$this->vendorApproval = $this->params->get('vendor_approval');
 		$client = $this->input->get('client', '', 'STRING');
@@ -76,7 +80,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$this->client = $input->get('client', '', 'STRING');
 
 		$state = $this->get('State');
@@ -88,7 +92,7 @@ protected function addToolbar()
 
 		$title = !empty($this->client) ? $clientTitle . ' : ' : '';
 
-		JToolbarHelper::title($title . JText::_('COM_TJVENDORS_TITLE_VENDORS'), 'list.png');
+		ToolbarHelper::title($title . Text::_('COM_TJVENDORS_TITLE_VENDORS'), 'list.png');
 
 		if ($canDo->get('core.edit') && isset($this->items[0]))
 		{
diff --git a/src/com_tjvendors/layouts/com_tjvendors/subform/default.php b/src/com_tjvendors/layouts/com_tjvendors/subform/default.php
index d989b48c..da29474f 100644
--- a/src/com_tjvendors/layouts/com_tjvendors/subform/default.php
+++ b/src/com_tjvendors/layouts/com_tjvendors/subform/default.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Joomla.Site
+ * @package     TJVendors
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
+
 /*
  * As Joomla doesn't provide bootstrap 3 layout and TJVendor run on bootstrap 3 templates added the overrides for the Joomla subform layout
 */
@@ -15,8 +17,8 @@
 /**
  * Make thing clear
  *
- * @var JForm   $tmpl             The Empty form for template
- * @var array   $forms            Array of JForm instances for render the rows
+ * @var Form   $tmpl             The Empty form for template
+ * @var array   $forms            Array of Form instances for render the rows
  * @var bool    $multiple         The multiple state for the form field
  * @var int     $min              Count of minimum repeating in multiple mode
  * @var int     $max              Count of maximum repeating in multiple mode
diff --git a/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable.php b/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable.php
index e9b48c2e..d96d5d38 100644
--- a/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable.php
+++ b/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable.php
@@ -1,13 +1,17 @@
 <?php
 /**
- * @package     Joomla.Site
+ * @package     TJVendors
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /*
  * As Joomla doesn't provide bootstrap 3 layout and TJVendor run on bootstrap 3 templates added the overrides for the Joomla subform layout
 */
@@ -15,8 +19,8 @@
 /**
  * Make thing clear
  *
- * @var JForm   $tmpl             The Empty form for template
- * @var array   $forms            Array of JForm instances for render the rows
+ * @var Form   $tmpl             The Empty form for template
+ * @var array   $forms            Array of Form instances for render the rows
  * @var bool    $multiple         The multiple state for the form field
  * @var int     $min              Count of minimum repeating in multiple mode
  * @var int     $max              Count of maximum repeating in multiple mode
@@ -33,8 +37,8 @@
 // Add script
 if ($multiple)
 {
-	JHtml::_('jquery.ui', array('core', 'sortable'));
-	JHtml::_('script', 'system/subform-repeatable.js', array('version' => 'auto', 'relative' => true));
+	HTMLHelper::_('jquery.ui', array('core', 'sortable'));
+	HTMLHelper::_('script', 'system/subform-repeatable.js', array('version' => 'auto', 'relative' => true));
 }
 
 $sublayout = empty($groupByFieldset) ? 'section' : 'section-byfieldsets';
@@ -54,7 +58,7 @@
 			<div class="btn-toolbar hidden">
 				<div class="btn-group">
 					<a class="btn btn-mini button btn-success group-add-<?php echo $unique_subform_id; ?>"
-					aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>">
+					aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>">
 						<span class="icon-plus"></span>
 					</a>
 				</div>
diff --git a/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable/section-byfieldsets.php b/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable/section-byfieldsets.php
index b2e65539..9b6a4ac3 100644
--- a/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable/section-byfieldsets.php
+++ b/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable/section-byfieldsets.php
@@ -1,13 +1,16 @@
 <?php
 /**
- * @package     Joomla.Site
+ * @package     TJVendors
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
+use Joomla\CMS\Language\Text;
+
 /*
  * As Joomla doesn't provide bootstrap 3 layout and TJVendor run on bootstrap 3 templates added the overrides for the Joomla subform layout
 */
@@ -15,7 +18,7 @@
 /**
  * Make thing clear
  *
- * @var JForm   $form       The form instance for render the section
+ * @var Form   $form       The form instance for render the section
  * @var string  $basegroup  The base group name
  * @var string  $group      Current group name
  * @var array   $buttons    Array of the buttons that will be rendered
@@ -37,7 +40,7 @@
 <?php foreach ($form->getFieldsets() as $fieldset) : ?>
 <fieldset class="<?php if (!empty($fieldset->class)){ echo $fieldset->class; } ?>">
 	<?php if (!empty($fieldset->label)) : ?>
-	<legend><?php echo JText::_($fieldset->label); ?></legend>
+	<legend><?php echo Text::_($fieldset->label); ?></legend>
 	<?php endif; ?>
 <?php foreach ($form->getFieldset($fieldset->name) as $field) : ?>
 	<?php echo $field->renderField(); ?>
diff --git a/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable/section.php b/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable/section.php
index 6f17f8b1..53dfe03e 100644
--- a/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable/section.php
+++ b/src/com_tjvendors/layouts/com_tjvendors/subform/repeatable/section.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @package     Joomla.Site
+ * @package     TJVendors
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
@@ -15,7 +16,7 @@
 /**
  * Make thing clear
  *
- * @var JForm   $form       The form instance for render the section
+ * @var Form   $form       The form instance for render the section
  * @var string  $basegroup  The base group name
  * @var string  $group      Current group name
  * @var array   $buttons    Array of the buttons that will be rendered
diff --git a/src/com_tjvendors/script.tjvendors.php b/src/com_tjvendors/script.tjvendors.php
index 37017d73..bb375de8 100644
--- a/src/com_tjvendors/script.tjvendors.php
+++ b/src/com_tjvendors/script.tjvendors.php
@@ -9,10 +9,15 @@
  */
 
 defined('_JEXEC') or die();
-
-jimport('joomla.filesystem.folder');
-jimport('joomla.filesystem.file');
-jimport('joomla.application.component.controller');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Filesystem\Folder;
+use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Installer\InstallerHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Table\Table;
 
 /**
  * script for migration
@@ -98,9 +103,9 @@ public function uninstall($parent)
 	{
 		jimport('joomla.installer.installer');
 
-		$db = JFactory::getDBO();
+		$db = Factory::getDBO();
 
-		$status          = new JObject;
+		$status          = new CMSObject;
 		$status->plugins = array();
 
 		$src = $parent->getParent()->getPath('source');
@@ -125,7 +130,7 @@ public function uninstall($parent)
 
 						if ($id)
 						{
-							$installer         = new JInstaller;
+							$installer         = new Installer;
 							$result            = $installer->uninstall('plugin', $id);
 							$status->plugins[] = array(
 								'name' => 'plg_' . $plugin,
@@ -153,9 +158,9 @@ public function _installPlugins($parent)
 		jimport('joomla.installer.installer');
 		$src = $parent->getParent()->getPath('source');
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 
-		$status = new JObject;
+		$status = new CMSObject;
 		$status->plugins = array();
 
 		// Plugins installation
@@ -198,7 +203,7 @@ public function _installPlugins($parent)
 						$db->setQuery($query);
 						$count = $db->loadResult();
 
-						$installer = new JInstaller;
+						$installer = new Installer;
 						$result = $installer->install($path);
 
 						$status->plugins[] = array('name' => 'plg_' . $plugin, 'group' => $folder, 'result' => $result);
@@ -252,7 +257,7 @@ public function update($parent)
 	 */
 	public function installSqlFiles($parent)
 	{
-		$db = JFactory::getDBO();
+		$db = Factory::getDBO();
 
 		// Lets create the table
 		$this->runSQL($parent, 'install.mysql.utf8.sql');
@@ -269,7 +274,7 @@ public function installSqlFiles($parent)
 	 */
 	public function runSQL($parent, $sqlfile)
 	{
-		$db = JFactory::getDBO();
+		$db = Factory::getDBO();
 
 		// Obviously you may have to change the path and name if your installation SQL file ;)
 		if (method_exists($parent, 'extension_root'))
@@ -287,7 +292,7 @@ public function runSQL($parent, $sqlfile)
 		if ($buffer !== false)
 		{
 			jimport('joomla.installer.helper');
-			$queries = JInstallerHelper::splitSql($buffer);
+			$queries = InstallerHelper::splitSql($buffer);
 
 			if (count($queries) != 0)
 			{
@@ -301,7 +306,7 @@ public function runSQL($parent, $sqlfile)
 
 						if (!$db->query())
 						{
-							JError::raiseWarning(1, JText::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $db->stderr(true)));
+							JError::raiseWarning(1, Text::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $db->stderr(true)));
 
 							return false;
 						}
@@ -324,20 +329,20 @@ public function updateData()
 		{
 			foreach ($oldVendorsData as $oldData)
 			{
-				$com_params = JComponentHelper::getParams('com_jticketing');
+				$com_params = ComponentHelper::getParams('com_jticketing');
 				$currency = $com_params->get('currency');
 				$newVendorData = new stdClass;
 				$newVendorData->user_id = $oldData->user_id;
 				$newVendorData->vendor_id = $oldData->id;
 				$newVendorData->state = 1;
-				$newVendorData->vendor_title = JFactory::getUser($oldData->user_id)->name;
-				$result = JFactory::getDbo()->insertObject('#__tjvendors_vendors', $newVendorData);
+				$newVendorData->vendor_title = Factory::getUser($oldData->user_id)->name;
+				$result = Factory::getDbo()->insertObject('#__tjvendors_vendors', $newVendorData);
 
 				$newXrefData = new stdClass;
 				$newXrefData->vendor_id = $oldData->id;
 				$newXrefData->id = $oldData->id;
 				$newXrefData->client = 'com_jticketing';
-				$result = JFactory::getDbo()->insertObject('#__vendor_client_xref', $newXrefData);
+				$result = Factory::getDbo()->insertObject('#__vendor_client_xref', $newXrefData);
 
 				$newFeeData = new stdClass;
 				$newFeeData->vendor_id = $oldData->id;
@@ -346,7 +351,7 @@ public function updateData()
 				$newFeeData->currency = $currency;
 				$newFeeData->percent_commission = $oldData->percent_commission;
 				$newFeeData->flat_commission = $oldData->flat_commission;
-				$result = JFactory::getDbo()->insertObject('#__tjvendors_fee', $newFeeData);
+				$result = Factory::getDbo()->insertObject('#__tjvendors_fee', $newFeeData);
 			}
 
 			return true;
@@ -362,8 +367,8 @@ public function updateData()
 	 */
 	public function checkTableExists($table)
 	{
-		$db = JFactory::getDBO();
-		$config = JFactory::getConfig();
+		$db = Factory::getDBO();
+		$config = Factory::getConfig();
 
 		$dbname = $config->get('db');
 		$dbprefix = $config->get('dbprefix');
@@ -393,7 +398,7 @@ public function checkTableExists($table)
 	 */
 	public function getOldData()
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('*');
 		$query->from($db->quoteName('#__tj_vendors'));
@@ -411,9 +416,9 @@ public function getOldData()
 	public function _insertTjNotificationTemplates()
 	{
 		jimport('joomla.application.component.model');
-		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/tables');
+		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/tables');
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select($db->quoteName('key'));
 		$query->from($db->quoteName('#__tj_notification_templates'));
@@ -421,14 +426,14 @@ public function _insertTjNotificationTemplates()
 		$db->setQuery($query);
 		$existingKeys = $db->loadColumn();
 
-		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/models');
-		$notificationsModel = JModelLegacy::getInstance('Notification', 'TJNotificationsModel');
+		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/models');
+		$notificationsModel = BaseDatabaseModel::getInstance('Notification', 'TJNotificationsModel');
 
 		$filePath = JPATH_ADMINISTRATOR . '/components/com_tjvendors/tjvendorsTemplate.json';
 		$str = file_get_contents($filePath);
 		$json = json_decode($str, true);
 
-		$app   = JFactory::getApplication();
+		$app   = Factory::getApplication();
 
 		if (count($json) != 0)
 		{
@@ -449,7 +454,7 @@ public function _insertTjNotificationTemplates()
 	 */
 	public function defaultPermissionsFix()
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$columnArray = array('id', 'rules');
 		$query = $db->getQuery(true);
 
@@ -469,7 +474,7 @@ public function defaultPermissionsFix()
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 	}
 
@@ -482,8 +487,8 @@ public function defaultPermissionsFix()
 	 */
 	public function updatePaymentGatewayConfig()
 	{
-		$db = JFactory::getDBO();
-		$config   = JFactory::getConfig();
+		$db = Factory::getDBO();
+		$config   = Factory::getConfig();
 		$dbprefix = $config->get('dbprefix');
 		$query = "SHOW TABLES LIKE '" . $dbprefix . "vendor_client_xref';";
 		$db->setQuery($query);
@@ -531,7 +536,7 @@ public function updatePaymentGatewayConfig()
 			$vendorData->vendor_id = $value->vendor_id;
 			$vendorData->params    = $vendorParams;
 
-			JFactory::getDbo()->updateObject('#__vendor_client_xref', $vendorData, 'id');
+			Factory::getDbo()->updateObject('#__vendor_client_xref', $vendorData, 'id');
 		}
 
 		return true;
@@ -552,11 +557,11 @@ private function _addLayout($parent)
 		$src = $parent->getParent()->getPath('source');
 		$VendorSubformLayouts = $src . "/layouts/com_tjvendors";
 
-		if (JFolder::exists(JPATH_SITE . '/layouts/com_tjvendors'))
+		if (Folder::exists(JPATH_SITE . '/layouts/com_tjvendors'))
 		{
-			JFolder::delete(JPATH_SITE . '/layouts/com_tjvendors');
+			Folder::delete(JPATH_SITE . '/layouts/com_tjvendors');
 		}
 
-		JFolder::copy($VendorSubformLayouts, JPATH_SITE . '/layouts/com_tjvendors');
+		Folder::copy($VendorSubformLayouts, JPATH_SITE . '/layouts/com_tjvendors');
 	}
 }
diff --git a/src/com_tjvendors/site/controller.php b/src/com_tjvendors/site/controller.php
index c0aef5de..8191f225 100755
--- a/src/com_tjvendors/site/controller.php
+++ b/src/com_tjvendors/site/controller.php
@@ -10,7 +10,6 @@
 
 // No direct access
 defined('_JEXEC') or die;
-
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Controller\BaseController;
 
@@ -25,7 +24,7 @@ class TjvendorsController extends BaseController
 	 * Method to display a view.
 	 *
 	 * @param   boolean  $cachable   If true, the view output will be cached
-	 * @param   mixed    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   mixed    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link InputFilter::clean()}.
 	 *
 	 * @return  JController   This object to support chaining.
 	 *
diff --git a/src/com_tjvendors/site/controllers/vendor.php b/src/com_tjvendors/site/controllers/vendor.php
index ce4c4247..8ef78a90 100755
--- a/src/com_tjvendors/site/controllers/vendor.php
+++ b/src/com_tjvendors/site/controllers/vendor.php
@@ -10,16 +10,22 @@
 
 // No direct access
 defined('_JEXEC') or die();
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
 
-jimport('joomla.application.component.controllerform');
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/tjvendors.php');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/tjvendors.php');
 
 /**
  * Vendor controller class.
  *
  * @since  1.6
  */
-class TjvendorsControllerVendor extends JControllerForm
+class TjvendorsControllerVendor extends FormController
 {
 	/**
 	 * Constructor
@@ -29,7 +35,7 @@ class TjvendorsControllerVendor extends JControllerForm
 	public function __construct()
 	{
 		$this->view_list = 'vendors';
-		$this->input = JFactory::getApplication()->input;
+		$this->input = Factory::getApplication()->input;
 
 		$this->vendor_client = $this->input->get('client', '', 'STRING');
 
@@ -82,19 +88,19 @@ protected function getRedirectToListAppend()
 	public function save($key = null, $urlVar = null)
 	{
 		// Check for request forgeries.
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
-		$params = JComponentHelper::getParams('com_tjvendors');
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$params = ComponentHelper::getParams('com_tjvendors');
 		$vendorApproval = $params->get('vendor_approval');
 
 		// Initialise variables.
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 		$model = $this->getModel('Vendor', 'TjvendorsModel');
 
 		// Get the user data.
-		$data = JFactory::getApplication()->input->get('jform', array(), 'array');
+		$data = Factory::getApplication()->input->get('jform', array(), 'array');
 		$data['vendor_client'] = $app->input->get('client', '', 'STRING');
 
-		$data['user_id'] = JFactory::getUser()->id;
+		$data['user_id'] = Factory::getUser()->id;
 
 		// Validate the posted data.
 		$form = $model->getForm();
@@ -147,11 +153,11 @@ public function save($key = null, $urlVar = null)
 
 			if ($id != 0)
 			{
-				$this->setRedirect(JRoute::_('index.php?option=com_tjvendors&view=vendor&layout=profile&vendor_id=' . $id . '&client=' . $client, false));
+				$this->setRedirect(Route::_('index.php?option=com_tjvendors&view=vendor&layout=profile&vendor_id=' . $id . '&client=' . $client, false));
 			}
 			else
 			{
-				$this->setRedirect(JRoute::_('index.php?option=com_tjvendors&view=vendor&layout=edit&vendor_id=' . $id . '&client=' . $client, false));
+				$this->setRedirect(Route::_('index.php?option=com_tjvendors&view=vendor&layout=edit&vendor_id=' . $id . '&client=' . $client, false));
 			}
 
 			return false;
@@ -170,13 +176,13 @@ public function save($key = null, $urlVar = null)
 			$client = $app->input->get('client', '', 'STRING');
 
 			$id = $app->getUserState('com_tjvendors.edit.vendor.data.vendor_id');
-			$this->setMessage(JText::sprintf('Save failed', $model->getError()), 'warning');
+			$this->setMessage(Text::sprintf('Save failed', $model->getError()), 'warning');
 			$dynamicLink = '&client=' . $data['vendor_client'] . '&vendor_id=' . $id;
 
 			$layout = $id != 0 ? 'profile' : 'edit';
 
 			$this->setRedirect(
-					JRoute::_(
+					Route::_(
 					'index.php?option=com_tjvendors&view=vendor&layout=' . $layout . $dynamicLink, false
 					)
 					);
@@ -187,7 +193,7 @@ public function save($key = null, $urlVar = null)
 		$user_id = Jfactory::getUser()->id;
 
 		// Get a db connection.
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 
 		// Create a new query object.
 		$query = $db->getQuery(true);
@@ -197,12 +203,12 @@ public function save($key = null, $urlVar = null)
 		$query->where($db->quoteName('user_id') . ' = ' . $user_id);
 		$db->setQuery($query);
 		$vendor_id = $db->loadResult();
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 
 		// Redirect to the list screen.
-		$this->setMessage(JText::_('COM_TJVENDORS_MSG_SUCCESS_SAVE_VENDOR'));
+		$this->setMessage(Text::_('COM_TJVENDORS_MSG_SUCCESS_SAVE_VENDOR'));
 		$this->setRedirect(
-				JRoute::_(
+				Route::_(
 				'index.php?option=com_tjvendors&view=vendor&layout=default&vendor_id=' . $vendor_id . '&client=' . $input->get('client', '', 'STRING'), false
 				)
 				);
@@ -220,10 +226,10 @@ public function save($key = null, $urlVar = null)
 	 */
 	public function cancel($key=null)
 	{
-		$input = JFactory::getApplication()->input;
-		$data = JFactory::getApplication()->input->get('jform', array(), 'array');
+		$input = Factory::getApplication()->input;
+		$data = Factory::getApplication()->input->get('jform', array(), 'array');
 		$this->setRedirect(
-		JRoute::_('index.php?option=com_tjvendors&view=vendor&vendor_id=' . $data['vendor_id'] . '&client=' . $input->get('client', '', 'STRING'), false)
+		Route::_('index.php?option=com_tjvendors&view=vendor&vendor_id=' . $data['vendor_id'] . '&client=' . $input->get('client', '', 'STRING'), false)
 		);
 	}
 
@@ -236,7 +242,7 @@ public function cancel($key=null)
 	 */
 	public function generateGatewayFields()
 	{
-		$input  = JFactory::getApplication()->input->post;
+		$input  = Factory::getApplication()->input->post;
 		$payment_gateway = $input->get('payment_gateway', '', 'STRING');
 		$parentTag = $input->get('parent_tag', '', 'STRING');
 		$vendor_id = $input->get('vendor_id', '', 'INTEGER');
diff --git a/src/com_tjvendors/site/events/vendor.php b/src/com_tjvendors/site/events/vendor.php
index 783b7f1f..54919ec1 100644
--- a/src/com_tjvendors/site/events/vendor.php
+++ b/src/com_tjvendors/site/events/vendor.php
@@ -10,6 +10,9 @@
 
 // No direct access
 defined('_JEXEC') or die('Restricted access');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+
 JLoader::import('components.com_tjvendors.helpers.mails', JPATH_SITE);
 
 /**
@@ -26,8 +29,8 @@ class TjvendorsTriggerVendor
 	 */
 	public function __construct()
 	{
-		$app = JFactory::getApplication();
-		$this->user = JFactory::getUser();
+		$app = Factory::getApplication();
+		$this->user = Factory::getUser();
 		$this->tjvendorsMailsHelper = new TjvendorsMailsHelper;
 	}
 
@@ -57,7 +60,7 @@ public function onAfterVendorSave($vendorDetails, $isNew)
 		}
 
 		$dispatcher = JDispatcher::getInstance();
-		JPluginHelper::importPlugin('tjvendors');
+		PluginHelper::importPlugin('tjvendors');
 		$dispatcher->trigger('tjVendorsOnAfterVendorSave', array($vendorDetails, $isNew));
 
 		return;
diff --git a/src/com_tjvendors/site/helpers/fronthelper.php b/src/com_tjvendors/site/helpers/fronthelper.php
index ef08661d..1e905ac6 100644
--- a/src/com_tjvendors/site/helpers/fronthelper.php
+++ b/src/com_tjvendors/site/helpers/fronthelper.php
@@ -9,6 +9,12 @@
  */
 
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Table\Table;
+
 JLoader::import('payout', JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
 JLoader::import('tjvendors', JPATH_ADMINISTRATOR . '/components/com_tjvendors/helpers');
 
@@ -34,7 +40,7 @@ public static function getModel($name)
 		if (file_exists(JPATH_SITE . '/components/com_tjvendors/models/' . strtolower($name) . '.php'))
 		{
 			require_once JPATH_SITE . '/components/com_tjvendors/models/' . strtolower($name) . '.php';
-			$model = JModelLegacy::getInstance($name, 'TjvendorsModel');
+			$model = BaseDatabaseModel::getInstance($name, 'TjvendorsModel');
 		}
 
 		return $model;
@@ -50,7 +56,7 @@ public static function getModel($name)
 	public static function getUniqueClients($user_id)
 	{
 		$vendor_id = self::getvendor();
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('DISTINCT' . $db->quoteName('client'));
 		$query->from($db->quoteName('#__tjvendors_passbook', 'vendors'));
@@ -62,7 +68,7 @@ public static function getUniqueClients($user_id)
 
 		$db->setQuery($query);
 		$clients = array();
-		$clients['all'] = JText::_('JFILTER_PAYOUT_CHOOSE_CLIENTS');
+		$clients['all'] = Text::_('JFILTER_PAYOUT_CHOOSE_CLIENTS');
 
 		try
 		{
@@ -70,7 +76,7 @@ public static function getUniqueClients($user_id)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($result))
@@ -82,7 +88,7 @@ public static function getUniqueClients($user_id)
 		{
 			$tjvendorFrontHelper = new TjvendorFrontHelper;
 			$client = $tjvendorFrontHelper->getClientName($i['client']);
-			$client = JText::_(strtoupper($i['client']));
+			$client = Text::_(strtoupper($i['client']));
 			$clients[] = array("clientType" => $i['client'], "clientValue" => $client);
 		}
 
@@ -102,7 +108,7 @@ public static function getUniqueClients($user_id)
 	 */
 	public static function getTotalDetails($vendor_id, $client, $currency)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('sum(' . $db->quoteName('credit') . ') As credit');
 		$query->select('sum(' . $db->quoteName('debit') . ') As debit');
@@ -138,7 +144,7 @@ public static function getTotalDetails($vendor_id, $client, $currency)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 	}
 
@@ -151,7 +157,7 @@ public static function getTotalDetails($vendor_id, $client, $currency)
 	 */
 	public static function getClientsForVendor($vendor_id)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('*');
 		$query->from($db->quoteName('#__vendor_client_xref'));
@@ -169,7 +175,7 @@ public static function getClientsForVendor($vendor_id)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($result))
@@ -195,8 +201,8 @@ public static function getClientsForVendor($vendor_id)
 	 */
 	public static function getvendor()
 	{
-		$user_id = JFactory::getuser()->id;
-		$vendorDetails = JTable::getInstance('vendor', 'TjvendorsTable', array());
+		$user_id = Factory::getuser()->id;
+		$vendorDetails = Table::getInstance('vendor', 'TjvendorsTable', array());
 		$vendorDetails->load(array('user_id' => $user_id));
 
 		return $vendorDetails->vendor_id;
@@ -210,7 +216,7 @@ public static function getvendor()
 	public static function getCurrencies()
 	{
 		$vendor_id = self::getvendor();
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('DISTINCT' . $db->quoteName('currency'));
 		$query->from($db->quoteName('#__tjvendors_passbook'));
@@ -221,7 +227,7 @@ public static function getCurrencies()
 		}
 
 		$db->setQuery($query);
-		$currencies[] = JText::_('JFILTER_PAYOUT_CHOOSE_CURRENCY');
+		$currencies[] = Text::_('JFILTER_PAYOUT_CHOOSE_CURRENCY');
 
 		try
 		{
@@ -229,7 +235,7 @@ public static function getCurrencies()
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($result))
@@ -258,7 +264,7 @@ public static function getCurrencies()
 	 */
 	public static function getPaymentDetails($vendor_id, $client)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('*');
 		$query->from($db->quoteName('#__vendor_client_xref'));
@@ -281,7 +287,7 @@ public static function getPaymentDetails($vendor_id, $client)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		return $res;
@@ -305,7 +311,7 @@ public static function checkVendor($user_id, $client)
 			$user_id = jFactory::getuser()->id;
 		}
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select($db->quoteName('v.vendor_id'));
 		$query->from($db->quoteName('#__tjvendors_vendors', 'v'));
@@ -321,7 +327,7 @@ public static function checkVendor($user_id, $client)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (!$vendor)
@@ -347,7 +353,7 @@ public static function checkVendor($user_id, $client)
 	 */
 	public function checkGatewayDetails($userId, $client)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 
 		// Create a new query object.
 		$query = $db->getQuery(true);
@@ -366,7 +372,7 @@ public function checkGatewayDetails($userId, $client)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		$params = json_decode($result['params']);
@@ -392,14 +398,14 @@ public function checkGatewayDetails($userId, $client)
 	 */
 	public function addEntry($order_data)
 	{
-		$com_params = JComponentHelper::getParams($order_data['client']);
-		$vendorParams = JComponentHelper::getParams('com_tjvendors');
+		$com_params = ComponentHelper::getParams($order_data['client']);
+		$vendorParams = ComponentHelper::getParams('com_tjvendors');
 		$payout_day_limit = $vendorParams->get('payout_limit_days', '0', 'INT');
-		$date = JFactory::getDate();
+		$date = Factory::getDate();
 		$payout_date_limit = $date->modify("-" . $payout_day_limit . " day");
 		$currency = $com_params->get('currency');
 
-		$payoutTable = JTable::getInstance('payout', 'TjvendorsTable', array());
+		$payoutTable = Table::getInstance('payout', 'TjvendorsTable', array());
 		$payoutTable->load(array('reference_order_id' => $order_data['order_id']));
 
 		if ($payoutTable->debit > 0)
@@ -415,7 +421,7 @@ public function addEntry($order_data)
 		$totalAmount = TjvendorsHelper::getTotalAmount($entry_data['vendor_id'], $currency, $order_data['client']);
 		$entry_data['reference_order_id'] = $order_data['order_id'];
 		$entry_data['transaction_id'] = $order_data['client_name'] . '-' . $currency . '-' . $entry_data['vendor_id'] . '-';
-		$entry_data['transaction_time'] = JFactory::getDate()->toSql();
+		$entry_data['transaction_time'] = Factory::getDate()->toSql();
 
 		if ($order_data['status'] != "C")
 		{
@@ -445,8 +451,8 @@ public function addEntry($order_data)
 		$entry_data['params'] = json_encode($params);
 		$entry_data['currency'] = $currency;
 		$entry_data['client'] = $order_data['client'];
-		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'payout');
-		$tjvendorsModelPayout = JModelLegacy::getInstance('Payout', 'TjvendorsModel');
+		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/models', 'payout');
+		$tjvendorsModelPayout = BaseDatabaseModel::getInstance('Payout', 'TjvendorsModel');
 			$vendorDetail = $tjvendorsModelPayout->addCreditEntry($entry_data);
 	}
 
@@ -463,11 +469,11 @@ public function addEntry($order_data)
 	 */
 	public static function getPaidAmount($vendor_id, $currency, $filterClient)
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$urlClient = $input->get('client', '', 'STRING');
-		$com_params = JComponentHelper::getParams('com_tjvendors');
+		$com_params = ComponentHelper::getParams('com_tjvendors');
 		$bulkPayoutStatus = $com_params->get('bulk_payout');
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('*');
 		$query->from($db->quoteName('#__tjvendors_passbook'));
@@ -518,7 +524,7 @@ public static function getPaidAmount($vendor_id, $currency, $filterClient)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 	}
 
@@ -534,10 +540,10 @@ public static function getClientName($client)
 		$clientName = strtoupper($client);
 
 		// Need to load the menu language file as mod_menu hasn't been loaded yet.
-		$lang = JFactory::getLanguage();
+		$lang = Factory::getLanguage();
 		$lang->load($client, JPATH_ADMINISTRATOR, null, false, true);
 
-		return JText::_($clientName);
+		return Text::_($clientName);
 	}
 
 	/**
@@ -551,7 +557,7 @@ public static function getClientName($client)
 	 */
 	public function getItemId($link)
 	{
-		$mainframe = JFactory::getApplication();
+		$mainframe = Factory::getApplication();
 
 		if ($mainframe->issite())
 		{
@@ -584,7 +590,7 @@ public function getItemId($link)
 	 */
 	public function getPaymentGatewayConfig($vendorId, $client = "", $global = true)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$arrayColumns = array('vc.params');
 		$query->select($db->quoteName($arrayColumns));
@@ -624,7 +630,7 @@ public function getPaymentGatewayConfig($vendorId, $client = "", $global = true)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 	}
 
@@ -640,7 +646,7 @@ public function getPaymentGatewayConfig($vendorId, $client = "", $global = true)
 	 */
 	public function isClientExist($client, $vendorId)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('client');
 		$query->from($db->quoteName('#__vendor_client_xref'));
diff --git a/src/com_tjvendors/site/helpers/mails.php b/src/com_tjvendors/site/helpers/mails.php
index ac5f7f39..46212e44 100644
--- a/src/com_tjvendors/site/helpers/mails.php
+++ b/src/com_tjvendors/site/helpers/mails.php
@@ -9,6 +9,14 @@
  */
 
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Registry\Registry;
+
 jimport('techjoomla.tjnotifications.tjnotifications');
 
 /**
@@ -25,17 +33,17 @@ class TjvendorsMailsHelper
 	 */
 	public function __construct()
 	{
-		$app = JFactory::getApplication();
-		$this->tjvendorsparams = JComponentHelper::getParams('com_tjvendors');
-		$this->siteConfig = JFactory::getConfig();
+		$app = Factory::getApplication();
+		$this->tjvendorsparams = ComponentHelper::getParams('com_tjvendors');
+		$this->siteConfig = Factory::getConfig();
 		$this->sitename = $this->siteConfig->get('sitename');
 		$this->siteadminname = $this->siteConfig->get('fromname');
-		$this->user = JFactory::getUser();
+		$this->user = Factory::getUser();
 		$this->client = "com_tjvendors";
 		$this->tjnotifications = new Tjnotifications;
 		$this->siteinfo = new stdClass;
 		$this->siteinfo->sitename	= $this->sitename;
-		$this->siteinfo->adminname = JText::_('COM_TJVENDORS_SITEADMIN');
+		$this->siteinfo->adminname = Text::_('COM_TJVENDORS_SITEADMIN');
 
 		JLoader::import('components.com_tjvendors.helpers.fronthelper', JPATH_SITE);
 		$this->tjvendorFrontHelper = new TjvendorFrontHelper;
@@ -58,12 +66,12 @@ public function onAfterVendorCreate($vendorDetails)
 		$vendorerkey = ($vendor_approval) ? "createVendorMailToOwnerWaitingForApproval" : "createVendorMailToOwner";
 
 		$promoterEmailObj = new stdClass;
-		$vendorer = JFactory::getUser($vendorDetails->user_id);
+		$vendorer = Factory::getUser($vendorDetails->user_id);
 		$promoterEmailObj->email = $vendorer->email;
 		$promoterRecipients[] = $promoterEmailObj;
 
 		$allVendors = 'index.php?option=com_tjvendors&view=vendors&client=' . $vendorDetails->vendor_client;
-		$allVendorsLink = JUri::root() . 'administrator/' . $allVendors;
+		$allVendorsLink = Uri::root() . 'administrator/' . $allVendors;
 		$vendorDetails->allVendors = $allVendorsLink;
 
 		$vendorItemID = $this->tjvendorFrontHelper->getItemId(
@@ -71,17 +79,17 @@ public function onAfterVendorCreate($vendorDetails)
 		);
 		$myVendor = 'index.php?option=com_tjvendors&view=vendor&layout=profile&client='
 		. $vendorDetails->vendor_client . '&vendor_id=' . $vendorDetails->vendor_id . '&Itemid=' . $vendorItemID;
-		$myVendorLink = JUri::root() . substr(JRoute::_($myVendor), strlen(JUri::base(true)) + 1);
+		$myVendorLink = Uri::root() . substr(Route::_($myVendor), strlen(Uri::base(true)) + 1);
 		$vendorDetails->myVendor = $myVendorLink;
 
 		$replacements = new stdClass;
 		$vendorDetails->sitename = $this->sitename;
-		$vendorDetails->adminname = JText::_('COM_TJVENDORS_SITEADMIN');
+		$vendorDetails->adminname = Text::_('COM_TJVENDORS_SITEADMIN');
 		$replacements->info = $vendorDetails;
 		$replacements->vendorer = $vendorer;
 
 		$ccMail = $this->siteConfig->get('mailfrom');
-		$options = new JRegistry;
+		$options = new Registry;
 		$options->set('info', $vendorDetails);
 
 		// Mail to site admin
@@ -104,20 +112,20 @@ public function onAfterVendorEdit($vendorDetails)
 	{
 		$replacements = new stdClass;
 		$vendorDetails->sitename = $this->sitename;
-		$vendorDetails->adminname = JText::_('COM_TJVENDORS_SITEADMIN');
-		$loggedInUser = JFactory::getUser()->id;
+		$vendorDetails->adminname = Text::_('COM_TJVENDORS_SITEADMIN');
+		$loggedInUser = Factory::getUser()->id;
 
-		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
-		$vendorData = JTable::getInstance('Vendorclientxref', 'TjvendorsTable');
+		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
+		$vendorData = Table::getInstance('Vendorclientxref', 'TjvendorsTable');
 		$vendorData->load(array('vendor_id' => $vendorDetails->vendor_id));
 		$vendor_client = $vendorData->client;
 
 		$vendorDetails->vendorClient = $this->tjvendorFrontHelper->getClientName($vendor_client);
 		$replacements->info = $vendorDetails;
-		$replacements->vendorer = JFactory::getUser($vendorDetails->user_id);
+		$replacements->vendorer = Factory::getUser($vendorDetails->user_id);
 
 		$ccMail = $this->siteConfig->get('mailfrom');
-		$options = new JRegistry;
+		$options = new Registry;
 		$options->set('info', $vendorDetails);
 
 		$vendor_approval = $this->tjvendorsparams->get('vendor_approval');
@@ -125,10 +133,10 @@ public function onAfterVendorEdit($vendorDetails)
 		// Find admin has approved vendor, and add a new key
 		if ($vendor_approval && $vendorDetails->approved == 1)
 		{
-			JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
-			$vendorData = JTable::getInstance('Vendor', 'TjvendorsTable');
+			Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
+			$vendorData = Table::getInstance('Vendor', 'TjvendorsTable');
 			$vendorData->load(array('vendor_id' => $vendorDetails->vendor_id));
-			$vendorUserDetails = JFactory::getUser($vendorData->user_id);
+			$vendorUserDetails = Factory::getUser($vendorData->user_id);
 
 			$approvalkey = "approvalOnVendorMailToOwner";
 			$promoterEmailObj = new stdClass;
diff --git a/src/com_tjvendors/site/models/fields/createdby.php b/src/com_tjvendors/site/models/fields/createdby.php
index b120b611..612dedeb 100755
--- a/src/com_tjvendors/site/models/fields/createdby.php
+++ b/src/com_tjvendors/site/models/fields/createdby.php
@@ -1,3 +1,6 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Factory;
 <?php
 /**
  * @package     TJVendors
@@ -44,11 +47,11 @@ protected function getInput()
 
 		if ($user_id)
 		{
-			$user = JFactory::getUser($user_id);
+			$user = Factory::getUser($user_id);
 		}
 		else
 		{
-			$user   = JFactory::getUser();
+			$user   = Factory::getUser();
 			$html[] = '<input type="hidden" name="' . $this->name . '" value="' . $user->id . '" />';
 		}
 
diff --git a/src/com_tjvendors/site/models/fields/filemultiple.php b/src/com_tjvendors/site/models/fields/filemultiple.php
index f53c8dc9..38237977 100755
--- a/src/com_tjvendors/site/models/fields/filemultiple.php
+++ b/src/com_tjvendors/site/models/fields/filemultiple.php
@@ -1,3 +1,5 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
 <?php
 /**
  * @package     TJVendors
diff --git a/src/com_tjvendors/site/models/fields/foreignkey.php b/src/com_tjvendors/site/models/fields/foreignkey.php
index cd1f3afd..36bd3e3c 100755
--- a/src/com_tjvendors/site/models/fields/foreignkey.php
+++ b/src/com_tjvendors/site/models/fields/foreignkey.php
@@ -1,3 +1,7 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
 <?php
 /**
  * @package     TJVendors
@@ -65,7 +69,7 @@ protected function getInput()
 		$fk_value = '';
 
 		// Load all the field options
-		$db    = JFactory::getDbo();
+		$db    = Factory::getDbo();
 		$query = $db->getQuery(true);
 
 		// Support for multiple fields on fk_values
@@ -114,7 +118,7 @@ protected function getInput()
 				// Iterate through all the results
 				foreach ($results as $result)
 				{
-					$options[] = JHtml::_('select.option', $result->{$this->key_field}, $result->{$this->value_field});
+					$options[] = HTMLHelper::_('select.option', $result->{$this->key_field}, $result->{$this->value_field});
 				}
 
 				$value = $this->value;
@@ -137,10 +141,10 @@ protected function getInput()
 				}
 				else
 				{
-					array_unshift($options, JHtml::_('select.option', '', ''));
+					array_unshift($options, HTMLHelper::_('select.option', '', ''));
 				}
 
-				$html = JHtml::_('select.genericlist', $options, $this->name, $input_options, 'value', 'text', $value, $this->id);
+				$html = HTMLHelper::_('select.genericlist', $options, $this->name, $input_options, 'value', 'text', $value, $this->id);
 				break;
 		}
 
diff --git a/src/com_tjvendors/site/models/fields/modifiedby.php b/src/com_tjvendors/site/models/fields/modifiedby.php
index 518cd07c..d9fa1e70 100755
--- a/src/com_tjvendors/site/models/fields/modifiedby.php
+++ b/src/com_tjvendors/site/models/fields/modifiedby.php
@@ -1,3 +1,6 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Factory;
 <?php
 /**
  * @package     TJVendors
@@ -38,7 +41,7 @@ protected function getInput()
 	{
 		// Initialize variables.
 		$html   = array();
-		$user   = JFactory::getUser();
+		$user   = Factory::getUser();
 		$html[] = '<input type="hidden" name="' . $this->name . '" value="' . $user->id . '" />';
 		$html[] = "<div>" . $user->name . " (" . $user->username . ")</div>";
 
diff --git a/src/com_tjvendors/site/models/fields/paymentgateway.php b/src/com_tjvendors/site/models/fields/paymentgateway.php
index 4222541d..75f13263 100644
--- a/src/com_tjvendors/site/models/fields/paymentgateway.php
+++ b/src/com_tjvendors/site/models/fields/paymentgateway.php
@@ -10,9 +10,15 @@
 
 // No direct access.
 defined('_JEXEC') or die();
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\PluginHelper;
 
 jimport('joomla.form.helper');
-JFormHelper::loadFieldClass('list');
+FormHelper::loadFieldClass('list');
 
 /**
  * Supports an HTML select list of courses
@@ -40,38 +46,38 @@ class JFormFieldPaymentGateway 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 HTMLHelper options.
 	 *
 	 * @since   11.4
 	 */
 	protected function getOptions()
 	{
 		$type = "payment";
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$client = $input->get('client', '', 'STRING');
 		$options = array();
-		$options[] = JHtml::_('select.option', '', JText::_('COM_TJVENDOR_PAYMENT_DETAILS_DEFAULT'));
+		$options[] = HTMLHelper::_('select.option', '', Text::_('COM_TJVENDOR_PAYMENT_DETAILS_DEFAULT'));
 
 		if (!empty($client))
 		{
-			$com_params = JComponentHelper::getParams($client);
+			$com_params = ComponentHelper::getParams($client);
 			$gateways = (array) $com_params->get('gateways');
 
 			if (!empty($gateways))
 			{
 				foreach ($gateways as $detail)
 				{
-					$options[] = JHtml::_('select.option', $detail, $detail);
+					$options[] = HTMLHelper::_('select.option', $detail, $detail);
 				}
 			}
 		}
 		else
 		{
-			$gateways = JPluginHelper::getPlugin($type, $plugin = null);
+			$gateways = PluginHelper::getPlugin($type, $plugin = null);
 
 			foreach ($gateways as $detail)
 			{
-				$options[] = JHtml::_('select.option', $detail->name, $detail->name);
+				$options[] = HTMLHelper::_('select.option', $detail->name, $detail->name);
 			}
 		}
 
diff --git a/src/com_tjvendors/site/models/fields/submit.php b/src/com_tjvendors/site/models/fields/submit.php
index 00367b49..fa3d812b 100755
--- a/src/com_tjvendors/site/models/fields/submit.php
+++ b/src/com_tjvendors/site/models/fields/submit.php
@@ -10,6 +10,8 @@
 
 // Check to ensure this file is included in Joomla!
 defined('_JEXEC') or die('Restricted access');
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\Text;
 
 jimport('joomla.form.formfield');
 
@@ -38,9 +40,9 @@ public function getInput()
 		return '<button id="' . $this->id . '"'
 		. ' name="submit_' . $this->for . '"'
 		. ' value="' . $this->value . '"'
-		. ' title="' . JText::_('JSEARCH_FILTER_SUBMIT') . '"'
+		. ' title="' . Text::_('JSEARCH_FILTER_SUBMIT') . '"'
 		. ' class="btn" style="margin-top: -10px;">'
-		. JText::_('JSEARCH_FILTER_SUBMIT')
+		. Text::_('JSEARCH_FILTER_SUBMIT')
 		. ' </button>';
 	}
 }
diff --git a/src/com_tjvendors/site/models/fields/timecreated.php b/src/com_tjvendors/site/models/fields/timecreated.php
index e7b954f1..268df59f 100755
--- a/src/com_tjvendors/site/models/fields/timecreated.php
+++ b/src/com_tjvendors/site/models/fields/timecreated.php
@@ -1,3 +1,8 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Language\Text;
 <?php
 /**
  * @package     TJVendors
@@ -43,7 +48,7 @@ protected function getInput()
 
 		if (!strtotime($time_created))
 		{
-			$time_created = JFactory::getDate()->toSql();
+			$time_created = Factory::getDate()->toSql();
 			$html[]       = '<input type="hidden" name="' . $this->name . '" value="' . $time_created . '" />';
 		}
 
@@ -51,8 +56,8 @@ protected function getInput()
 
 		if ($hidden == null || !$hidden)
 		{
-			$jdate       = new JDate($time_created);
-			$pretty_date = $jdate->format(JText::_('DATE_FORMAT_LC2'));
+			$jdate       = new Date($time_created);
+			$pretty_date = $jdate->format(Text::_('DATE_FORMAT_LC2'));
 			$html[]      = "<div>" . $pretty_date . "</div>";
 		}
 
diff --git a/src/com_tjvendors/site/models/fields/timeupdated.php b/src/com_tjvendors/site/models/fields/timeupdated.php
index 12248495..03776742 100755
--- a/src/com_tjvendors/site/models/fields/timeupdated.php
+++ b/src/com_tjvendors/site/models/fields/timeupdated.php
@@ -1,3 +1,8 @@
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Factory;
 <?php
 /**
  * @package     TJVendors
@@ -50,13 +55,13 @@ protected function getInput()
 			}
 			else
 			{
-				$jdate       = new JDate($old_time_updated);
-				$pretty_date = $jdate->format(JText::_('DATE_FORMAT_LC2'));
+				$jdate       = new Date($old_time_updated);
+				$pretty_date = $jdate->format(Text::_('DATE_FORMAT_LC2'));
 				$html[]      = "<div>" . $pretty_date . "</div>";
 			}
 		}
 
-		$time_updated = JFactory::getDate()->toSql();
+		$time_updated = Factory::getDate()->toSql();
 		$html[]       = '<input type="hidden" name="' . $this->name . '" value="' . $time_updated . '" />';
 
 		return implode($html);
diff --git a/src/com_tjvendors/site/models/vendor.php b/src/com_tjvendors/site/models/vendor.php
index 03977667..a402ecef 100644
--- a/src/com_tjvendors/site/models/vendor.php
+++ b/src/com_tjvendors/site/models/vendor.php
@@ -10,8 +10,13 @@
 
 // No direct access.
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\CMS\Table\Table;
 
-jimport('joomla.application.component.modeladmin');
 JLoader::import('fronthelper', JPATH_SITE . '/components/com_tjvendors/helpers');
 JLoader::import('tjvendors', JPATH_ADMINISTRATOR . '/components/com_tjvendors/helpers');
 
@@ -20,7 +25,7 @@
  *
  * @since  1.6
  */
-class TjvendorsModelVendor extends JModelAdmin
+class TjvendorsModelVendor extends AdminModel
 {
 	/**
 	 * @var    string  client data
@@ -53,7 +58,7 @@ class TjvendorsModelVendor extends JModelAdmin
 	 * @param   string  $prefix  A prefix for the table class name. Optional.
 	 * @param   array   $config  Configuration array for model. Optional.
 	 *
-	 * @return    JTable    A database object
+	 * @return    Table    A database object
 	 *
 	 * @since    1.6
 	 */
@@ -61,9 +66,9 @@ public function getTable($type = 'Vendor', $prefix = 'TjvendorsTable', $config =
 	{
 		// Load tables to fix - unable to load the vendors data using the model object,
 		// When it is created outside the tjvendors component
-		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
+		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
 
-		return JTable::getInstance($type, $prefix, $config);
+		return Table::getInstance($type, $prefix, $config);
 	}
 
 	/**
@@ -72,14 +77,14 @@ public function getTable($type = 'Vendor', $prefix = 'TjvendorsTable', $config =
 	 * @param   array    $data      An optional array of data for the form to interogate.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
 	 *
-	 * @return  JForm  A JForm object on success, false on failure
+	 * @return  Form  A Form object on success, false on failure
 	 *
 	 * @since    1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 
 		// Get the form.
 		$form = $this->loadForm(
@@ -106,11 +111,11 @@ public function getForm($data = array(), $loadData = true)
 	 */
 	protected function loadFormData()
 	{
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 		$input = $app->input;
 		$client = $input->get('client', '', 'STRING');
 
-		$data = JFactory::getApplication()->getUserState('com_tjvendors.edit.vendor.data', array());
+		$data = Factory::getApplication()->getUserState('com_tjvendors.edit.vendor.data', array());
 
 		if (empty($data))
 		{
@@ -152,8 +157,8 @@ public function getItem($pk = null)
 	{
 		$item = parent::getItem($pk);
 
-		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
-		$vendorXref = JTable::getInstance('VendorClientXref', 'TjvendorsTable');
+		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
+		$vendorXref = Table::getInstance('VendorClientXref', 'TjvendorsTable');
 		$vendorXref->load(array('vendor_id' => $item->vendor_id));
 		$item->params = $vendorXref->params;
 
@@ -173,7 +178,7 @@ public function getItem($pk = null)
 	 */
 	public function addMultiVendor($vendor_id, $payment_gateway, $paymentDetails)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('max(' . $db->quoteName('id') . ')');
 		$query->from($db->quoteName('#__vendor_client_xref'));
@@ -196,7 +201,7 @@ public function addMultiVendor($vendor_id, $payment_gateway, $paymentDetails)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		return true;
@@ -213,7 +218,7 @@ public function addMultiVendor($vendor_id, $payment_gateway, $paymentDetails)
 	 */
 	public function checkDuplicateUser($user_id)
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('*');
 		$query->from($db->quoteName('#__tjvendors_vendors'));
@@ -231,7 +236,7 @@ public function checkDuplicateUser($user_id)
 		}
 		catch (Exception $e)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
+			Factory::getApplication()->enqueueMessage(Text::_('COM_TJVENDORS_DB_EXCEPTION_WARNING_MESSAGE'), 'error');
 		}
 
 		if (empty($rows))
@@ -257,7 +262,7 @@ public function checkDuplicateUser($user_id)
 	 */
 	public function generateGatewayFields($payment_gateway, $parentTag)
 	{
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 		$client = $app->getUserStateFromRequest('vendor.client', 'vendor.client');
 		$vendor_id = $app->getUserStateFromRequest('vendor.vendor_id', 'vendor.vendor_id');
 		$tjvendorFrontHelper = new TjvendorFrontHelper;
@@ -274,7 +279,7 @@ public function generateGatewayFields($payment_gateway, $parentTag)
 
 		if (jFile::exists($form_path))
 		{
-			$form = JForm::getInstance($test, $form_path, array('control' => $parentTag));
+			$form = Form::getInstance($test, $form_path, array('control' => $parentTag));
 
 			if ($vendor_id)
 			{
@@ -334,9 +339,9 @@ public function generateGatewayFields($payment_gateway, $parentTag)
 	public function save($data)
 	{
 		$table    = $this->getTable();
-		$db       = JFactory::getDbo();
-		$user     = JFactory::getUser();
-		$app      = JFactory::getApplication();
+		$db       = Factory::getDbo();
+		$user     = Factory::getUser();
+		$app      = Factory::getApplication();
 		$input    = $app->input;
 		$layout   = $input->get('layout', '', 'STRING');
 		$xrefData = array();
@@ -374,7 +379,7 @@ public function save($data)
 
 			if ($authorised !== true)
 			{
-				throw new Exception(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+				throw new Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403);
 			}
 		}
 
@@ -424,7 +429,7 @@ public function save($data)
 				$client_entry->approved = $data['approved'];
 
 				// Insert the object into the user profile table.
-				JFactory::getDbo()->insertObject('#__vendor_client_xref', $client_entry);
+				Factory::getDbo()->insertObject('#__vendor_client_xref', $client_entry);
 				$tjvendorsTriggerVendor->onAfterVendorSave($data, true);
 
 				return true;
@@ -479,7 +484,7 @@ public function save($data)
 					$client_entry->approved = $data['approved'];
 
 					// Insert the object into the vendor_client_xref table.
-					$result = JFactory::getDbo()->insertObject('#__vendor_client_xref', $client_entry);
+					$result = Factory::getDbo()->insertObject('#__vendor_client_xref', $client_entry);
 				}
 
 				/* Send mail on vendor creation */
@@ -552,14 +557,14 @@ public function formatPaymentStructure($data, $paymentDetails)
 	 */
 	public static function getPayableAmount($vendorId, $client = '', $currency = '')
 	{
-		$date              = JFactory::getDate();
-		$com_params        = JComponentHelper::getParams('com_tjvendors');
+		$date              = Factory::getDate();
+		$com_params        = ComponentHelper::getParams('com_tjvendors');
 		$bulkPayoutStatus  = $com_params->get('bulk_payout');
 		$payoutDayLimit  = $com_params->get('payout_limit_days', '0', 'INT');
 		$payoutDateLimit = $date->modify("-" . $payoutDayLimit . " day");
 
 		// Query to get the credit amount
-		$db    = JFactory::getDbo();
+		$db    = Factory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('SUM(credit) as credit');
 		$query->select('SUM(debit) as debit');
@@ -630,8 +635,8 @@ public function getDetailsByXrefId($xrefId)
 			return false;
 		}
 
-		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
-		$vendorXref = JTable::getInstance('VendorClientXref', 'TjvendorsTable');
+		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjvendors/tables');
+		$vendorXref = Table::getInstance('VendorClientXref', 'TjvendorsTable');
 		$vendorXref->load(array('id' => $xrefId));
 		$item = parent::getItem($vendorXref->vendor_id);
 
diff --git a/src/com_tjvendors/site/models/vendors.php b/src/com_tjvendors/site/models/vendors.php
index c679d80a..459abd31 100644
--- a/src/com_tjvendors/site/models/vendors.php
+++ b/src/com_tjvendors/site/models/vendors.php
@@ -10,15 +10,16 @@
 
 // No direct access.
 defined('_JEXEC') or die();
-
-jimport('joomla.application.component.modeladmin');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\MVC\Model\ListModel;
 
 /**
  * Tjvendors model.
  *
  * @since  1.6
  */
-class TjvendorsModelVendors extends JModelList
+class TjvendorsModelVendors extends ListModel
 {
 /**
 	* Constructor.
@@ -64,7 +65,7 @@ public function __construct($config = array())
 	protected function populateState($ordering = null, $direction = null)
 	{
 		// Initialise variables.
-		$app = JFactory::getApplication('administrator');
+		$app = Factory::getApplication('administrator');
 
 		// Set ordering.
 		$orderCol = $app->getUserStateFromRequest($this->context . '.filter_order', 'filter_order');
@@ -98,7 +99,7 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('filter.search', $search);
 
 		// Load the parameters.
-		$params = JComponentHelper::getParams('com_tjvendors');
+		$params = ComponentHelper::getParams('com_tjvendors');
 		$this->setState('params', $params);
 
 		parent::populateState();
@@ -114,7 +115,7 @@ protected function populateState($ordering = null, $direction = null)
 
 	protected function getListQuery()
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 
 		$filterClient = $this->getState('filter.vendor_client', '');
diff --git a/src/com_tjvendors/site/tables/vendor.php b/src/com_tjvendors/site/tables/vendor.php
index d7436f30..fadd47bd 100644
--- a/src/com_tjvendors/site/tables/vendor.php
+++ b/src/com_tjvendors/site/tables/vendor.php
@@ -10,7 +10,13 @@
 
 // No direct access
 defined('_JEXEC') or die();
-
+use Joomla\CMS\Factory;
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Filter\OutputFilter;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Table\Table;
+use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -18,7 +24,7 @@
  *
  * @since  1.6
  */
-class TjvendorsTablevendor extends JTable
+class TjvendorsTablevendor extends Table
 {
 	/**
 	 * Constructor
@@ -27,7 +33,7 @@ class TjvendorsTablevendor extends JTable
 	 */
 	public function __construct(&$db)
 	{
-		JObserverMapper::addObserverClassToClass('JTableObserverContenthistory', 'TjvendorsTablevendor',
+		JObserverMapper::addObserverClassToClass('ContentHistory', 'TjvendorsTablevendor',
 				array('typeAlias' => 'com_tjvendors.vendor')
 				);
 
@@ -42,29 +48,29 @@ public function __construct(&$db)
 	 *
 	 * @return  null|string  null is operation was satisfactory, otherwise returns an error
 	 *
-	 * @see     JTable:bind
+	 * @see     Table:bind
 	 * @since   1.5
 	 */
 	public function bind($array, $ignore = '')
 	{
 		if (isset($array['params']) && is_array($array['params']))
 		{
-			$registry = new JRegistry;
+			$registry = new Registry;
 			$registry->loadArray($array['params']);
 			$array['params'] = (string) $registry;
 		}
 
 		if (isset($array['metadata']) && is_array($array['metadata']))
 		{
-			$registry = new JRegistry;
+			$registry = new Registry;
 			$registry->loadArray($array['metadata']);
 			$array['metadata'] = (string) $registry;
 		}
 
-		if (! JFactory::getUser()->authorise('core.admin', 'com_tjvendors.vendor.' . $array['vendor_id']))
+		if (! Factory::getUser()->authorise('core.admin', 'com_tjvendors.vendor.' . $array['vendor_id']))
 		{
-			$actions = JAccess::getActionsFromFile(JPATH_ADMINISTRATOR . '/components/com_tjvendors/access.xml', "/access/section[@name='vendor']/");
-			$default_actions = JAccess::getAssetRules('com_tjvendors.vendor.' . $array['vendor_id'])->getData();
+			$actions = Access::getActionsFromFile(JPATH_ADMINISTRATOR . '/components/com_tjvendors/access.xml', "/access/section[@name='vendor']/");
+			$default_actions = Access::getAssetRules('com_tjvendors.vendor.' . $array['vendor_id'])->getData();
 			$array_jaccess = array();
 
 			foreach ($actions as $action)
@@ -85,9 +91,9 @@ public function bind($array, $ignore = '')
 	}
 
 	/**
-	 * This function convert an array of JAccessRule objects into an rules array.
+	 * This function convert an array of Rule objects into an rules array.
 	 *
-	 * @param   array  $jaccessrules  An array of JAccessRule objects.
+	 * @param   array  $jaccessrules  An array of Rule objects.
 	 *
 	 * @return  array
 	 */
@@ -119,7 +125,7 @@ public function check()
 	{
 		jimport('joomla.filesystem.file');
 
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$this->alias = trim($this->alias);
 
 		if (!$this->alias)
@@ -129,29 +135,29 @@ public function check()
 
 		if ($this->alias)
 		{
-			if (JFactory::getConfig()->get('unicodeslugs') == 1)
+			if (Factory::getConfig()->get('unicodeslugs') == 1)
 			{
-				$this->alias = JFilterOutput::stringURLUnicodeSlug($this->alias);
+				$this->alias = OutputFilter::stringURLUnicodeSlug($this->alias);
 			}
 			else
 			{
-				$this->alias = JFilterOutput::stringURLSafe($this->alias);
+				$this->alias = OutputFilter::stringURLSafe($this->alias);
 			}
 		}
 
 		// Check if event with same alias is present
-		$table = JTable::getInstance('Vendor', 'TjVendorsTable', array('dbo', $db));
+		$table = Table::getInstance('Vendor', 'TjVendorsTable', array('dbo', $db));
 
 		if ($table->load(array('alias' => $this->alias)) && ($table->vendor_id != $this->vendor_id || $this->vendor_id == 0))
 		{
-			$msg = JText::_('COM_TJVENDORS_SAVE_ALIAS_WARNING');
+			$msg = Text::_('COM_TJVENDORS_SAVE_ALIAS_WARNING');
 
 			while ($table->load(array('alias' => $this->alias)))
 			{
 				$this->alias = JString::increment($this->alias, 'dash');
 			}
 
-			JFactory::getApplication()->enqueueMessage($msg, 'warning');
+			Factory::getApplication()->enqueueMessage($msg, 'warning');
 		}
 
 		// If there is an ordering column and this is a new row then get the next ordering value
@@ -160,7 +166,7 @@ public function check()
 			$this->ordering = self::getNextOrder();
 		}
 
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 		$files = $app->input->files->get('jform', array(), 'raw');
 		$array = $app->input->get('jform', array(), 'ARRAY');
 
@@ -178,13 +184,13 @@ public function check()
 				switch ($fileError)
 				{
 					case 1:
-						$message = JText::_('COM_TJVENDOR_FILE_SIZE_EXCEEDS');
+						$message = Text::_('COM_TJVENDOR_FILE_SIZE_EXCEEDS');
 						break;
 					case 2:
-						$message = JText::_('COM_TJVENDOR_FILE_SIZE_EXCEEDS_FORM');
+						$message = Text::_('COM_TJVENDOR_FILE_SIZE_EXCEEDS_FORM');
 						break;
 					case 3:
-						$message = JText::_('COM_TJVENDOR_FILE_PARTIAL_UPLOAD_ERROR');
+						$message = Text::_('COM_TJVENDOR_FILE_PARTIAL_UPLOAD_ERROR');
 						break;
 				}
 
@@ -214,16 +220,16 @@ public function check()
 					return false;
 				}
 
-				$filename = JFile::stripExt($singleFile['name']);
-				$extension = JFile::getExt($singleFile['name']);
+				$filename = File::stripExt($singleFile['name']);
+				$extension = File::getExt($singleFile['name']);
 				$filename = md5(time()) . $filename;
 				$filepath = '/media/com_tjvendor/vendor/' . $filename . '.' . $extension;
 				$uploadPath = JPATH_ROOT . $filepath;
 				$fileTemp = $singleFile['tmp_name'];
 
-				if (! JFile::exists($uploadPath))
+				if (! File::exists($uploadPath))
 				{
-					if (! JFile::upload($fileTemp, $uploadPath))
+					if (! File::upload($fileTemp, $uploadPath))
 					{
 						$app->enqueueMessage('COM_TJVENDOR_FILE_MOVING_ERROR', 'warning');
 
@@ -276,7 +282,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 			// Nothing to set publishing state on, return false.
 			else
 			{
-				throw new Exception(500, JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+				throw new Exception(500, Text::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
 			}
 		}
 
@@ -307,7 +313,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 			}
 		}
 
-		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		// If the Table instance value is in the list of primary keys that were set, set the instance.
 		if (in_array($this->$k, $pks))
 		{
 			$this->state = $state;
@@ -321,7 +327,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 	 *
 	 * @return string The asset name
 	 *
-	 * @see JTable::_getAssetName
+	 * @see Table::_getAssetName
 	 */
 	protected function _getAssetName()
 	{
@@ -333,17 +339,17 @@ protected function _getAssetName()
 	/**
 	 * Returns the parent asset's id. If you have a tree structure, retrieve the parent's id using the external key field
 	 *
-	 * @param   JTable   $table  Table name
+	 * @param   Table    $table  Table name
 	 * @param   integer  $id     Id
 	 *
-	 * @see JTable::_getAssetParentId
+	 * @see Table::_getAssetParentId
 	 *
 	 * @return mixed The id on success, false on failure.
 	 */
-	protected function _getAssetParentId(JTable $table = null, $id = null)
+	protected function _getAssetParentId(Table $table = null, $id = null)
 	{
 		// We will retrieve the parent-asset from the Asset-table
-		$assetParent = JTable::getInstance('Asset');
+		$assetParent = Table::getInstance('Asset');
 
 		// Default: if no asset-parent can be found we take the global asset
 		$assetParentId = $assetParent->getRootId();
diff --git a/src/com_tjvendors/site/tjvendors.php b/src/com_tjvendors/site/tjvendors.php
index e64a52d4..482beefb 100755
--- a/src/com_tjvendors/site/tjvendors.php
+++ b/src/com_tjvendors/site/tjvendors.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Controller\BaseController;
 
-include_once  JPATH_SITE . '/components/com_tjvendors/includes/tjvendors.php';
+include_once JPATH_SITE . '/components/com_tjvendors/includes/tjvendors.php';
 
 JLoader::registerPrefix('Tjvendors', JPATH_COMPONENT);
 
diff --git a/src/com_tjvendors/site/views/vendor/tmpl/default.php b/src/com_tjvendors/site/views/vendor/tmpl/default.php
index 65fe16ed..e7eb8a11 100755
--- a/src/com_tjvendors/site/views/vendor/tmpl/default.php
+++ b/src/com_tjvendors/site/views/vendor/tmpl/default.php
@@ -1,20 +1,26 @@
 <?php
 /**
- * @version    CVS: 1.0.0
- * @package    Com_Tjvendors
- * @author     Parth Lawate <contact@techjoomla.com>
- * @copyright  2016 Parth Lawate
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * @package     TJVendors
+ * @subpackage  com_tjvendors
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
+
 // No direct access
 defined('_JEXEC') or die();
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 ?>
 <?php if (!empty($this->vendor_id) )
 	{
 	?>
 	<h1>
 		<?php
-			echo JText::_('COM_TJVENDOR_VENDOR_PROFILE');
+			echo Text::_('COM_TJVENDOR_VENDOR_PROFILE');
 			?>
 	</h1>
 	<input type="hidden" name="client" value="<?php echo $this->input->get('client', '', 'STRING'); ?>" />
@@ -24,8 +30,8 @@
 				<?php echo htmlspecialchars($this->VendorDetail->vendor_title, ENT_COMPAT, 'UTF-8');?>
 				<span class="pull-right">
 					<small>
-						<a  href="<?php echo JRoute::_('index.php?option=com_tjvendors&view=vendor&&layout=profile&client=' .$this->input->get('client', '', 'STRING'). '&vendor_id=' . $this->vendor_id );?>">
-						<i class="fa fa-wrench" aria-hidden="true"></i>  <?php echo JText::_("COM_TJVENDORS_VENDOR_UPDATE"); ?></a>
+						<a  href="<?php echo Route::_('index.php?option=com_tjvendors&view=vendor&&layout=profile&client=' .$this->input->get('client', '', 'STRING'). '&vendor_id=' . $this->vendor_id );?>">
+						<i class="fa fa-wrench" aria-hidden="true"></i>  <?php echo Text::_("COM_TJVENDORS_VENDOR_UPDATE"); ?></a>
 					</small>
 				</span>
 			</h3>
@@ -35,7 +41,7 @@
 			{
 			?>
 				<div class="controls col-sm-3 center">
-					<img  src="<?php echo JUri::root() . $this->VendorDetail->vendor_logo; ?>" width="100%">
+					<img  src="<?php echo Uri::root() . $this->VendorDetail->vendor_logo; ?>" width="100%">
 				</div>
 		<?php
 			}
@@ -43,7 +49,7 @@
 			{
 			?>
 				<div class="controls col-sm-3 center">
-					<img src="<?php echo JUri::root() . "/administrator/components/com_tjvendors/assets/images/default.png"; ?>" width="100%">
+					<img src="<?php echo Uri::root() . "/administrator/components/com_tjvendors/assets/images/default.png"; ?>" width="100%">
 				</div>
 		<?php
 			}
@@ -58,18 +64,18 @@
 	</div>
 	<?php
 	}
-	elseif(JFactory::getUser()->id && !$this->vendor_id)
+	elseif(Factory::getUser()->id && !$this->vendor_id)
 	{
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 		$client = $app->input->get('client', '', 'STRING');
-		$link =JRoute::_('index.php?option=com_tjvendors&view=vendor&layout=edit&client=' . $client);
-		$app->enqueueMessage(JText::_('COM_TJVENDOR_REGISTRATION_VENDOR_ERROR'), 'warning');
+		$link =Route::_('index.php?option=com_tjvendors&view=vendor&layout=edit&client=' . $client);
+		$app->enqueueMessage(Text::_('COM_TJVENDOR_REGISTRATION_VENDOR_ERROR'), 'warning');
 		$app->redirect($link);
 	}
 	else
 	{
-		$link =JRoute::_('index.php?option=com_users');
-		$app = JFactory::getApplication();
+		$link =Route::_('index.php?option=com_users');
+		$app = Factory::getApplication();
 		$app->redirect($link);
 	}
 	?>
diff --git a/src/com_tjvendors/site/views/vendor/tmpl/edit.php b/src/com_tjvendors/site/views/vendor/tmpl/edit.php
index 3f3aa93e..ea5c7c21 100755
--- a/src/com_tjvendors/site/views/vendor/tmpl/edit.php
+++ b/src/com_tjvendors/site/views/vendor/tmpl/edit.php
@@ -1,47 +1,53 @@
 <?php
 /**
- * @package    TJ-Vendors
- * @author     TechJoomla <extensions@techjoomla.com>
- * @website    http://techjoomla.com
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * @package     TJVendors
+ * @subpackage  com_tjvendors
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
-JHtml::_('formbehavior.chosen', 'select');
-JHtml::_('behavior.keepalive');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+HTMLHelper::_('behavior.tooltip');
+HTMLHelper::_('behavior.formvalidation');
+HTMLHelper::_('formbehavior.chosen', 'select');
+HTMLHelper::_('behavior.keepalive');
 ?>
 <script type="text/javascript">
 	var layout = '<?php echo "edit";?>';
 	var _URL                              = window.URL || window.webkitURL;
-	var allowedMediaSizeErrorMessage      = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_SIZE_VALIDATE") . $this->params->get('image_size') . 'KB';?>";
-	var allowedImageDimensionErrorMessage = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_DIMENSIONS_VALIDATE");?>";
-	var allowedImageTypeErrorMessage      = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_IMAGE_TYPE_VALIDATION");?>";
+	var allowedMediaSizeErrorMessage      = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_SIZE_VALIDATE") . $this->params->get('image_size') . 'KB';?>";
+	var allowedImageDimensionErrorMessage = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_DIMENSIONS_VALIDATE");?>";
+	var allowedImageTypeErrorMessage      = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_IMAGE_TYPE_VALIDATION");?>";
 	const vendorAllowedMediaSize          = "<?php echo $max_images_size = $this->params->get('image_size') * 1024; ?>";
 	tjVSite.vendor.initVendorJs();
 </script>
 
 <div id="tjv-wrapper" class="<?php echo COM_TJVENDORS_WRAPPAER_CLASS;?>">
 <?php
-if (JFactory::getUser()->id )
+if (Factory::getUser()->id )
 {
 	?>
 	<h1>
-		<?php echo JText::_('COM_TJVENDOR_CREATE_VENDOR');?>
+		<?php echo Text::_('COM_TJVENDOR_CREATE_VENDOR');?>
 	</h1>
-	<form action="<?php echo JRoute::_('index.php?option=com_tjvendors&layout=edit&vendor_id=' .$this->input->get('vendor_id', '', 'INTEGER') .'&client=' . $this->input->get('client', '', 'STRING') ); ?>"
+	<form action="<?php echo Route::_('index.php?option=com_tjvendors&layout=edit&vendor_id=' .$this->input->get('vendor_id', '', 'INTEGER') .'&client=' . $this->input->get('client', '', 'STRING') ); ?>"
 		method="post" enctype="multipart/form-data" name="adminForm" id="adminForm" class="form-validate">
 		<div class="row">
 			<div class="col-sm-12 vendorForm" id="tj-edit-form">
 			<?php if(!$this->isClientExist): ?>
 				<ul class="nav nav-tabs vendorForm__nav d-flex mb-15">
-				  <li class="active"><a data-toggle="tab" href="#tab1"><?php echo JText::_('COM_TJVENDORS_TITLE_PERSONAL'); ?></a> </li>
-				  <li><a data-toggle="tab" href="#tab2"><?php echo JText::_('COM_TJVENDORS_VENDOR_PAYMENT_GATEWAY_DETAILS'); ?></a></li>
+				  <li class="active"><a data-toggle="tab" href="#tab1"><?php echo Text::_('COM_TJVENDORS_TITLE_PERSONAL'); ?></a> </li>
+				  <li><a data-toggle="tab" href="#tab2"><?php echo Text::_('COM_TJVENDORS_VENDOR_PAYMENT_GATEWAY_DETAILS'); ?></a></li>
 				</ul>
 			<?php endif; ?>
 				<!----Tab Container Start----->
@@ -55,7 +61,7 @@
 							<input type="hidden" name="jform[ordering]" value="<?php echo $this->vendor->ordering; ?>" />
 							<input type="hidden" name="jform[state]" value="<?php echo $this->vendor->state; ?>" />
 							<?php
-							$input = JFactory::getApplication()->input;
+							$input = Factory::getApplication()->input;
 
 							if ($this->vendor_id != 0)
 							{
@@ -63,19 +69,19 @@
 								<div class="pull-left alert alert-info">
 
 									<?php
-										echo JText::_('COM_TJVENDORS_DISPLAY_YOU_ARE_ALREADY_A_VENDOR_AS');
+										echo Text::_('COM_TJVENDORS_DISPLAY_YOU_ARE_ALREADY_A_VENDOR_AS');
 									?>
 
-									<a href="<?php echo JRoute::_('index.php?option=com_tjvendors&view=vendor&layout=profile&client=' . $this->client . '&vendor_id=' . $this->vendor_id);?>">
+									<a href="<?php echo Route::_('index.php?option=com_tjvendors&view=vendor&layout=profile&client=' . $this->client . '&vendor_id=' . $this->vendor_id);?>">
 									<strong><?php echo $this->escape($this->VendorDetail->vendor_title);?></a></strong>
 
 									<?php
 									if (!$this->isClientExist)
 									{
-										echo " " . JText::_('COM_TJVENDORS_DISPLAY_DO_YOU_WANT_TO_ADD');
+										echo " " . Text::_('COM_TJVENDORS_DISPLAY_DO_YOU_WANT_TO_ADD');
 										$tjvendorFrontHelper = new TjvendorFrontHelper;
 										echo $client = $tjvendorFrontHelper->getClientName($this->client);
-										echo JText::_('COM_TJVENDORS_DISPLAY_AS_A_CLIENT');
+										echo Text::_('COM_TJVENDORS_DISPLAY_AS_A_CLIENT');
 									}
 									?>
 								</div>
@@ -102,7 +108,7 @@
 										<div class="form-group">
 											<div class="row">
 												<div class="col-xs-12 col-sm-10 col-md-7">
-													<img src="<?php echo JUri::root() . $this->vendor->vendor_logo; ?>">
+													<img src="<?php echo Uri::root() . $this->vendor->vendor_logo; ?>">
 												</div>
 											</div>
 										</div>
@@ -116,7 +122,7 @@
 										<div class="form-group">
 											<div class="row">
 												<div class="col-xs-12 col-sm-10 col-md-7">
-													<img src="<?php echo JUri::root() . "/administrator/components/com_tjvendors/assets/images/default.png"; ?>">
+													<img src="<?php echo Uri::root() . "/administrator/components/com_tjvendors/assets/images/default.png"; ?>">
 												</div>
 											</div>
 											<div class="mt-10">
@@ -127,7 +133,7 @@
 									}
 									?>
 									<div class="alert alert-info">
-										<?php echo sprintf(JText::_("COM_TJVENDORS_MAXIMUM_LOGO_UPLOAD_SIZE_NOTE"), $this->params->get('image_size', '', 'STRING'));?>
+										<?php echo sprintf(Text::_("COM_TJVENDORS_MAXIMUM_LOGO_UPLOAD_SIZE_NOTE"), $this->params->get('image_size', '', 'STRING'));?>
 									</div>
 								</div>
 							</div>
@@ -156,11 +162,11 @@
 			?>
 			<div class="mt-10">
 				<button type="button" class="btn btn-default btn-primary"  onclick="Joomla.submitbutton('vendor.save')">
-					<span><?php echo JText::_('JSUBMIT'); ?></span>
+					<span><?php echo Text::_('JSUBMIT'); ?></span>
 				</button>
 
 				<button class="btn  btn-default" onclick="Joomla.submitbutton('vendor.cancel')">
-					<?php echo JText::_('JCANCEL'); ?>
+					<?php echo Text::_('JCANCEL'); ?>
 				</button>
 			</div>
 		<?php
@@ -170,24 +176,24 @@
 			?>
 			<div class="mt-10">
 				<button type="button" class="btn btn-default  btn-primary"  onclick="Joomla.submitbutton('vendor.save')">
-					<span><?php echo JText::_('COM_TJVENDORS_CLIENT_APPROVAL'); ?></span>
+					<span><?php echo Text::_('COM_TJVENDORS_CLIENT_APPROVAL'); ?></span>
 				</button>
 				<button class="btn  btn-default" onclick="Joomla.submitbutton('vendor.cancel')">
-					<?php echo JText::_('COM_TJVENDORS_CLIENT_REJECTION'); ?>
+					<?php echo Text::_('COM_TJVENDORS_CLIENT_REJECTION'); ?>
 				</button>
 			</div>
 			<?php
 		}
 		?>
 		<input type="hidden" name="task" value="vendor.save"/>
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</form>
 	<?php
 }
 else
 {
-	$link = JRoute::_('index.php?option=com_users');
-	$app = JFactory::getApplication();
+	$link = Route::_('index.php?option=com_users');
+	$app = Factory::getApplication();
 	$app->redirect($link);
 }
 ?>
diff --git a/src/com_tjvendors/site/views/vendor/tmpl/profile.php b/src/com_tjvendors/site/views/vendor/tmpl/profile.php
index 5e93f758..cd75b955 100644
--- a/src/com_tjvendors/site/views/vendor/tmpl/profile.php
+++ b/src/com_tjvendors/site/views/vendor/tmpl/profile.php
@@ -1,48 +1,55 @@
 <?php
 /**
- * @version    CVS: 1.0.0
- * @package    Com_Tjvendors
- * @author     Parth Lawate <contact@techjoomla.com>
- * @copyright  2016 Parth Lawate
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * @package     TJVendors
+ * @subpackage  com_tjvendors
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
+
 // No direct access
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
-JHtml::_('formbehavior.chosen', 'select');
-JHtml::_('behavior.keepalive');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+HTMLHelper::_('behavior.tooltip');
+HTMLHelper::_('behavior.formvalidation');
+HTMLHelper::_('formbehavior.chosen', 'select');
+HTMLHelper::_('behavior.keepalive');
 ?>
 <script type="text/javascript">
 	var layout = '<?php echo "profile";?>';
 	var _URL                              = window.URL || window.webkitURL;
-	var allowedMediaSizeErrorMessage      = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_SIZE_VALIDATE") . $this->params->get('image_size') . 'KB';?>";
-	var allowedImageDimensionErrorMessage = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_DIMENSIONS_VALIDATE");?>";
-	var allowedImageTypeErrorMessage      = "<?php echo JText::_("COM_TJVENDORS_VENDOR_LOGO_IMAGE_TYPE_VALIDATION");?>";
+	var allowedMediaSizeErrorMessage      = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_SIZE_VALIDATE") . $this->params->get('image_size') . 'KB';?>";
+	var allowedImageDimensionErrorMessage = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_DIMENSIONS_VALIDATE");?>";
+	var allowedImageTypeErrorMessage      = "<?php echo Text::_("COM_TJVENDORS_VENDOR_LOGO_IMAGE_TYPE_VALIDATION");?>";
 	const vendorAllowedMediaSize          = "<?php echo $max_images_size = $this->params->get('image_size') * 1024; ?>";
 	tjVSite.vendor.initVendorJs();
 </script>
 <div id="tjv-wrapper" class="<?php echo COM_TJVENDORS_WRAPPAER_CLASS;?>">
 <?php
-	if (JFactory::getUser()->id )
+	if (Factory::getUser()->id )
 	{
 	?>
 	<h1>
 		<?php
-			echo JText::_('COM_TJVENDOR_UPDATE_VENDOR');
+			echo Text::_('COM_TJVENDOR_UPDATE_VENDOR');
 			echo ':&nbsp' . htmlspecialchars($this->vendor->vendor_title, ENT_COMPAT, 'UTF-8');
 			?>
 	</h1>
-	<form action="<?php echo JRoute::_('index.php?option=com_tjvendors&layout=edit&vendor_id=' . $this->input->get('vendor_id', '', 'INTEGER') . '&client=' . $this->input->get('client', '', 'STRING') ); ?>"
+	<form action="<?php echo Route::_('index.php?option=com_tjvendors&layout=edit&vendor_id=' . $this->input->get('vendor_id', '', 'INTEGER') . '&client=' . $this->input->get('client', '', 'STRING') ); ?>"
 		method="post" enctype="multipart/form-data" name="adminForm" id="adminForm">
 		<div class="vendorForm">
 			<div class="row">
 				<div class="col-sm-12">
 					<ul class="nav nav-tabs vendorForm__nav d-flex mb-15">
-					  <li class="active"><a data-toggle="tab" href="#tab1"><?php echo JText::_('COM_TJVENDORS_TITLE_PERSONAL'); ?> </a></li>
-					  <li><a data-toggle="tab" href="#tab2"><?php echo JText::_('COM_TJVENDORS_VENDOR_PAYMENT_GATEWAY_DETAILS'); ?></a></li>
+					  <li class="active"><a data-toggle="tab" href="#tab1"><?php echo Text::_('COM_TJVENDORS_TITLE_PERSONAL'); ?> </a></li>
+					  <li><a data-toggle="tab" href="#tab2"><?php echo Text::_('COM_TJVENDORS_VENDOR_PAYMENT_GATEWAY_DETAILS'); ?></a></li>
 					</ul>
 					<!----Tab Container Start----->
 					<div class="tab-content">
@@ -69,7 +76,7 @@
 										<div class="form-group">
 											<div class="row">
 												<div class="col-xs-12 col-sm-10 col-md-7">
-													<img class="img-responsive" src="<?php echo JUri::root() . $this->vendor->vendor_logo; ?>">
+													<img class="img-responsive" src="<?php echo Uri::root() . $this->vendor->vendor_logo; ?>">
 												</div>
 											</div>
 										</div>
@@ -81,7 +88,7 @@
 										<div class="form-group">
 											<div class="row">
 												<div class="col-xs-12 col-sm-10 col-md-7">
-													<img src="<?php echo JUri::root() . "/administrator/components/com_tjvendors/assets/images/default.png"; ?>" class="img-thumbnail">
+													<img src="<?php echo Uri::root() . "/administrator/components/com_tjvendors/assets/images/default.png"; ?>" class="img-thumbnail">
 												</div>
 											</div>
 										</div>
@@ -92,7 +99,7 @@
 											<?php echo $this->form->renderField('vendor_logo'); ?>
 										</div>
 										<div class="alert alert-info">
-											<?php echo sprintf(JText::_("COM_TJVENDORS_MAXIMUM_LOGO_UPLOAD_SIZE_NOTE"), $this->params->get('image_size', '', 'STRING'));?>
+											<?php echo sprintf(Text::_("COM_TJVENDORS_MAXIMUM_LOGO_UPLOAD_SIZE_NOTE"), $this->params->get('image_size', '', 'STRING'));?>
 										</div>
 									</div>
 								</div>
@@ -115,13 +122,13 @@
 
 			<div class="mt-10">
 				<input type="hidden" name="task" value="vendor.save"/>
-				<?php echo JHtml::_('form.token'); ?>
+				<?php echo HTMLHelper::_('form.token'); ?>
 				<button type="button" class="btn btn-default btn-primary" onclick="Joomla.submitbutton('vendor.save')">
-					<span><?php echo JText::_('JSUBMIT'); ?></span>
+					<span><?php echo Text::_('JSUBMIT'); ?></span>
 				</button>
 
 				<button class="btn btn-default" onclick="Joomla.submitbutton('vendor.cancel')">
-					<?php echo JText::_('JCANCEL'); ?>
+					<?php echo Text::_('JCANCEL'); ?>
 				</button>
 			</div>
 		</div>
@@ -130,8 +137,8 @@
 	}
 	else
 	{
-		$link = JRoute::_('index.php?option=com_users');
-		$app = JFactory::getApplication();
+		$link = Route::_('index.php?option=com_users');
+		$app = Factory::getApplication();
 		$app->redirect($link);
 	}
 	?>
diff --git a/src/com_tjvendors/site/views/vendor/view.html.php b/src/com_tjvendors/site/views/vendor/view.html.php
index 17bcb087..640ce101 100755
--- a/src/com_tjvendors/site/views/vendor/view.html.php
+++ b/src/com_tjvendors/site/views/vendor/view.html.php
@@ -1,22 +1,29 @@
 <?php
 /**
- * @version    SVN:
- * @package    Com_Tjvendors
- * @author     Techjoomla <contact@techjoomla.com>
- * @copyright  Copyright  2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJVendors
+ * @subpackage  com_tjvendors
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
+
 // No direct access
 defined('_JEXEC') or die;
-
-jimport('joomla.application.component.view');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Table\Table;
 
 /**
  * View to edit
  *
  * @since  1.6
  */
-class TjvendorsViewVendor extends JViewLegacy
+class TjvendorsViewVendor extends HtmlView
 {
 	protected $state;
 
@@ -53,34 +60,34 @@ class TjvendorsViewVendor extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		$this->params = JComponentHelper::getParams('com_tjvendors');
+		$this->params = ComponentHelper::getParams('com_tjvendors');
 		$this->state  = $this->get('State');
 		$this->vendor = $this->get('Item');
 		$this->form   = $this->get('Form');
-		$this->input  = JFactory::getApplication()->input;
+		$this->input  = Factory::getApplication()->input;
 		$this->client = $this->input->get('client', '', 'STRING');
 
-		JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_tjvendors/models', 'vendor');
-		$tjvendorsModelVendor        = JModelLegacy::getInstance('Vendor', 'TjvendorsModel');
+		BaseDatabaseModel::addIncludePath(JPATH_SITE . '/components/com_tjvendors/models', 'vendor');
+		$tjvendorsModelVendor        = BaseDatabaseModel::getInstance('Vendor', 'TjvendorsModel');
 		$tjvendorFrontHelper         = new TjvendorFrontHelper;
 		$this->vendor_id             = $tjvendorFrontHelper->getvendor();
 		$this->client                = $this->input->get('client', '', 'STRING');
 		$this->isClientExist         = $tjvendorFrontHelper->isClientExist($this->client, $this->vendor_id);
-		$this->vendorClientXrefTable = JTable::getInstance('vendorclientxref', 'TjvendorsTable', array());
+		$this->vendorClientXrefTable = Table::getInstance('vendorclientxref', 'TjvendorsTable', array());
 		$this->vendorClientXrefTable->load(array('vendor_id' => $this->vendor_id, 'client' => $this->client));
 		$this->VendorDetail          = $tjvendorsModelVendor->getItem($this->vendor_id);
 
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 		$app->setUserState("vendor.client", $this->client);
 		$app->setUserState("vendor.vendor_id", $this->vendor->vendor_id);
 		$this->layout = $this->input->get('layout', '', 'STRING');
-		JText::script('COM_TJVENDOR_PAYMENTGATEWAY_NO_FIELD_MESSAGE');
-		JText::script('COM_TJVENDOR_DESCRIPTION_READ_MORE');
-		JText::script('COM_TJVENDOR_DESCRIPTION_READ_LESS');
+		Text::script('COM_TJVENDOR_PAYMENTGATEWAY_NO_FIELD_MESSAGE');
+		Text::script('COM_TJVENDOR_DESCRIPTION_READ_MORE');
+		Text::script('COM_TJVENDOR_DESCRIPTION_READ_LESS');
 
 		if ($this->layout == 'profile' && $this->vendor_id != $this->vendor->vendor_id)
 		{
-			throw new Exception(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+			throw new Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403);
 		}
 
 		if (!empty($this->vendor_id) && $this->layout == "edit")
@@ -91,9 +98,9 @@ public function display($tpl = null)
 				{
 					if ($client == $this->client)
 					{
-						$link = JRoute::_('index.php?option=com_tjvendors&view=vendor&layout=profile&client=' . $this->client . '&vendor_id=' . $this->vendor_id);
-						$app = JFactory::getApplication();
-						$app->enqueueMessage(JText::_('COM_TJVENDOR_REGISTRATION_REDIRECT_MESSAGE'));
+						$link = Route::_('index.php?option=com_tjvendors&view=vendor&layout=profile&client=' . $this->client . '&vendor_id=' . $this->vendor_id);
+						$app = Factory::getApplication();
+						$app->enqueueMessage(Text::_('COM_TJVENDOR_REGISTRATION_REDIRECT_MESSAGE'));
 						$app->redirect($link);
 					}
 				}
diff --git a/src/com_tjvendors/site/views/vendors/tmpl/default.php b/src/com_tjvendors/site/views/vendors/tmpl/default.php
index 80ca64a5..6ea51155 100755
--- a/src/com_tjvendors/site/views/vendors/tmpl/default.php
+++ b/src/com_tjvendors/site/views/vendors/tmpl/default.php
@@ -1,14 +1,21 @@
 <?php
 /**
- * @package     Joomla.Administrator
+ * @package     TJVendors
  * @subpackage  com_tjvendors
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
+
 // No direct access to this file
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
 
-JHtml::_('formbehavior.chosen', 'select');
+HTMLHelper::_('formbehavior.chosen', 'select');
 
 $listOrder = $this->state->get('list.ordering');
 $listDirn  = $this->state->get('list.direction');
@@ -35,15 +42,15 @@
 
 <div id="tjv-wrapper" class="<?php echo COM_TJVENDORS_WRAPPAER_CLASS;?>">
 	<h1>
-		<?php echo JText::_('COM_TJVENDOR_VENDOR_PAYOUT_REPORTS'); ?>
+		<?php echo Text::_('COM_TJVENDOR_VENDOR_PAYOUT_REPORTS'); ?>
 	</h1>
 
 	<?php
-	$user_id = JFactory::getUser()->id;
+	$user_id = Factory::getUser()->id;
 	if (!empty($this->vendor_id))
 	{
 		?>
-		<form action="<?php echo JRoute::_('index.php?option=com_tjvendors&view=vendors&client=' . $this->input->get('client', '', 'STRING'));?>" method="post" id="adminForm" name="adminForm">
+		<form action="<?php echo Route::_('index.php?option=com_tjvendors&view=vendors&client=' . $this->input->get('client', '', 'STRING'));?>" method="post" id="adminForm" name="adminForm">
 
 			<div id="j-main-container" class="vendor-report">
 				<!-----"vendor-report" is a page cover class--->
@@ -51,15 +58,15 @@
 					<div class="col-xs-12 col-md-6 date">
 						<div class="btn-group input-group">
 							<span class="input-group-btn">
-								<?php echo JHtml::_('calendar', $this->state->get('filter.fromDate'), 'fromDates', 'dates', '%Y-%m-%d', array('class' => 'inputbox date__field', 'onchange' => 'document.adminForm.submit()')); ?>
+								<?php echo HTMLHelper::_('calendar', $this->state->get('filter.fromDate'), 'fromDates', 'dates', '%Y-%m-%d', array('class' => 'inputbox date__field', 'onchange' => 'document.adminForm.submit()')); ?>
 							</span>
 
 							<span class="input-group-btn">
-								<?php echo JHtml::_('calendar', $this->state->get('filter.toDate'), 'toDates', 'date', '%Y-%m-%d', array('class' => 'inputbox date__field', 'onchange' => 'document.adminForm.submit()')); ?>
+								<?php echo HTMLHelper::_('calendar', $this->state->get('filter.toDate'), 'toDates', 'date', '%Y-%m-%d', array('class' => 'inputbox date__field', 'onchange' => 'document.adminForm.submit()')); ?>
 							</span>
 
 							<span>
-								<button class="btn btn-primary" id="clear-calendar" type="button" title="<?php echo JText::_('JSEARCH_CALENDAR_CLEAR'); ?>">
+								<button class="btn btn-primary" id="clear-calendar" type="button" title="<?php echo Text::_('JSEARCH_CALENDAR_CLEAR'); ?>">
 									<i class="fa fa-remove"></i>
 								</button>
 							</span>
@@ -75,7 +82,7 @@
 								<li>
 									<div class="input-group-btn hidden-xs">
 										<?php
-										echo JHtml::_('select.genericlist', $this->currencies, "currency", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "currency", "currency", $this->state->get('filter.currency'));
+										echo HTMLHelper::_('select.genericlist', $this->currencies, "currency", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "currency", "currency", $this->state->get('filter.currency'));
 										$currency = $this->state->get('filter.currency');
 										?>
 									</div>
@@ -89,7 +96,7 @@
 								<li>
 									<div class="input-group-btn">
 										<?php
-										echo JHtml::_('select.genericlist', $this->uniqueClients, "vendor_client", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "clientType", "clientValue", $this->state->get('filter.vendor_client'));
+										echo HTMLHelper::_('select.genericlist', $this->uniqueClients, "vendor_client", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "clientType", "clientValue", $this->state->get('filter.vendor_client'));
 										$clientFilter = $this->state->get('filter.vendor_client');
 										?>
 									</div>
@@ -101,11 +108,11 @@
 							<li>
 								<div class="input-group-btn hidden-xs">
 									<?php
-									$transactionType[] = array("transactionType" => JText::_('COM_TJVENDORS_REPORTS_FILTER_ALL_TRANSACTIONS'), "transactionValue" => "0");
-									$transactionType[] = array("transactionType" => JText::_('COM_TJVENDORS_REPORTS_FILTER_CREDIT'), "transactionValue" => JText::_('COM_TJVENDORS_REPORTS_FILTER_CREDIT'));
-									$transactionType[] = array("transactionType" => JText::_('COM_TJVENDORS_REPORTS_FILTER_DEBIT'), "transactionValue" => JText::_('COM_TJVENDORS_REPORTS_FILTER_DEBIT'));
+									$transactionType[] = array("transactionType" => Text::_('COM_TJVENDORS_REPORTS_FILTER_ALL_TRANSACTIONS'), "transactionValue" => "0");
+									$transactionType[] = array("transactionType" => Text::_('COM_TJVENDORS_REPORTS_FILTER_CREDIT'), "transactionValue" => Text::_('COM_TJVENDORS_REPORTS_FILTER_CREDIT'));
+									$transactionType[] = array("transactionType" => Text::_('COM_TJVENDORS_REPORTS_FILTER_DEBIT'), "transactionValue" => Text::_('COM_TJVENDORS_REPORTS_FILTER_DEBIT'));
 
-									echo JHtml::_('select.genericlist', $transactionType, "transactionType", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "transactionValue", "transactionType", $this->state->get('filter.transactionType'));
+									echo HTMLHelper::_('select.genericlist', $transactionType, "transactionType", 'class="input-medium" size="1" onchange="document.adminForm.submit();"', "transactionValue", "transactionType", $this->state->get('filter.transactionType'));
 
 									$transactionType = $this->state->get('filter.transactionType'); ?>
 								</div>
@@ -114,7 +121,7 @@
 							<li class="pr-0">
 								<div  class="input-group-btn hidden">
 									<label for="limit" >
-										<?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?>
+										<?php echo Text::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?>
 									</label>
 									<?php echo $this->pagination->getLimitBox();?>
 								</div>
@@ -132,7 +139,7 @@
 						?>
 						<div class="col-xs-12">
 							<div class="alert alert-info">
-								<?php echo JText::_('COM_TJVENDOR_NO_MATCHING_RESULTS'); ?>
+								<?php echo Text::_('COM_TJVENDOR_NO_MATCHING_RESULTS'); ?>
 							</div>
 						</div>
 						<?php
@@ -142,8 +149,8 @@
 						?>
 						<div class="col-xs-12">
 							<div class="alert alert-info">
-								<?php echo JText::_('COM_TJVENDORS_REPORTS_CREDIT_NOTE'); ?>
-								<?php echo JText::_('COM_TJVENDORS_REPORTS_DEBIT_NOTE'); ?>
+								<?php echo Text::_('COM_TJVENDORS_REPORTS_CREDIT_NOTE'); ?>
+								<?php echo Text::_('COM_TJVENDORS_REPORTS_DEBIT_NOTE'); ?>
 							</div>
 						</div>
 
@@ -154,11 +161,11 @@
 										<thead>
 											<tr>
 												<th width="1%">
-													<?php echo JText::_('COM_TJVENDORS_VENDORS_SR_NO');?>
+													<?php echo Text::_('COM_TJVENDORS_VENDORS_SR_NO');?>
 												</th>
 
 												<th width="5%">
-													<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_TRANSACTION_ID', 'pass.`transaction_id`', $listDirn, $listOrder);?>
+													<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_TRANSACTION_ID', 'pass.`transaction_id`', $listDirn, $listOrder);?>
 												</th>
 
 												<?php
@@ -166,7 +173,7 @@
 												{
 													?>
 													<th width="5%">
-														<?php echo JText::_('COM_TJVENDORS_REPORTS_CLIENT');?>
+														<?php echo Text::_('COM_TJVENDORS_REPORTS_CLIENT');?>
 													</th>
 													<?php
 												}
@@ -175,7 +182,7 @@
 												{
 													?>
 													<th width="5%">
-														<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_CURRENCY', 'pass.`currency`', $listDirn, $listOrder); ?>
+														<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_CURRENCY', 'pass.`currency`', $listDirn, $listOrder); ?>
 													</th>
 													<?php
 												}
@@ -184,7 +191,7 @@
 												{
 													?>
 													<th class='left' width="10%">
-														<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_CREDIT_AMOUNT', 'pass.`credit`', $listDirn, $listOrder);?>
+														<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_CREDIT_AMOUNT', 'pass.`credit`', $listDirn, $listOrder);?>
 													</th>
 													<?php
 												}
@@ -193,30 +200,30 @@
 												{
 													?>
 													<th class='left' width="10%">
-														<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_DEBIT_AMOUNT', 'pass.`debit`', $listDirn, $listOrder);?>
+														<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_DEBIT_AMOUNT', 'pass.`debit`', $listDirn, $listOrder);?>
 													</th>
 													<?php
 												}
 												?>
 
 												<th width="10%">
-													<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_REFERENCE_ORDER_ID', 'pass.`reference_order_id`', $listDirn, $listOrder);?>
+													<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_REFERENCE_ORDER_ID', 'pass.`reference_order_id`', $listDirn, $listOrder);?>
 												</th>
 
 												<th width="15%">
-													<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_TRANSACTION_TIME', 'pass.`transaction_time`', $listDirn, $listOrder);?>
+													<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_TRANSACTION_TIME', 'pass.`transaction_time`', $listDirn, $listOrder);?>
 												</th>
 
 												<th width="10%">
-													<?php echo JHtml::_('grid.sort', 'COM_TJVENDORS_REPORTS_PENDING_AMOUNT', 'pass.`total`', $listDirn, $listOrder);?>
+													<?php echo HTMLHelper::_('grid.sort', 'COM_TJVENDORS_REPORTS_PENDING_AMOUNT', 'pass.`total`', $listDirn, $listOrder);?>
 												</th>
 
 												<th>
-													<?php echo JText::_('COM_TJVENDORS_REPORTS_ENTRY_STATUS'); ?>
+													<?php echo Text::_('COM_TJVENDORS_REPORTS_ENTRY_STATUS'); ?>
 												</th>
 
 												<th>
-													<?php echo JText::_('COM_TJVENDORS_REPORTS_CUSTOMER_NOTE'); ?>
+													<?php echo Text::_('COM_TJVENDORS_REPORTS_CUSTOMER_NOTE'); ?>
 												</th>
 											</tr>
 										</thead>
@@ -227,19 +234,19 @@
 													<div class="pull-right">
 														<tr>
 															<th colspan="12">
-																<?php echo JText::_('COM_TJVENDORS_REPORTS_CREDIT_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['creditAmount'] . '&nbsp' . $currency; ?>
+																<?php echo Text::_('COM_TJVENDORS_REPORTS_CREDIT_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['creditAmount'] . '&nbsp' . $currency; ?>
 															</th>
 														</tr>
 
 														<tr>
 															<th colspan="12">
-																<?php echo JText::_('COM_TJVENDORS_REPORTS_DEBIT_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['debitAmount'] . '&nbsp' . $currency; ?>
+																<?php echo Text::_('COM_TJVENDORS_REPORTS_DEBIT_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['debitAmount'] . '&nbsp' . $currency; ?>
 															</th>
 														</tr>
 
 														<tr>
 															<th colspan="12">
-																<?php echo JText::_('COM_TJVENDORS_REPORTS_PENDING_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['pendingAmount'] . '&nbsp' . $currency; ?>
+																<?php echo Text::_('COM_TJVENDORS_REPORTS_PENDING_AMOUNT') . '&nbsp:&nbsp&nbsp ' . $this->totalDetails['pendingAmount'] . '&nbsp' . $currency; ?>
 															</th>
 														</tr>
 													</div>
@@ -261,7 +268,7 @@
 														<?php echo $this->pagination->getRowOffset($i);?>
 													</td>
 
-													<td data-title="<?php echo JText::_('COM_TJVENDORS_REPORTS_TRANSACTION_ID'); ?>">
+													<td data-title="<?php echo Text::_('COM_TJVENDORS_REPORTS_TRANSACTION_ID'); ?>">
 														<?php echo htmlspecialchars($row->transaction_id, ENT_COMPAT, 'UTF-8'); ?>
 													</td>
 
@@ -269,7 +276,7 @@
 													if ($this->vendorClient == '' && $clientFilter == 'all')
 													{
 														?>
-														<td data-title="<?php echo JText::_('COM_TJVENDORS_REPORTS_CLIENT');?>">
+														<td data-title="<?php echo Text::_('COM_TJVENDORS_REPORTS_CLIENT');?>">
 															<?php
 															$tjvendorFrontHelper = new TjvendorFrontHelper;
 															$client = $tjvendorFrontHelper->getClientName($row->client);
@@ -282,7 +289,7 @@
 													if ($currency == '0')
 													{
 														?>
-														<td data-title="<?php echo JText::_('COM_TJVENDORS_REPORTS_CURRENCY');?>">
+														<td data-title="<?php echo Text::_('COM_TJVENDORS_REPORTS_CURRENCY');?>">
 															<?php echo htmlspecialchars($row->currency, ENT_COMPAT, 'UTF-8');?>
 														</td>
 														<?php
@@ -291,7 +298,7 @@
 													if ($transactionType == "Credit" || empty($transactionType))
 													{
 														?>
-														<td data-title="<?php echo JText::_('COM_TJVENDORS_REPORTS_CREDIT_AMOUNT');?>">
+														<td data-title="<?php echo Text::_('COM_TJVENDORS_REPORTS_CREDIT_AMOUNT');?>">
 															<?php
 															if ($row->credit <='0')
 															{
@@ -309,26 +316,26 @@
 													if ($transactionType == "Debit" || empty($transactionType))
 													{
 														?>
-														<td data-title="<?php echo JText::_('COM_TJVENDORS_REPORTS_DEBIT_AMOUNT');?>">
+														<td data-title="<?php echo Text::_('COM_TJVENDORS_REPORTS_DEBIT_AMOUNT');?>">
 															<?php echo htmlspecialchars($row->debit, ENT_COMPAT, 'UTF-8');?>
 														</td>
 														<?php
 													}
 													?>
 
-													<td data-title="<?php echo JText::_('COM_TJVENDORS_REPORTS_REFERENCE_ORDER_ID');?>">
+													<td data-title="<?php echo Text::_('COM_TJVENDORS_REPORTS_REFERENCE_ORDER_ID');?>">
 														<?php echo htmlspecialchars($row->reference_order_id, ENT_COMPAT, 'UTF-8');?>
 													</td>
 
-													<td data-title="<?php echo JText::_('COM_TJVENDORS_REPORTS_TRANSACTION_TIME');?>">
+													<td data-title="<?php echo Text::_('COM_TJVENDORS_REPORTS_TRANSACTION_TIME');?>">
 														<?php echo htmlspecialchars($row->transaction_time, ENT_COMPAT, 'UTF-8');?>
 													</td>
 
-													<td data-title="<?php echo JText::_('COM_TJVENDORS_REPORTS_PENDING_AMOUNT');?>">
+													<td data-title="<?php echo Text::_('COM_TJVENDORS_REPORTS_PENDING_AMOUNT');?>">
 														<?php echo htmlspecialchars(abs($row->total), ENT_COMPAT, 'UTF-8');?>
 													</td>
 
-													<td data-title="<?php echo JText::_('COM_TJVENDORS_REPORTS_ENTRY_STATUS');?>">
+													<td data-title="<?php echo Text::_('COM_TJVENDORS_REPORTS_ENTRY_STATUS');?>">
 														<?php
 														$status = json_decode($row->params, true);
 
@@ -336,21 +343,21 @@
 														{
 															if ($row->status == 1)
 															{
-																echo JText::_('COM_TJVENDOR_PAYOUT_DONE');
+																echo Text::_('COM_TJVENDOR_PAYOUT_DONE');
 															}
 															else
 															{
-																echo JText::_('COM_TJVENDOR_PAYOUT_PENDING');
+																echo Text::_('COM_TJVENDOR_PAYOUT_PENDING');
 															}
 														}
 														elseif ($status['entry_status'] == "credit_for_ticket_buy")
 														{
-															echo JText::_('COM_TJVENDOR_CREDIT_DONE');
+															echo Text::_('COM_TJVENDOR_CREDIT_DONE');
 														}
 														?>
 													</td>
 
-													<td class="center" data-title="<?php echo JText::_('COM_TJVENDORS_REPORTS_CUSTOMER_NOTE');?>">
+													<td class="center" data-title="<?php echo Text::_('COM_TJVENDORS_REPORTS_CUSTOMER_NOTE');?>">
 														<?php
 														if (!empty($status['customer_note']))
 														{
@@ -382,20 +389,20 @@
 			<input type="hidden" name="boxchecked" value="0"/>
 			<input type="hidden" name="filter_order" value="<?php echo $listOrder;?>"/>
 			<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>"/>
-			<?php echo JHtml::_('form.token');?>
+			<?php echo HTMLHelper::_('form.token');?>
 		</form>
 		<?php
 	}
 	elseif (!$this->vendor_id &&  $user_id)
 	{
 		?>
-		<div class="alert alert-info"><?php echo JText::_('COM_TJVENDOR_REPORTS_ERROR');?></div>
+		<div class="alert alert-info"><?php echo Text::_('COM_TJVENDOR_REPORTS_ERROR');?></div>
 		<?php
 	}
 	else
 	{
-		$link = JRoute::_('index.php?option=com_users');
-		$app = JFactory::getApplication();
+		$link = Route::_('index.php?option=com_users');
+		$app = Factory::getApplication();
 		$app->redirect($link);
 	}
 	?>
diff --git a/src/com_tjvendors/site/views/vendors/view.html.php b/src/com_tjvendors/site/views/vendors/view.html.php
index 7029db36..d0a1cb6a 100755
--- a/src/com_tjvendors/site/views/vendors/view.html.php
+++ b/src/com_tjvendors/site/views/vendors/view.html.php
@@ -10,15 +10,16 @@
 
 // No direct access to this file
 defined('_JEXEC') or die;
-
-JLoader::import('joomla.application.component.model');
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\MVC\View\HtmlView;
 
 /**
  * List view : Pending Payouts
  *
  * @since  1.6
  */
-class TjvendorsViewVendors extends JViewLegacy
+class TjvendorsViewVendors extends HtmlView
 {
 	protected $user_id;
 
@@ -51,12 +52,12 @@ class TjvendorsViewVendors extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		$app = JFactory::getApplication();
-		$this->user_id = JFactory::getUser()->id;
+		$app = Factory::getApplication();
+		$this->user_id = Factory::getUser()->id;
 		$this->input = $app->input;
 
 		// Get data from the model
-		$items_model = JModelLegacy::getInstance('vendors', 'TjvendorsModel');
+		$items_model = BaseDatabaseModel::getInstance('vendors', 'TjvendorsModel');
 		$this->items = $items_model->getItems();
 		$this->pagination	= $items_model->getPagination();
 		$this->state		= $items_model->getState();
diff --git a/src/plugins/actionlog/tjvendors/tjvendors.php b/src/plugins/actionlog/tjvendors/tjvendors.php
index 0bb5d5e3..8b1b6909 100644
--- a/src/plugins/actionlog/tjvendors/tjvendors.php
+++ b/src/plugins/actionlog/tjvendors/tjvendors.php
@@ -9,16 +9,21 @@
  */
 
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Table\Table;
 
 JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
-JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjvendors/tables');
+Table::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjvendors/tables');
 
 /**
  * TJVendors Actions Logging Plugin.
  *
  * @since  1.3.1
  */
-class PlgActionlogTjvendors extends JPlugin
+class PlgActionlogTjvendors extends CMSPlugin
 {
 	/**
 	 * Load plugin language file automatically so that it can be used inside component
@@ -47,22 +52,22 @@ public function tjVendorsOnAfterVendorSave($vendorData, $isNew)
 			return;
 		}
 
-		$app      = JFactory::getApplication();
+		$app      = Factory::getApplication();
 		$context  = $app->input->get('option');
-		$jUser    = JFactory::getUser();
+		$jUser    = Factory::getUser();
 		$userId   = $jUser->id;
 		$userName = $jUser->username;
 
 		if ($vendorData['vendor_client'])
 		{
-			$language = JFactory::getLanguage();
+			$language = Factory::getLanguage();
 			$language->load($vendorData['vendor_client']);
 		}
 
 		// If admin create user as vendor from backend
 		if ($app->isAdmin())
 		{
-			$vendorInfor    = JFactory::getUser($vendorData['user_id']);
+			$vendorInfor    = Factory::getUser($vendorData['user_id']);
 			$vendorID       = $vendorInfor->id;
 			$vendorUserName = $vendorInfor->username;
 			$action         = ($isNew) ? 'add' : 'update';
@@ -77,7 +82,7 @@ public function tjVendorsOnAfterVendorSave($vendorData, $isNew)
 					$message = array(
 						'action'         => $action,
 						'type'           => 'PLG_ACTIONLOG_TJVENDORS_TYPE_VENDOR',
-						'clientname'     => JText::_(strtoupper($vendorData['vendor_client'])),
+						'clientname'     => Text::_(strtoupper($vendorData['vendor_client'])),
 						'clientlink'     => 'index.php?option=' . $vendorData['vendor_client'],
 						'vendorusername' => $vendorUserName,
 						'vendoruserlink' => 'index.php?option=com_users&task=user.edit&id=' . $vendorID,
@@ -106,7 +111,7 @@ public function tjVendorsOnAfterVendorSave($vendorData, $isNew)
 				$message = array(
 					'action'           => $action,
 					'type'             => 'PLG_ACTIONLOG_TJVENDORS_TYPE_VENDOR',
-					'clientname'       => JText::_(strtoupper($vendorData['vendor_client'])),
+					'clientname'       => Text::_(strtoupper($vendorData['vendor_client'])),
 					'clientlink'       => 'index.php?option=' . $vendorData['vendor_client'],
 					'vendorname'	   => $vendorData['vendor_title'],
 					'vendorusername'   => $vendorUserName,
@@ -128,7 +133,7 @@ public function tjVendorsOnAfterVendorSave($vendorData, $isNew)
 				$message = array(
 					'action'      => $action,
 					'type'        => 'PLG_ACTIONLOG_TJVENDORS_TYPE_VENDOR',
-					'clientname'  => JText::_(strtoupper($vendorData['vendor_client'])),
+					'clientname'  => Text::_(strtoupper($vendorData['vendor_client'])),
 					'clientlink'  => 'index.php?option=' . $vendorData['vendor_client'],
 					'userid'      => $userId,
 					'username'    => $userName,
@@ -140,7 +145,7 @@ public function tjVendorsOnAfterVendorSave($vendorData, $isNew)
 				$message = array(
 					'action'      => $action,
 					'type'        => 'PLG_ACTIONLOG_TJVENDORS_TYPE_VENDOR',
-					'clientname'  => JText::_(strtoupper($vendorData['vendor_client'])),
+					'clientname'  => Text::_(strtoupper($vendorData['vendor_client'])),
 					'clientlink'  => 'index.php?option=' . $vendorData['vendor_client'],
 					'userid'      => $userId,
 					'username'    => $userName,
@@ -172,12 +177,12 @@ public function tjVendorsOnAfterVendorStateChange($pks, $state, $client)
 			return;
 		}
 
-		$jUser                = JFactory::getUser();
+		$jUser                = Factory::getUser();
 		$userId               = $jUser->id;
 		$userName             = $jUser->username;
-		$context              = JFactory::getApplication()->input->get('option');
-		$tjvendorsTableVendor = JTable::getInstance('vendor', 'TjvendorsTable', array());
-		$language = JFactory::getLanguage();
+		$context              = Factory::getApplication()->input->get('option');
+		$tjvendorsTableVendor = Table::getInstance('vendor', 'TjvendorsTable', array());
+		$language = Factory::getLanguage();
 		$language->load($client);
 
 		switch ($state)
@@ -206,7 +211,7 @@ public function tjVendorsOnAfterVendorStateChange($pks, $state, $client)
 				'vendorname'   => $tjvendorsTableVendor->vendor_title,
 				'vendorid'     => $tjvendorsTableVendor->user_id,
 				'vendorlink'   => 'index.php?option=com_users&task=user.edit&id=' . $tjvendorsTableVendor->user_id,
-				'clientname'   => JText::_(strtoupper($client)),
+				'clientname'   => Text::_(strtoupper($client)),
 				'clientlink'   => 'index.php?option=' . $client,
 				'userid'       => $userId,
 				'username'     => $userName,
@@ -236,8 +241,8 @@ public function tjvendorOnAfterVendorDelete($vendorData, $client)
 			return;
 		}
 
-		$context            = JFactory::getApplication()->input->get('option');
-		$jUser              = JFactory::getUser();
+		$context            = Factory::getApplication()->input->get('option');
+		$jUser              = Factory::getUser();
 		$messageLanguageKey = 'PLG_ACTIONLOG_TJVENDORS_VENDOR_DELETED';
 		$action             = 'delete';
 		$userId             = $jUser->id;
@@ -245,7 +250,7 @@ public function tjvendorOnAfterVendorDelete($vendorData, $client)
 
 		if ($client)
 		{
-			$language = JFactory::getLanguage();
+			$language = Factory::getLanguage();
 			$language->load($client);
 		}
 
@@ -253,7 +258,7 @@ public function tjvendorOnAfterVendorDelete($vendorData, $client)
 			'action'      => $action,
 			'type'        => 'PLG_ACTIONLOG_TJVENDORS_TYPE_VENDOR',
 			'vendorname'  => $vendorData->vendor_title,
-			'clientname'  => JText::_(strtoupper($client)),
+			'clientname'  => Text::_(strtoupper($client)),
 			'clientlink'  => 'index.php?option=' . $client,
 			'userid'      => $userId,
 			'username'    => $userName,
@@ -282,18 +287,18 @@ public function tjVendorsOnAfterVendorFeeSave($vendorFeeData, $isNew)
 			return;
 		}
 
-		$context              = JFactory::getApplication()->input->get('option');
-		$jUser                = JFactory::getUser();
+		$context              = Factory::getApplication()->input->get('option');
+		$jUser                = Factory::getUser();
 		$messageLanguageKey   = ($isNew) ? 'PLG_ACTIONLOG_TJVENDORS_VENDOR_FEE_SAVE' : 'PLG_ACTIONLOG_TJVENDORS_VENDOR_FEE_UPDATE';
 		$action               = ($isNew) ? 'add' : 'update';
 		$userId               = $jUser->id;
 		$userName             = $jUser->username;
-		$tjvendorsTableVendor = JTable::getInstance('vendor', 'TjvendorsTable', array());
+		$tjvendorsTableVendor = Table::getInstance('vendor', 'TjvendorsTable', array());
 		$tjvendorsTableVendor->load(array('vendor_id' => $vendorFeeData['vendor_id']));
 
 		if ($vendorFeeData['client'])
 		{
-			$language = JFactory::getLanguage();
+			$language = Factory::getLanguage();
 			$language->load($vendorFeeData['client']);
 		}
 
@@ -304,7 +309,7 @@ public function tjVendorsOnAfterVendorFeeSave($vendorFeeData, $isNew)
 			'vendorlink'  => 'index.php?option=com_users&task=user.edit&id=' . $tjvendorsTableVendor->user_id,
 			'feelink'     => 'index.php?option=com_tjvendors&view=vendorfee&layout=edit&id=' . $vendorFeeData['id'] . '&vendor_id=' . $vendorFeeData['vendor_id'] . '&client=' . $vendorFeeData['client'],
 			'clientlink'  => 'index.php?option=' . $vendorFeeData['client'],
-			'clientname'  => JText::_(strtoupper($vendorFeeData['client'])),
+			'clientname'  => Text::_(strtoupper($vendorFeeData['client'])),
 			'userid'      => $userId,
 			'username'    => $userName,
 			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $userId,
@@ -332,7 +337,7 @@ protected function addLog($messages, $messageLanguageKey, $context, $userId = nu
 		JLoader::register('ActionlogsModelActionlog', JPATH_ADMINISTRATOR . '/components/com_actionlogs/models/actionlog.php');
 
 		/* @var ActionlogsModelActionlog $model */
-		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model = BaseDatabaseModel::getInstance('Actionlog', 'ActionlogsModel');
 		$model->addLog($messages, $messageLanguageKey, $context, $userId);
 	}
 }
diff --git a/src/plugins/privacy/tjvendors/tjvendors.php b/src/plugins/privacy/tjvendors/tjvendors.php
index b2ce20f4..9df9fab2 100644
--- a/src/plugins/privacy/tjvendors/tjvendors.php
+++ b/src/plugins/privacy/tjvendors/tjvendors.php
@@ -10,7 +10,8 @@
 
 // No direct access.
 defined('_JEXEC') or die();
-jimport('joomla.application.component.model');
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\User\User;
 
 JLoader::register('PrivacyPlugin', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/plugin.php');
 JLoader::register('PrivacyRemovalStatus', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/removal/status.php');
@@ -51,8 +52,8 @@ public function onPrivacyCollectAdminCapabilities()
 		$this->loadLanguage();
 
 		return array(
-			JText::_('PLG_PRIVACY_TJVENDORS') => array(
-				JText::_('PLG_PRIVACY_TJVENDORS_PRIVACY_CAPABILITY_USER_DETAIL'),
+			Text::_('PLG_PRIVACY_TJVENDORS') => array(
+				Text::_('PLG_PRIVACY_TJVENDORS_PRIVACY_CAPABILITY_USER_DETAIL'),
 			),
 		);
 	}
@@ -68,21 +69,21 @@ public function onPrivacyCollectAdminCapabilities()
 	 * - #__tjvendors_passbook
 	 *
 	 * @param   PrivacyTableRequest  $request  The request record being processed
-	 * @param   JUser                $user     The user account associated with this request if available
+	 * @param   User                $user     The user account associated with this request if available
 	 *
 	 * @return  PrivacyExportDomain[]
 	 *
 	 * @since   1.3.1
 	 */
-	public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user = null)
+	public function onPrivacyExportRequest(PrivacyTableRequest $request, User $user = null)
 	{
 		if (!$user)
 		{
 			return array();
 		}
 
-		/** @var JTableUser $userTable */
-		$userTable = JUser::getTable();
+		/** @var User $userTable */
+		$userTable = User::getTable();
 		$userTable->load($user->id);
 
 		// Create the domain for the TJVendors vednor data
@@ -107,13 +108,13 @@ public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user
 	/**
 	 * Create the domain for the TJvendor user data
 	 *
-	 * @param   JTableUser  $user  The JTableUser object to process
+	 * @param   User  $user  The User object to process
 	 *
 	 * @return  PrivacyExportDomain
 	 *
 	 * @since  1.3.1
 	 */
-	private function createVendorDomain(JTableUser $user)
+	private function createVendorDomain(User $user)
 	{
 		$domain = $this->createDomain('TJvendor user', 'TJvendor user data');
 
@@ -135,13 +136,13 @@ private function createVendorDomain(JTableUser $user)
 	/**
 	 * Create the domain for the TJvendor to get vendor client data
 	 *
-	 * @param   JTableUser  $user  The JTableUser object to process
+	 * @param   User  $user  The User object to process
 	 *
 	 * @return  PrivacyExportDomain
 	 *
 	 * @since  1.3.1
 	 */
-	private function createVendorClientDomain(JTableUser $user)
+	private function createVendorClientDomain(User $user)
 	{
 		$domain = $this->createDomain('TJvendor user client', 'TJvendor user clients data');
 
@@ -175,13 +176,13 @@ private function createVendorClientDomain(JTableUser $user)
 	/**
 	 * Create the domain for the TJvendor to get vendor Fee data
 	 *
-	 * @param   JTableUser  $user  The JTableUser object to process
+	 * @param   User  $user  The User object to process
 	 *
 	 * @return  PrivacyExportDomain
 	 *
 	 * @since  1.3.1
 	 */
-	private function createVendorFessDomain(JTableUser $user)
+	private function createVendorFessDomain(User $user)
 	{
 		$domain = $this->createDomain('TJvendor user fees', 'TJvendor user fees data');
 
@@ -215,13 +216,13 @@ private function createVendorFessDomain(JTableUser $user)
 	/**
 	 * Create the domain for the TJvendor to get vendor passbook data
 	 *
-	 * @param   JTableUser  $user  The JTableUser object to process
+	 * @param   User  $user  The User object to process
 	 *
 	 * @return  PrivacyExportDomain
 	 *
 	 * @since  1.3.1
 	 */
-	private function createVendorPassbookDomain(JTableUser $user)
+	private function createVendorPassbookDomain(User $user)
 	{
 		$domain = $this->createDomain('TJvendor user passbook', 'TJvendor user passbook data');
 
@@ -258,13 +259,13 @@ private function createVendorPassbookDomain(JTableUser $user)
 	 * This event will not allow a super user account to be removed
 	 *
 	 * @param   PrivacyTableRequest  $request  The request record being processed
-	 * @param   JUser                $user     The user account associated with this request if available
+	 * @param   User                $user     The user account associated with this request if available
 	 *
 	 * @return  PrivacyRemovalStatus
 	 *
 	 * @since   1.3.1
 	 */
-	public function onPrivacyCanRemoveData(PrivacyTableRequest $request, JUser $user = null)
+	public function onPrivacyCanRemoveData(PrivacyTableRequest $request, User $user = null)
 	{
 		$status = new PrivacyRemovalStatus;
 
@@ -283,7 +284,7 @@ public function onPrivacyCanRemoveData(PrivacyTableRequest $request, JUser $user
 		if ($vendorId)
 		{
 			$status->canRemove = false;
-			$status->reason    = JText::_('PLG_PRIVACY_TJVENDORS_ERROR_CANNOT_REMOVE_USER_DATA');
+			$status->reason    = Text::_('PLG_PRIVACY_TJVENDORS_ERROR_CANNOT_REMOVE_USER_DATA');
 		}
 
 		return $status;