diff --git a/app/admin/2fa/index.php b/app/admin/2fa/index.php
index 12f8fb4df..0ebf0e901 100644
--- a/app/admin/2fa/index.php
+++ b/app/admin/2fa/index.php
@@ -177,7 +177,7 @@
 
 
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	/* bootstrap switch */
 	var switch_options = {
diff --git a/app/admin/circuits/edit-circuit.php b/app/admin/circuits/edit-circuit.php
index 6379121c6..43a95c083 100644
--- a/app/admin/circuits/edit-circuit.php
+++ b/app/admin/circuits/edit-circuit.php
@@ -70,7 +70,7 @@
 $readonly = $_POST['action']=="delete" ? "readonly" : "";
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
      if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 });
diff --git a/app/admin/circuits/edit-logical-circuit.php b/app/admin/circuits/edit-logical-circuit.php
index 64dd1c806..57d241e57 100644
--- a/app/admin/circuits/edit-logical-circuit.php
+++ b/app/admin/circuits/edit-logical-circuit.php
@@ -73,7 +73,7 @@
 $readonly = $_POST['action']=="delete" ? "readonly" : "";
 ?>
 
-<script type="text/javascript">
+<script>
 
 function addAllCircuitsHandlers(){
 	$('#all_circuits tbody tr td').on("click","a[name='addbtn']",function(event){
diff --git a/app/admin/circuits/edit-options.php b/app/admin/circuits/edit-options.php
index 37b90800e..7d011a84c 100644
--- a/app/admin/circuits/edit-options.php
+++ b/app/admin/circuits/edit-options.php
@@ -95,9 +95,9 @@
 </div>
 
 
-<script type="text/javascript" src="js/bootstrap-colorpicker.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+<script src="js/bootstrap-colorpicker.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-colorpicker.min.css?v=<?php print SCRIPT_PREFIX; ?>">
-<script type="text/javascript">
+<script>
 $(function(){
     $('#color-picker').colorpicker();
 });
\ No newline at end of file
diff --git a/app/admin/circuits/edit-provider.php b/app/admin/circuits/edit-provider.php
index fa17c09ea..05ee6233f 100644
--- a/app/admin/circuits/edit-provider.php
+++ b/app/admin/circuits/edit-provider.php
@@ -55,7 +55,7 @@
 $readonly = $_POST['action']=="delete" ? "readonly" : "";
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
      if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 });
diff --git a/app/admin/custom-fields/filter.php b/app/admin/custom-fields/filter.php
index 345a540c1..6173023ac 100755
--- a/app/admin/custom-fields/filter.php
+++ b/app/admin/custom-fields/filter.php
@@ -34,7 +34,7 @@
 $custom = $Tools->fetch_custom_fields($_POST['table']);
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 /* bootstrap switch */
 var switch_options = {
diff --git a/app/admin/devices/edit-snmp-test.php b/app/admin/devices/edit-snmp-test.php
index 328fe14ee..0c4ae1b20 100644
--- a/app/admin/devices/edit-snmp-test.php
+++ b/app/admin/devices/edit-snmp-test.php
@@ -132,7 +132,7 @@
 ?>
 
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
     $('#toggle_debug').click(function() { $('#debug').toggle() });
 });
\ No newline at end of file
diff --git a/app/admin/devices/edit-snmp.php b/app/admin/devices/edit-snmp.php
index ba424028f..54f0b79e6 100644
--- a/app/admin/devices/edit-snmp.php
+++ b/app/admin/devices/edit-snmp.php
@@ -40,7 +40,7 @@
 if (strlen($device->snmp_timeout)==0)   { $device->snmp_timeout = 1000; }
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
      if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 });
diff --git a/app/admin/devices/edit.php b/app/admin/devices/edit.php
index 9c603431a..5a98084cd 100755
--- a/app/admin/devices/edit.php
+++ b/app/admin/devices/edit.php
@@ -66,7 +66,7 @@
 else                            { $display=''; }
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
      if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 });
