diff --git a/js/src/classes/Chart.js b/js/src/classes/Chart.js
index 725068a0c4..af9db92277 100644
--- a/js/src/classes/Chart.js
+++ b/js/src/classes/Chart.js
@@ -1,9 +1,8 @@
 import { $ } from '../utils/extend_jquery';
 import 'updated-jqplot';
-import '../../../node_modules/updated-jqplot/dist/plugins/jqplot.pieRenderer';
-import '../../../node_modules/updated-jqplot/dist/plugins/jqplot.highlighter';
-import '../../../node_modules/updated-jqplot/dist/plugins/jqplot.enhancedPieLegendRenderer';
-window.test2 = $;
+import 'updated-jqplot/dist/plugins/jqplot.pieRenderer';
+import 'updated-jqplot/dist/plugins/jqplot.highlighter';
+import 'updated-jqplot/dist/plugins/jqplot.enhancedPieLegendRenderer';
 
 /**
  * Chart type enumerations
diff --git a/js/src/functions/Server/SeverStatusSorter.js b/js/src/functions/Server/SeverStatusSorter.js
index fd7f1531d5..020da354e4 100644
--- a/js/src/functions/Server/SeverStatusSorter.js
+++ b/js/src/functions/Server/SeverStatusSorter.js
@@ -4,7 +4,7 @@
  * Module import
  */
 import { $ } from '../../utils/extend_jquery';
-import 'tablesorter';
+import '../../plugins/jquery/jquery.tablesorter';
 // TODO: tablesorter shouldn't sort already sorted columns
 /**
  * @access public
diff --git a/js/src/server_plugins.js b/js/src/server_plugins.js
index c02c2c4528..3633d1f637 100644
--- a/js/src/server_plugins.js
+++ b/js/src/server_plugins.js
@@ -1,5 +1,11 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 
+/**
+ * Module import
+ */
+import { $ } from './utils/extend_jquery';
+import './plugins/jquery/jquery.tablesorter';
+
 /**
  * @package PhpMyAdmin
  *
diff --git a/js/src/server_status_monitor.js b/js/src/server_status_monitor.js
index b9a8f3b28b..6d10b95d57 100644
--- a/js/src/server_status_monitor.js
+++ b/js/src/server_status_monitor.js
@@ -5,13 +5,13 @@ import { $ } from './utils/extend_jquery';
 import 'updated-jqplot';
 import './plugins/jquery/jquery.sortableTable';
 
-import '../../node_modules/updated-jqplot/dist/plugins/jqplot.pieRenderer.js';
-import '../../node_modules/updated-jqplot/dist/plugins/jqplot.enhancedPieLegendRenderer.js';
-import '../../node_modules/updated-jqplot/dist/plugins/jqplot.canvasTextRenderer.js';
-import '../../node_modules/updated-jqplot/dist/plugins/jqplot.canvasAxisLabelRenderer.js';
-import '../../node_modules/updated-jqplot/dist/plugins/jqplot.dateAxisRenderer.js';
-import '../../node_modules/updated-jqplot/dist/plugins/jqplot.highlighter.js';
-import '../../node_modules/updated-jqplot/dist/plugins/jqplot.cursor.js';
+import 'updated-jqplot/dist/plugins/jqplot.pieRenderer.js';
+import 'updated-jqplot/dist/plugins/jqplot.enhancedPieLegendRenderer.js';
+import 'updated-jqplot/dist/plugins/jqplot.canvasTextRenderer.js';
+import 'updated-jqplot/dist/plugins/jqplot.canvasAxisLabelRenderer.js';
+import 'updated-jqplot/dist/plugins/jqplot.dateAxisRenderer.js';
+import 'updated-jqplot/dist/plugins/jqplot.highlighter.js';
+import 'updated-jqplot/dist/plugins/jqplot.cursor.js';
 import './plugins/jqplot/jqplot.byteFormatter';
 
 import { getOsDetail } from './functions/Server/ServerStatusMonitor';
@@ -2011,7 +2011,6 @@ export function onload3 () {
     /* Saves the monitor to localstorage */
     function saveMonitor () {
         var gridCopy = {};
-
         $.each(runtime.charts, function (key, elem) {
             gridCopy[key] = {};
             gridCopy[key].nodes = elem.nodes;
diff --git a/js/src/server_status_sorter.js b/js/src/server_status_sorter.js
index 503a79535d..ac5cdc4032 100644
--- a/js/src/server_status_sorter.js
+++ b/js/src/server_status_sorter.js
@@ -4,7 +4,7 @@
  * Module import
  */
 import { $ } from './utils/JqueryExtended';
-import 'tablesorter';
+import './plugins/jquery/jquery.tablesorter';
 import { PMA_Messages as messages } from './variables/export_variables';
 
 $(function () {
diff --git a/js/src/server_variables.js b/js/src/server_variables.js
index c49fcb29a0..ac60217991 100644
--- a/js/src/server_variables.js
+++ b/js/src/server_variables.js
@@ -3,6 +3,7 @@
 /**
  * Module import
  */
+import { $ } from './utils/extend_jquery';
 import { editVariable } from './functions/Server/ServerVariables';
 
 /**
diff --git a/libraries/classes/Controllers/Server/ServerPluginsController.php b/libraries/classes/Controllers/Server/ServerPluginsController.php
index 0b8e438e53..fb7583d4fc 100644
--- a/libraries/classes/Controllers/Server/ServerPluginsController.php
+++ b/libraries/classes/Controllers/Server/ServerPluginsController.php
@@ -49,7 +49,6 @@ class ServerPluginsController extends Controller
 
         $header  = $this->response->getHeader();
         $scripts = $header->getScripts();
-        $scripts->addFile('vendor/jquery/jquery.tablesorter.js');
         $scripts->addFile('server_plugins');
 
         /**
diff --git a/server_status_monitor.php b/server_status_monitor.php
index e82753c93b..e27ab81f3d 100644
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@@ -72,18 +72,7 @@ if ($response->isAjax()) {
  */
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
-// $scripts->addFile('vendor/jquery/jquery.tablesorter.js');
-// $scripts->addFile('vendor/jquery/jquery.sortableTable.js');
-// for charting
-// $scripts->addFile('vendor/jqplot/jquery.jqplot.js');
-// $scripts->addFile('vendor/jqplot/plugins/jqplot.pieRenderer.js');
-// $scripts->addFile('vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js');
-// $scripts->addFile('vendor/jqplot/plugins/jqplot.canvasTextRenderer.js');
-// $scripts->addFile('vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js');
-// $scripts->addFile('vendor/jqplot/plugins/jqplot.dateAxisRenderer.js');
-// $scripts->addFile('vendor/jqplot/plugins/jqplot.highlighter.js');
-// $scripts->addFile('vendor/jqplot/plugins/jqplot.cursor.js');
-// $scripts->addFile('jqplot/plugins/jqplot.byteFormatter.js');
+$scripts->addFile('vendor/jquery/jquery.tablesorter.js');
 
 $scripts->addFile('server_status_monitor');
 $scripts->addFile('server_status_sorter');
diff --git a/server_status_queries.php b/server_status_queries.php
index 20a1d70a41..591613b73c 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -23,13 +23,6 @@ $response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 
-// for charting
-// $scripts->addFile('chart.js');
-// $scripts->addFile('vendor/jqplot/jquery.jqplot.js');
-// $scripts->addFile('vendor/jqplot/plugins/jqplot.pieRenderer.js');
-// $scripts->addFile('vendor/jqplot/plugins/jqplot.highlighter.js');
-// $scripts->addFile('vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js');
-// $scripts->addFile('vendor/jquery/jquery.tablesorter.js');
 $scripts->addFile('server_status_sorter');
 $scripts->addFile('server_status_queries');
 
diff --git a/server_status_variables.php b/server_status_variables.php
index 328cbb43f6..0e9a3060b0 100644
--- a/server_status_variables.php
+++ b/server_status_variables.php
@@ -38,8 +38,7 @@ $response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('server_status_variables');
-$scripts->addFile('vendor/jquery/jquery.tablesorter.js');
-$scripts->addFile('server_status_sorter.js');
+$scripts->addFile('server_status_sorter');
 
 $response->addHTML('<div>');
 $response->addHTML($serverStatusData->getMenuHtml());