diff --git a/app/admin/firewall-zones/settings.php b/app/admin/firewall-zones/settings.php
index 2ddf3cdbf..904b3c565 100644
--- a/app/admin/firewall-zones/settings.php
+++ b/app/admin/firewall-zones/settings.php
@@ -72,7 +72,7 @@
 						'patternSeparator' 	=> '<span class="label label-default" style="margin-right:5px;"><input type="hidden" value="patternSeparator">'.$firewallZoneSettings['separator'].'</span>');
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	/* bootstrap switch */
 	var switch_options = {
diff --git a/app/admin/firewall-zones/zones-edit-network.php b/app/admin/firewall-zones/zones-edit-network.php
index ab14e9efd..75c885192 100644
--- a/app/admin/firewall-zones/zones-edit-network.php
+++ b/app/admin/firewall-zones/zones-edit-network.php
@@ -34,7 +34,7 @@
 
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	/* bootstrap switch */
 	var switch_options = {
diff --git a/app/admin/firewall-zones/zones-edit.php b/app/admin/firewall-zones/zones-edit.php
index 0a3ca389b..02ea61d3d 100644
--- a/app/admin/firewall-zones/zones-edit.php
+++ b/app/admin/firewall-zones/zones-edit.php
@@ -40,7 +40,7 @@
 $readonly = $_POST['action']=="delete" ? "readonly" : "";
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	/* bootstrap switch */
 	var switch_options = {
diff --git a/app/admin/import-export/import-button.php b/app/admin/import-export/import-button.php
index 759ebb406..a7eab7590 100644
--- a/app/admin/import-export/import-button.php
+++ b/app/admin/import-export/import-button.php
@@ -36,7 +36,7 @@
 <script src="js/uploader/jquery.iframe-transport.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 <script src="js/uploader/jquery.fileupload.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 
-<script type="text/javascript">
+<script>
 $(function(){
 
 	$('#drop a').click(function(){
diff --git a/app/admin/import-export/import-devices-preview.php b/app/admin/import-export/import-devices-preview.php
index 3aa4044bc..8775cd850 100644
--- a/app/admin/import-export/import-devices-preview.php
+++ b/app/admin/import-export/import-devices-preview.php
@@ -70,7 +70,7 @@
 if (($counters['add'] > 0) || ($counters['edit'] > 0)) {
 ?>
 
-	<script type="text/javascript">
+	<script>
 	$(function(){
 		$('#dataImportSubmit').removeAttr('disabled');
 		$('#dataImportSubmit').removeClass('btn-default');
diff --git a/app/admin/import-export/import-devtype-preview.php b/app/admin/import-export/import-devtype-preview.php
index 293c358f9..0e5639af8 100644
--- a/app/admin/import-export/import-devtype-preview.php
+++ b/app/admin/import-export/import-devtype-preview.php
@@ -66,7 +66,7 @@
 if (($counters['add'] > 0) || ($counters['edit'] > 0)) {
 ?>
 
-	<script type="text/javascript">
+	<script>
 	$(function(){
 		$('#dataImportSubmit').removeAttr('disabled');
 		$('#dataImportSubmit').removeClass('btn-default');
diff --git a/app/admin/import-export/import-ipaddr-preview.php b/app/admin/import-export/import-ipaddr-preview.php
index 4db5103b7..c678b20f6 100644
--- a/app/admin/import-export/import-ipaddr-preview.php
+++ b/app/admin/import-export/import-ipaddr-preview.php
@@ -70,7 +70,7 @@
 if (($counters['add'] > 0) || ($counters['edit'] > 0)) {
 ?>
 
-	<script type="text/javascript">
+	<script>
 	$(function(){
 		$('#dataImportSubmit').removeAttr('disabled');
 		$('#dataImportSubmit').removeClass('btn-default');
diff --git a/app/admin/import-export/import-l2dom-preview.php b/app/admin/import-export/import-l2dom-preview.php
index 4f2873836..a9fe3365f 100644
--- a/app/admin/import-export/import-l2dom-preview.php
+++ b/app/admin/import-export/import-l2dom-preview.php
@@ -66,7 +66,7 @@
 if (($counters['add'] > 0) || ($counters['edit'] > 0)) {
 ?>
 
-	<script type="text/javascript">
+	<script>
 	$(function(){
 		$('#dataImportSubmit').removeAttr('disabled');
 		$('#dataImportSubmit').removeClass('btn-default');
diff --git a/app/admin/import-export/import-recompute-preview.php b/app/admin/import-export/import-recompute-preview.php
index 67ddcea6f..286ff2243 100644
--- a/app/admin/import-export/import-recompute-preview.php
+++ b/app/admin/import-export/import-recompute-preview.php
@@ -55,7 +55,7 @@
 if ($counters['edit'] > 0) {
 ?>
 
-	<script type="text/javascript">
+	<script>
 	$(function(){
 		$('#dataImportSubmit').removeAttr('disabled');
 		$('#dataImportSubmit').removeClass('btn-default');
diff --git a/app/admin/import-export/import-subnets-preview.php b/app/admin/import-export/import-subnets-preview.php
index dbced0946..6fbdc49cb 100644
--- a/app/admin/import-export/import-subnets-preview.php
+++ b/app/admin/import-export/import-subnets-preview.php
@@ -69,7 +69,7 @@
 if (($counters['add'] > 0) || ($counters['edit'] > 0)) {
 ?>
 
-	<script type="text/javascript">
+	<script>
 	$(function(){
 		$('#dataImportSubmit').removeAttr('disabled');
 		$('#dataImportSubmit').removeClass('btn-default');
diff --git a/app/admin/import-export/import-vlan-preview.php b/app/admin/import-export/import-vlan-preview.php
index ceb01d04a..1a4d1cd71 100644
--- a/app/admin/import-export/import-vlan-preview.php
+++ b/app/admin/import-export/import-vlan-preview.php
@@ -66,7 +66,7 @@
 if (($counters['add'] > 0) || ($counters['edit'] > 0)) {
 ?>
 
-	<script type="text/javascript">
+	<script>
 	$(function(){
 		$('#dataImportSubmit').removeAttr('disabled');
 		$('#dataImportSubmit').removeClass('btn-default');
diff --git a/app/admin/import-export/import-vrf-preview.php b/app/admin/import-export/import-vrf-preview.php
index 30b3723de..082651261 100644
--- a/app/admin/import-export/import-vrf-preview.php
+++ b/app/admin/import-export/import-vrf-preview.php
@@ -66,7 +66,7 @@
 if (($counters['add'] > 0) || ($counters['edit'] > 0)) {
 ?>
 
-	<script type="text/javascript">
+	<script>
 	$(function(){
 		$('#dataImportSubmit').removeAttr('disabled');
 		$('#dataImportSubmit').removeClass('btn-default');
diff --git a/app/admin/import-export/index.php b/app/admin/import-export/index.php
index bd7080b16..fd9459c8c 100755
--- a/app/admin/import-export/index.php
+++ b/app/admin/import-export/index.php
@@ -8,7 +8,7 @@
 $User->check_user_session();
 ?>
 
-<script type="text/javascript">
+<script>
 
 $(document).on('change', "select#dataType", function() {
 	if (this.value == "subnets") {
diff --git a/app/admin/nat/item-add.php b/app/admin/nat/item-add.php
index 3ffe11062..6ac8b131c 100644
--- a/app/admin/nat/item-add.php
+++ b/app/admin/nat/item-add.php
@@ -62,7 +62,7 @@
 </div>
 
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
     $('form#search_nats').submit(function() {
         $.post("app/admin/nat/item-add-search.php", $(this).serialize(), function(data) {
diff --git a/app/admin/powerDNS/settings.php b/app/admin/powerDNS/settings.php
index ffaffd40a..cc8b7baa3 100644
--- a/app/admin/powerDNS/settings.php
+++ b/app/admin/powerDNS/settings.php
@@ -11,7 +11,7 @@
 $csrf = $User->Crypto->csrf_cookie ("create", "pdns_settings");
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	/* bootstrap switch */
 	var switch_options = {
diff --git a/app/admin/racks/edit-rack-devices.php b/app/admin/racks/edit-rack-devices.php
index bb98e66ec..732333978 100755
--- a/app/admin/racks/edit-rack-devices.php
+++ b/app/admin/racks/edit-rack-devices.php
@@ -60,7 +60,7 @@
 
     # js
     ?>
-    <script type="text/javascript">
+    <script>
     $(document).ready(function() {
     $('.hidePopups').click(function(){
        window. location.reload();
@@ -97,7 +97,7 @@
     }
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
      if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 });
diff --git a/app/admin/racks/edit.php b/app/admin/racks/edit.php
index 0c2dc51f0..d27dd5023 100755
--- a/app/admin/racks/edit.php
+++ b/app/admin/racks/edit.php
@@ -58,7 +58,7 @@
 $readonly = $_POST['action']=="delete" ? "readonly" : "";
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
      if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 
diff --git a/app/admin/routing/edit-bgp-mapping.php b/app/admin/routing/edit-bgp-mapping.php
index 9658cd4a4..d57657c54 100644
--- a/app/admin/routing/edit-bgp-mapping.php
+++ b/app/admin/routing/edit-bgp-mapping.php
@@ -110,7 +110,7 @@
 	</div>
 </div>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	$('.searchSubmit').click(function() {
 		var subnet = $('#bgp_subnet_mapping input[name=ip]').val();
diff --git a/app/admin/sections/edit-order.php b/app/admin/sections/edit-order.php
index 15147ffa1..8169416f5 100755
--- a/app/admin/sections/edit-order.php
+++ b/app/admin/sections/edit-order.php
@@ -21,7 +21,7 @@
 $sections = $Sections->fetch_all_sections();
 ?>
 
-<script type="text/javascript" src="js/jquery-ui-1.10.3.custom.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+<script src="js/jquery-ui-1.10.3.custom.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 <script>
 $(document).ready(function() {
 	// initialize sortable
diff --git a/app/admin/sections/edit.php b/app/admin/sections/edit.php
index ff6813d76..0ae2b0c71 100755
--- a/app/admin/sections/edit.php
+++ b/app/admin/sections/edit.php
@@ -255,7 +255,7 @@
 </div>
 
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 /* bootstrap switch */
 var switch_options = {
diff --git a/app/admin/settings/index.php b/app/admin/settings/index.php
index 61c040d92..64ec9cf67 100755
--- a/app/admin/settings/index.php
+++ b/app/admin/settings/index.php
@@ -17,7 +17,7 @@
 $settings = (array) $User->settings;
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	/* bootstrap switch */
 	var switch_options = {
diff --git a/app/admin/settings/logo/logo-uploader.php b/app/admin/settings/logo/logo-uploader.php
index 815cde40e..a523e6c27 100644
--- a/app/admin/settings/logo/logo-uploader.php
+++ b/app/admin/settings/logo/logo-uploader.php
@@ -73,7 +73,7 @@
     <script src="js//uploader/jquery.fileupload.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 
 
-    <script type="text/javascript">
+    <script>
 	$(function(){
 
 	    var ul = $('#csvimport ul');
diff --git a/app/admin/subnets/edit.php b/app/admin/subnets/edit.php
index 2100cc2fe..9f39bb4ff 100755
--- a/app/admin/subnets/edit.php
+++ b/app/admin/subnets/edit.php
@@ -110,9 +110,9 @@
 ?>
 
 <?php if ($User->settings->enableThreshold=="1") { ?>
-<script type="text/javascript" src="js/bootstrap-slider.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+<script src="js/bootstrap-slider.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 <?php } ?>
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 /* bootstrap switch */
 var switch_options = {
diff --git a/app/admin/subnets/find_free_section_subnets.php b/app/admin/subnets/find_free_section_subnets.php
index f4284894e..5455eb706 100644
--- a/app/admin/subnets/find_free_section_subnets.php
+++ b/app/admin/subnets/find_free_section_subnets.php
@@ -42,7 +42,7 @@
 }
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
     // select dropdown value
     $('.dropdown-subnet_search li a').click(function () {
diff --git a/app/admin/subnets/permissions-show.php b/app/admin/subnets/permissions-show.php
index b64b420a8..14f917c1e 100755
--- a/app/admin/subnets/permissions-show.php
+++ b/app/admin/subnets/permissions-show.php
@@ -32,7 +32,7 @@
 ?>
 
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 /* bootstrap switch */
 var switch_options = {
diff --git a/app/admin/tags/edit.php b/app/admin/tags/edit.php
index 75cf7b122..6a9710150 100644
--- a/app/admin/tags/edit.php
+++ b/app/admin/tags/edit.php
@@ -37,9 +37,9 @@
 }
 ?>
 
-<script type="text/javascript" src="js/bootstrap-colorpicker.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+<script src="js/bootstrap-colorpicker.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-colorpicker.min.css?v=<?php print SCRIPT_PREFIX; ?>">
-<script type="text/javascript">
+<script>
 $(function(){
     $('.select-bgcolor').colorpicker();
 });
diff --git a/app/admin/users/edit.php b/app/admin/users/edit.php
index 7ec77bbd8..bcca78701 100755
--- a/app/admin/users/edit.php
+++ b/app/admin/users/edit.php
@@ -53,7 +53,7 @@
 }
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
     if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 
diff --git a/app/admin/vlans/edit-domain.php b/app/admin/vlans/edit-domain.php
index 9f8620904..b4ebc37ae 100644
--- a/app/admin/vlans/edit-domain.php
+++ b/app/admin/vlans/edit-domain.php
@@ -40,7 +40,7 @@
 
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
      if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 });
diff --git a/app/admin/vlans/edit.php b/app/admin/vlans/edit.php
index 3a7d7c778..01b77b32a 100755
--- a/app/admin/vlans/edit.php
+++ b/app/admin/vlans/edit.php
@@ -65,7 +65,7 @@
 if($vlan_domain===false)			{ $Result->show("danger", _("Invalid ID"), true, true); }
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
      if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 });
diff --git a/app/admin/vlans/move-vlan.php b/app/admin/vlans/move-vlan.php
index 9713e3422..1c1ab61e1 100644
--- a/app/admin/vlans/move-vlan.php
+++ b/app/admin/vlans/move-vlan.php
@@ -31,7 +31,7 @@
 $vlan_domains = $Admin->fetch_all_objects("vlanDomains", "id");
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function(){
      if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 });
diff --git a/app/admin/vlans/vlans-scan-execute.php b/app/admin/vlans/vlans-scan-execute.php
index d68aac44a..3d915a26b 100644
--- a/app/admin/vlans/vlans-scan-execute.php
+++ b/app/admin/vlans/vlans-scan-execute.php
@@ -178,8 +178,8 @@
     				// just for first
     				if($timeP==0) {
     					print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
-    					print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
-    					print '<script type="text/javascript">';
+    					print '<script src="js/bootstrap-datetimepicker.min.js"></script>';
+    					print '<script>';
     					print '$(document).ready(function() {';
     					//date only
     					print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
diff --git a/app/admin/vrf/vrf-scan-execute.php b/app/admin/vrf/vrf-scan-execute.php
index 1ec3d80be..84174ef89 100644
--- a/app/admin/vrf/vrf-scan-execute.php
+++ b/app/admin/vrf/vrf-scan-execute.php
@@ -167,8 +167,8 @@
     				// just for first
     				if($timeP==0) {
     					print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
-    					print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
-    					print '<script type="text/javascript">';
+    					print '<script src="js/bootstrap-datetimepicker.min.js"></script>';
+    					print '<script>';
     					print '$(document).ready(function() {';
     					//date only
     					print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
diff --git a/app/dashboard/index.php b/app/dashboard/index.php
index c2f44b469..5f01b7335 100755
--- a/app/dashboard/index.php
+++ b/app/dashboard/index.php
@@ -12,7 +12,7 @@
 $csrf = $User->Crypto->csrf_cookie ("create", "user-menu");
 
 ?>
-<script type="text/javascript">
+<script>
 //show clock
 $(function($) {
 	$('span.jclock').jclock();
@@ -77,9 +77,9 @@
 
 
 <!-- charts -->
-<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.categories.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script><![endif]-->
+<script src="js/flot/jquery.flot.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+<script src="js/flot/jquery.flot.categories.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+<!--[if lte IE 8]><script src="js/flot/excanvas.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script><![endif]-->
 
 
 <div class="welcome" style="text-align:right">
diff --git a/app/dashboard/widgets/favourite_subnets.php b/app/dashboard/widgets/favourite_subnets.php
index c18566067..3c71c8688 100755
--- a/app/dashboard/widgets/favourite_subnets.php
+++ b/app/dashboard/widgets/favourite_subnets.php
@@ -19,7 +19,7 @@
 }
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 
diff --git a/app/dashboard/widgets/ipcalc.php b/app/dashboard/widgets/ipcalc.php
index b7fdd5db1..0fe2ec66a 100644
--- a/app/dashboard/widgets/ipcalc.php
+++ b/app/dashboard/widgets/ipcalc.php
@@ -19,7 +19,7 @@
 }
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 
diff --git a/app/dashboard/widgets/iprequest.php b/app/dashboard/widgets/iprequest.php
index 2d5174d76..ac849ec9f 100644
--- a/app/dashboard/widgets/iprequest.php
+++ b/app/dashboard/widgets/iprequest.php
@@ -93,7 +93,7 @@
 </table>
 </div>
 
-<script type="text/javascript">
+<script>
 	$(document).ready(function() {
     	if ($('#subnetId').children('option').length>0) {
     		var subnetId = $('select#subnetId option:selected').attr('value');
diff --git a/app/dashboard/widgets/template.php b/app/dashboard/widgets/template.php
index bde370c0c..0ca1ceab4 100755
--- a/app/dashboard/widgets/template.php
+++ b/app/dashboard/widgets/template.php
@@ -35,7 +35,7 @@
 </style>
 
 <!-- JS -->
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	//if you need some JS write it here, jQuery is already included
 	return false;
diff --git a/app/dashboard/widgets/tools.php b/app/dashboard/widgets/tools.php
index c31900591..ee282b346 100644
--- a/app/dashboard/widgets/tools.php
+++ b/app/dashboard/widgets/tools.php
@@ -33,7 +33,7 @@
 ?>
 
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 	return false;
diff --git a/app/dashboard/widgets/top10_hosts_lib.php b/app/dashboard/widgets/top10_hosts_lib.php
index db5c364db..d166cebec 100644
--- a/app/dashboard/widgets/top10_hosts_lib.php
+++ b/app/dashboard/widgets/top10_hosts_lib.php
@@ -62,7 +62,7 @@ function top10_widget($type_ip, $type_percentage, $height, $slimit) {
 		print "</blockquote>";
 		#remove loading
 		?>
-		<script type="text/javascript">
+		<script>
 			$(document).ready(function() {
 				$("#<?php print $type_name; ?>").fadeOut('fast');
 			});
@@ -72,7 +72,7 @@ function top10_widget($type_ip, $type_percentage, $height, $slimit) {
 	}
 
 	?>
-	<script type="text/javascript">
+	<script>
 		$(function () {
 
 			var data = [
diff --git a/app/dashboard/widgets/top10_hosts_v4.php b/app/dashboard/widgets/top10_hosts_v4.php
index ccdc90b30..70ae1baa1 100755
--- a/app/dashboard/widgets/top10_hosts_v4.php
+++ b/app/dashboard/widgets/top10_hosts_v4.php
@@ -34,9 +34,9 @@
 	$height = 350;
 	$slimit = 20;
 	# include flot JS
-	print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js"></script>';
-	print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.categories.js"></script>';
-	print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js"></script><![endif]-->';
+	print '<script src="js/flot/jquery.flot.js"></script>';
+	print '<script src="js/flot/jquery.flot.categories.js"></script>';
+	print '<!--[if lte IE 8]><script src="js/flot/excanvas.min.js"></script><![endif]-->';
 	# and print title
 	print "<div class='container'>";
 	print "<h4 style='margin-top:40px;'>$widget->wtitle</h4><hr>";
diff --git a/app/dashboard/widgets/top10_hosts_v6.php b/app/dashboard/widgets/top10_hosts_v6.php
index 36bf16728..fea498d28 100755
--- a/app/dashboard/widgets/top10_hosts_v6.php
+++ b/app/dashboard/widgets/top10_hosts_v6.php
@@ -34,9 +34,9 @@
 	$height = 350;
 	$slimit = 20;
 	# include flot JS
-	print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js"></script>';
-	print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.categories.js"></script>';
-	print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js"></script><![endif]-->';
+	print '<script src="js/flot/jquery.flot.js"></script>';
+	print '<script src="js/flot/jquery.flot.categories.js"></script>';
+	print '<!--[if lte IE 8]><script src="js/flot/excanvas.min.js"></script><![endif]-->';
 	# and print title
 	print "<div class='container'>";
 	print "<h4 style='margin-top:40px;'>$widget->wtitle</h4><hr>";
diff --git a/app/dashboard/widgets/top10_percentage.php b/app/dashboard/widgets/top10_percentage.php
index fce9b1ca7..ef449ac2c 100755
--- a/app/dashboard/widgets/top10_percentage.php
+++ b/app/dashboard/widgets/top10_percentage.php
@@ -32,9 +32,9 @@
 	$height = 350;
 	$slimit = 20;
 	# include flot JS
-	print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js"></script>';
-	print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.categories.js"></script>';
-	print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js"></script><![endif]-->';
+	print '<script src="js/flot/jquery.flot.js"></script>';
+	print '<script src="js/flot/jquery.flot.categories.js"></script>';
+	print '<!--[if lte IE 8]><script src="js/flot/excanvas.min.js"></script><![endif]-->';
 	# and print title
 	print "<div class='container'>";
 	print "<h4 style='margin-top:40px;'>$widget->wtitle</h4><hr>";
diff --git a/app/folder/folder-subnets.php b/app/folder/folder-subnets.php
index 6d0d383e2..45468bd21 100755
--- a/app/folder/folder-subnets.php
+++ b/app/folder/folder-subnets.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/install/index.php b/app/install/index.php
index d20c6b9ff..2de3765f9 100755
--- a/app/install/index.php
+++ b/app/install/index.php
@@ -67,16 +67,16 @@
 	<link rel="shortcut icon" href="css/images/favicon.png">
 
 	<!-- js -->
-	<script type="text/javascript" src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/install.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript">
+	<script src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/install.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script>
 	$(document).ready(function(){
 	     if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 	});
 	</script>
 	<!--[if lt IE 9]>
-	<script type="text/javascript" src="js/dieIE.js"></script>
+	<script src="js/dieIE.js"></script>
 	<![endif]-->
 </head>
 
diff --git a/app/login/2fa/2fa_create.php b/app/login/2fa/2fa_create.php
index a15d81459..201cb62d1 100644
--- a/app/login/2fa/2fa_create.php
+++ b/app/login/2fa/2fa_create.php
@@ -54,8 +54,8 @@
 ?>
 
 <!-- Show QR code -->
-<script type="text/javascript" src="functions/qrcodejs/qrcode.min.js"></script>
-<script type="text/javascript">
+<script src="functions/qrcodejs/qrcode.min.js"></script>
+<script>
 var qrcode = new QRCode(document.getElementById("qrcode"), {
 	text: "otpauth://totp/<?php print $username."?secret=".$secret; ?>",
 	width: 200,
diff --git a/app/login/2fa/index.php b/app/login/2fa/index.php
index 41c49e515..a9e557be8 100644
--- a/app/login/2fa/index.php
+++ b/app/login/2fa/index.php
@@ -45,16 +45,16 @@
 	<link rel="shortcut icon" href="css/images/favicon.png">
 
 	<!-- js -->
-	<script type="text/javascript" src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/login.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript">
+	<script src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/login.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script>
 	$(document).ready(function(){
 	     if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 	});
 	</script>
 	<!--[if lt IE 9]>
-	<script type="text/javascript" src="js/dieIE.js"></script>
+	<script src="js/dieIE.js"></script>
 	<![endif]-->
 </head>
 
diff --git a/app/login/index.php b/app/login/index.php
index 1805d848c..881366373 100755
--- a/app/login/index.php
+++ b/app/login/index.php
@@ -50,16 +50,16 @@
 	<link rel="shortcut icon" href="css/images/favicon.png">
 
 	<!-- js -->
-	<script type="text/javascript" src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/login.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript">
+	<script src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/login.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script>
 	$(document).ready(function(){
 	     if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 	});
 	</script>
 	<!--[if lt IE 9]>
-	<script type="text/javascript" src="js/dieIE.js"></script>
+	<script src="js/dieIE.js"></script>
 	<![endif]-->
 </head>
 
diff --git a/app/subnets/addresses/address-modify.php b/app/subnets/addresses/address-modify.php
index 058577e4f..80cf723b3 100644
--- a/app/subnets/addresses/address-modify.php
+++ b/app/subnets/addresses/address-modify.php
@@ -109,7 +109,7 @@
 
 ?>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 /* bootstrap switch */
 var switch_options = {
@@ -643,8 +643,8 @@ function validate_mac (ip, mac, sectionId, vlanId, id) {
 				// just for first
 				if($timeP==0) {
 					print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
-					print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
-					print '<script type="text/javascript">';
+					print '<script src="js/bootstrap-datetimepicker.min.js"></script>';
+					print '<script>';
 					print '$(document).ready(function() {';
 					//date only
 					print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
diff --git a/app/subnets/addresses/print-address-table.php b/app/subnets/addresses/print-address-table.php
index 12bc66ffa..0be015cfe 100644
--- a/app/subnets/addresses/print-address-table.php
+++ b/app/subnets/addresses/print-address-table.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/subnets/import-subnet/index.php b/app/subnets/import-subnet/index.php
index 50e631cae..76678f176 100755
--- a/app/subnets/import-subnet/index.php
+++ b/app/subnets/import-subnet/index.php
@@ -96,7 +96,7 @@
     <script src="js/uploader/jquery.fileupload.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 
 
-    <script type="text/javascript">
+    <script>
 	$(function(){
 
 	    var ul = $('#csvimport ul');
diff --git a/app/subnets/scan/subnet-scan-execute-scan-icmp.php b/app/subnets/scan/subnet-scan-execute-scan-icmp.php
index ea6a91b39..db93c3a84 100644
--- a/app/subnets/scan/subnet-scan-execute-scan-icmp.php
+++ b/app/subnets/scan/subnet-scan-execute-scan-icmp.php
@@ -136,8 +136,8 @@
     				// just for first
     				if($timeP==0) {
     					print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
-    					print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
-    					print '<script type="text/javascript">';
+    					print '<script src="js/bootstrap-datetimepicker.min.js"></script>';
+    					print '<script>';
     					print '$(document).ready(function() {';
     					//date only
     					print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
diff --git a/app/subnets/scan/subnet-scan-execute-scan-snmp-arp.php b/app/subnets/scan/subnet-scan-execute-scan-snmp-arp.php
index 0861abceb..1a428d024 100644
--- a/app/subnets/scan/subnet-scan-execute-scan-snmp-arp.php
+++ b/app/subnets/scan/subnet-scan-execute-scan-snmp-arp.php
@@ -214,8 +214,8 @@
         				// just for first
         				if($timeP==0) {
         					print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
-        					print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
-        					print '<script type="text/javascript">';
+        					print '<script src="js/bootstrap-datetimepicker.min.js"></script>';
+        					print '<script>';
         					print '$(document).ready(function() {';
         					//date only
         					print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
diff --git a/app/subnets/scan/subnet-scan-execute-snmp-mac.php b/app/subnets/scan/subnet-scan-execute-snmp-mac.php
index fa4ea4b70..2bec8a532 100644
--- a/app/subnets/scan/subnet-scan-execute-snmp-mac.php
+++ b/app/subnets/scan/subnet-scan-execute-snmp-mac.php
@@ -311,8 +311,8 @@ function sort_array($a, $b) {
         				// just for first
         				if($timeP==0) {
         					print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
-        					print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
-        					print '<script type="text/javascript">';
+        					print '<script src="js/bootstrap-datetimepicker.min.js"></script>';
+        					print '<script>';
         					print '$(document).ready(function() {';
         					//date only
         					print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
diff --git a/app/subnets/subnet-details/subnet-graph.php b/app/subnets/subnet-details/subnet-graph.php
index eb19c05ca..8e428b959 100755
--- a/app/subnets/subnet-details/subnet-graph.php
+++ b/app/subnets/subnet-details/subnet-graph.php
@@ -17,12 +17,12 @@
 <div id="pieChart" style="height:220px;width:100%;"></div>
 
 <!-- charts -->
-<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js"></script>
-<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.pie.js"></script>
-<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js"></script><![endif]-->
+<script src="js/flot/jquery.flot.js"></script>
+<script src="js/flot/jquery.flot.pie.js"></script>
+<!--[if lte IE 8]><script src="js/flot/excanvas.min.js"></script><![endif]-->
 
 
-<script type="text/javascript">
+<script>
 $(function () {
 	//data
     var data = [
diff --git a/app/subnets/subnet-slaves.php b/app/subnets/subnet-slaves.php
index 87c08a829..11b3bf8ec 100755
--- a/app/subnets/subnet-slaves.php
+++ b/app/subnets/subnet-slaves.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/temp_share/index.php b/app/temp_share/index.php
index 4767b7c2c..8a714d582 100644
--- a/app/temp_share/index.php
+++ b/app/temp_share/index.php
@@ -38,15 +38,15 @@
 	<?php } ?>
 
 	<!-- js -->
-	<script type="text/javascript" src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript">
+	<script src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script>
 	$(document).ready(function(){
 	     if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 	});
 	</script>
 	<!--[if lt IE 9]>
-	<script type="text/javascript" src="js/dieIE.js"></script>
+	<script src="js/dieIE.js"></script>
 	<![endif]-->
 </head>
 
diff --git a/app/temp_share/subnet-addresses.php b/app/temp_share/subnet-addresses.php
index d61904c84..fd9db4941 100644
--- a/app/temp_share/subnet-addresses.php
+++ b/app/temp_share/subnet-addresses.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/temp_share/subnet-graph.php b/app/temp_share/subnet-graph.php
index 84518f808..771e1638c 100644
--- a/app/temp_share/subnet-graph.php
+++ b/app/temp_share/subnet-graph.php
@@ -15,12 +15,12 @@
 <div id="pieChart" style="height:220px;width:100%;"></div>
 
 <!-- charts -->
-<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js"></script>
-<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.pie.js"></script>
-<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js"></script><![endif]-->
+<script src="js/flot/jquery.flot.js"></script>
+<script src="js/flot/jquery.flot.pie.js"></script>
+<!--[if lte IE 8]><script src="js/flot/excanvas.min.js"></script><![endif]-->
 
 
-<script type="text/javascript">
+<script>
 $(function () {
 	//data
     var data = [
diff --git a/app/tools/circuits/all-circuits-map.php b/app/tools/circuits/all-circuits-map.php
index d6d50e0c1..24b88fab5 100644
--- a/app/tools/circuits/all-circuits-map.php
+++ b/app/tools/circuits/all-circuits-map.php
@@ -63,7 +63,7 @@
 
     // print
     if (sizeof($all_locations)>0) { ?>
-        <script type="text/javascript">
+        <script>
             $(document).ready(function() {
                 // init gmaps
                 var map = new GMaps({
diff --git a/app/tools/circuits/logical-circuits/logical-circuit-details-map.php b/app/tools/circuits/logical-circuits/logical-circuit-details-map.php
index 97819a1f2..34194aaa7 100644
--- a/app/tools/circuits/logical-circuits/logical-circuit-details-map.php
+++ b/app/tools/circuits/logical-circuits/logical-circuit-details-map.php
@@ -77,7 +77,7 @@
 
     // print
     if (sizeof($all_locations)>0) { ?>
-        <script type="text/javascript">
+        <script>
             $(document).ready(function() {
                 // init gmaps
                 var map = new GMaps({
diff --git a/app/tools/circuits/logical-circuits/logical-circuits.php b/app/tools/circuits/logical-circuits/logical-circuits.php
index 135f50e89..9d8be3805 100644
--- a/app/tools/circuits/logical-circuits/logical-circuits.php
+++ b/app/tools/circuits/logical-circuits/logical-circuits.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/circuits/physical-circuits/all-circuits.php b/app/tools/circuits/physical-circuits/all-circuits.php
index 40fe4a45b..bf1f00f75 100644
--- a/app/tools/circuits/physical-circuits/all-circuits.php
+++ b/app/tools/circuits/physical-circuits/all-circuits.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/circuits/physical-circuits/circuit-details-map.php b/app/tools/circuits/physical-circuits/circuit-details-map.php
index 91c54e67d..988047643 100644
--- a/app/tools/circuits/physical-circuits/circuit-details-map.php
+++ b/app/tools/circuits/physical-circuits/circuit-details-map.php
@@ -45,7 +45,7 @@
 
     // print
     if (sizeof($all_locations)>0) { ?>
-        <script type="text/javascript">
+        <script>
             $(document).ready(function() {
                 // init gmaps
                 var map = new GMaps({
diff --git a/app/tools/circuits/providers/all-providers.php b/app/tools/circuits/providers/all-providers.php
index a2d57ec98..d1e3b4876 100644
--- a/app/tools/circuits/providers/all-providers.php
+++ b/app/tools/circuits/providers/all-providers.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/customers/all-customers.php b/app/tools/customers/all-customers.php
index 97f41a994..df1ead80c 100644
--- a/app/tools/customers/all-customers.php
+++ b/app/tools/customers/all-customers.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/customers/customer/map.php b/app/tools/customers/customer/map.php
index d4a052ee2..bfa90c406 100644
--- a/app/tools/customers/customer/map.php
+++ b/app/tools/customers/customer/map.php
@@ -37,7 +37,7 @@
     $customer->note = strlen($customer->note)>0 ? "<span class=\'text-muted\'>".escape_input($customer->note)."</span>" : "";
     $customer->note = str_replace(array("\r\n","\n","\r"), "<br>", $customer->note );
     ?>
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
 
             // init gmaps
diff --git a/app/tools/customers/customer/objects/circuits.php b/app/tools/customers/customer/objects/circuits.php
index 7f3f9a17d..6f5b609cb 100644
--- a/app/tools/customers/customer/objects/circuits.php
+++ b/app/tools/customers/customer/objects/circuits.php
@@ -2,7 +2,7 @@
 <hr>
 <span class="text-muted"><?php print _("All Circuits belonging to customer"); ?>.</span>
 
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/customers/customer/objects/ipaddresses.php b/app/tools/customers/customer/objects/ipaddresses.php
index d764fbceb..0bac10513 100644
--- a/app/tools/customers/customer/objects/ipaddresses.php
+++ b/app/tools/customers/customer/objects/ipaddresses.php
@@ -2,7 +2,7 @@
 <hr>
 <span class="text-muted"><?php print _("All IP addresses belonging to customer"); ?>.</span>
 
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/customers/customer/objects/racks.php b/app/tools/customers/customer/objects/racks.php
index 6f1110a70..1e70f6b97 100644
--- a/app/tools/customers/customer/objects/racks.php
+++ b/app/tools/customers/customer/objects/racks.php
@@ -2,7 +2,7 @@
 <hr>
 <span class="text-muted"><?php print _("All Racks belonging to customer"); ?>.</span>
 
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/customers/customer/objects/routing_bgp.php b/app/tools/customers/customer/objects/routing_bgp.php
index 5e1ad733f..f029b6c74 100644
--- a/app/tools/customers/customer/objects/routing_bgp.php
+++ b/app/tools/customers/customer/objects/routing_bgp.php
@@ -2,7 +2,7 @@
 <hr>
 <span class="text-muted"><?php print _("All BGPs belonging to customer"); ?>.</span>
 
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/customers/customer/objects/subnets.php b/app/tools/customers/customer/objects/subnets.php
index 87a98ddef..6f9f2be46 100644
--- a/app/tools/customers/customer/objects/subnets.php
+++ b/app/tools/customers/customer/objects/subnets.php
@@ -2,7 +2,7 @@
 <hr>
 <span class="text-muted"><?php print _("All subnets belonging to customer"); ?>.</span>
 
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/customers/customer/objects/vlans.php b/app/tools/customers/customer/objects/vlans.php
index 120cf0112..36f04954d 100644
--- a/app/tools/customers/customer/objects/vlans.php
+++ b/app/tools/customers/customer/objects/vlans.php
@@ -2,7 +2,7 @@
 <hr>
 <span class="text-muted"><?php print _("All VLANs belonging to customer"); ?>.</span>
 
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/customers/customer/objects/vrf.php b/app/tools/customers/customer/objects/vrf.php
index e5e390cf7..7277931e5 100644
--- a/app/tools/customers/customer/objects/vrf.php
+++ b/app/tools/customers/customer/objects/vrf.php
@@ -2,7 +2,7 @@
 <hr>
 <span class="text-muted"><?php print _("All VRF belonging to customer"); ?>.</span>
 
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/devices/all-devices.php b/app/tools/devices/all-devices.php
index 4392f3edc..09bce0167 100755
--- a/app/tools/devices/all-devices.php
+++ b/app/tools/devices/all-devices.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 /* fix for ajax-loading tooltips */
 $('body').tooltip({ selector: '[rel=tooltip]' });
 </script>
diff --git a/app/tools/locations/all-locations-map.php b/app/tools/locations/all-locations-map.php
index abb6d8045..d397939bb 100644
--- a/app/tools/locations/all-locations-map.php
+++ b/app/tools/locations/all-locations-map.php
@@ -69,7 +69,7 @@
 
         // calculate
         if (sizeof($all_locations)>0) { ?>
-            <script type="text/javascript">
+            <script>
                 $(document).ready(function() {
                     // init gmaps
                     var map = new GMaps({
diff --git a/app/tools/locations/single-location-map.php b/app/tools/locations/single-location-map.php
index 2ed9f8c70..7cbf6ddd8 100644
--- a/app/tools/locations/single-location-map.php
+++ b/app/tools/locations/single-location-map.php
@@ -44,7 +44,7 @@
     $location->description = strlen($location->description)>0 ? "<span class=\'text-muted\'>".escape_input($location->description)."</span>" : "";
     $location->description = str_replace(array("\r\n","\n","\r"), "<br>", $location->description );
     ?>
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
 
             // init gmaps
diff --git a/app/tools/logs/show-logs.php b/app/tools/logs/show-logs.php
index a41c8c5ae..c31380b88 100755
--- a/app/tools/logs/show-logs.php
+++ b/app/tools/logs/show-logs.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 
diff --git a/app/tools/pstn-prefixes/single-prefix-graph.php b/app/tools/pstn-prefixes/single-prefix-graph.php
index 338558203..91c7d4c04 100644
--- a/app/tools/pstn-prefixes/single-prefix-graph.php
+++ b/app/tools/pstn-prefixes/single-prefix-graph.php
@@ -9,12 +9,12 @@
 <div id="pieChart" style="height:220px;width:100%;"></div>
 
 <!-- charts -->
-<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js"></script>
-<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.pie.js"></script>
-<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js"></script><![endif]-->
+<script src="js/flot/jquery.flot.js"></script>
+<script src="js/flot/jquery.flot.pie.js"></script>
+<!--[if lte IE 8]><script src="js/flot/excanvas.min.js"></script><![endif]-->
 
 
-<script type="text/javascript">
+<script>
 $(function () {
 	//data
     var data = [
diff --git a/app/tools/temp-shares/edit.php b/app/tools/temp-shares/edit.php
index 538bbff82..29a577102 100644
--- a/app/tools/temp-shares/edit.php
+++ b/app/tools/temp-shares/edit.php
@@ -53,8 +53,8 @@
 
 
 <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">
-<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>
-<script type="text/javascript">
+<script src="js/bootstrap-datetimepicker.min.js"></script>
+<script>
 $(document).ready(function() {
 $(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );
 })
diff --git a/app/tools/user-menu/2fa.php b/app/tools/user-menu/2fa.php
index b482de55b..710a3b8c4 100644
--- a/app/tools/user-menu/2fa.php
+++ b/app/tools/user-menu/2fa.php
@@ -87,8 +87,8 @@
 ?>
 
 
-<script type="text/javascript" src="functions/qrcodejs/qrcode.min.js"></script>
-<script type="text/javascript">
+<script src="functions/qrcodejs/qrcode.min.js"></script>
+<script>
 $(document).ready(function() {
 	/* bootstrap switch */
 	var switch_options = {
diff --git a/app/tools/user-menu/account.php b/app/tools/user-menu/account.php
index e3c1b3c5d..8acc83257 100644
--- a/app/tools/user-menu/account.php
+++ b/app/tools/user-menu/account.php
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	/* bootstrap switch */
 	var switch_options = {
diff --git a/app/upgrade/index.php b/app/upgrade/index.php
index 61b0890da..e0dd339ba 100755
--- a/app/upgrade/index.php
+++ b/app/upgrade/index.php
@@ -39,21 +39,21 @@
 	<link rel="shortcut icon" href="css/images/favicon.png">
 
 	<!-- js -->
-	<script type="text/javascript" src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/jclock.jquery.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/login.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/install.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-	<script type="text/javascript" src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/jclock.jquery.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/login.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/install.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+	<script src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 	<?php if ($User->settings->theme!="white") { ?>
 	<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-custom-<?php print $User->settings->theme; ?>.css?v=<?php print SCRIPT_PREFIX; ?>">
 	<?php } ?>
-	<script type="text/javascript">
+	<script>
 	$(document).ready(function(){
 	     if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 	});
 	</script>
 	<!--[if lt IE 9]>
-	<script type="text/javascript" src="js/dieIE.js"></script>
+	<script src="js/dieIE.js"></script>
 	<![endif]-->
 </head>
 
diff --git a/functions/classes/class.Common.php b/functions/classes/class.Common.php
index 54bddea43..a33060b4a 100644
--- a/functions/classes/class.Common.php
+++ b/functions/classes/class.Common.php
@@ -1444,8 +1444,8 @@ public function create_custom_field_input_date ($field, $object, $timepicker_ind
     	// just for first
     	if($timepicker_index==0) {
     		$html[] =  '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
-    		$html[] =  '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
-    		$html[] =  '<script type="text/javascript">';
+    		$html[] =  '<script src="js/bootstrap-datetimepicker.min.js"></script>';
+    		$html[] =  '<script>';
     		$html[] =  '$(document).ready(function() {';
     		//date only
     		$html[] =  '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
diff --git a/index.php b/index.php
index d7a630478..f95d54480 100755
--- a/index.php
+++ b/index.php
@@ -106,28 +106,28 @@
 		<?php } ?>
 
 		<!-- js -->
-		<script type="text/javascript" src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-		<script type="text/javascript" src="js/jclock.jquery.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+		<script src="js/jquery-3.3.1.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+		<script src="js/jclock.jquery.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 		<?php if($_GET['page']=="login" || $_GET['page']=="request_ip") { ?>
-		<script type="text/javascript" src="js/login.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+		<script src="js/login.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 		<?php } ?>
-		<script type="text/javascript" src="js/magic.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-		<script type="text/javascript" src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
-		<script type="text/javascript" src="js/bootstrap-switch.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+		<script src="js/magic.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+		<script src="js/bootstrap.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+		<script src="js/bootstrap-switch.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 
 		<!-- bootstrap table -->
 		<script src="js/bootstrap-table/bootstrap-table.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 		<script src="js/bootstrap-table/bootstrap-table-cookie.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 
 		<!--[if lt IE 9]>
-		<script type="text/javascript" src="js/dieIE.js"></script>
+		<script src="js/dieIE.js"></script>
 		<![endif]-->
 		<?php if ($User->settings->enableLocations=="1" && strlen(Config::get('gmaps_api_key'))>0) { ?>
-		<script type="text/javascript" src="https://maps.google.com/maps/api/js<?php print "?key=".Config::get('gmaps_api_key'); ?>"></script>
-		<script type="text/javascript" src="js/gmaps.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+		<script src="https://maps.google.com/maps/api/js<?php print "?key=".Config::get('gmaps_api_key'); ?>"></script>
+		<script src="js/gmaps.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 		<?php }	?>
 		<!-- jQuery UI -->
-		<script type="text/javascript" src="js/jquery-ui-1.12.1.custom.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
+		<script src="js/jquery-ui-1.12.1.custom.min.js?v=<?php print SCRIPT_PREFIX; ?>"></script>
 
 	</head>
 
diff --git a/install/index.php b/install/index.php
index da66e204f..27f07ce39 100644
--- a/install/index.php
+++ b/install/index.php
@@ -26,10 +26,10 @@
 	<link rel="shortcut icon" href="../css/images/favicon.ico">
 
 	<!--[if IE 6]>
-	<script type="text/javascript" src="js/dieIE.js"></script>
+	<script src="js/dieIE.js"></script>
 	<![endif]-->
 	<!--[if IE 7]>
-	<script type="text/javascript" src="js/dieIE.js"></script>
+	<script src="js/dieIE.js"></script>
 	<![endif]-->
 </head>
 
diff --git a/upgrade/index.php b/upgrade/index.php
index b470a79a1..5eec006ea 100755
--- a/upgrade/index.php
+++ b/upgrade/index.php
@@ -25,10 +25,10 @@
 	<link rel="shortcut icon" href="../css/images/favicon.ico">
 
 	<!--[if IE 6]>
-	<script type="text/javascript" src="js/dieIE.js"></script>
+	<script src="js/dieIE.js"></script>
 	<![endif]-->
 	<!--[if IE 7]>
-	<script type="text/javascript" src="js//dieIE.js"></script>
+	<script src="js//dieIE.js"></script>
 	<![endif]-->
 </head>