diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index e57290dd..2b9ebb28 100644
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -163,7 +163,7 @@ foreach ($engines as $engine) {
 <p>
 <?php if (support("columns") || $TABLE == "") { ?>
 <?php echo lang('Table name'); ?>: <input name="name" maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
-<?php if ($TABLE == "" && !$_POST) { ?><script type='text/javascript'>focus(qs('#form')['name']);</script><?php } ?>
+<?php if ($TABLE == "" && !$_POST) { ?><script>focus(qs('#form')['name']);</script><?php } ?>
 <?php echo ($engines ? "<select name='Engine' onchange='helpClose();'" . on_help("getTarget(event).value", 1) . ">" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" : ""); ?>
  <?php echo ($collations && !preg_match("~sqlite|mssql~", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
@@ -187,7 +187,7 @@ edit_fields($row["fields"], $collations, "TABLE", $foreign_keys, $comments);
 <p>
 <?php echo lang('Auto Increment'); ?>: <input type="number" name="Auto_increment" size="6" value="<?php echo h($row["Auto_increment"]); ?>">
 <?php echo checkbox("defaults", 1, true, lang('Default values'), "columnShow(this.checked, 5)", "jsonly"); ?>
-<?php if (!$_POST["defaults"]) { ?><script type="text/javascript">editingHideDefaults()</script><?php } ?>
+<?php if (!$_POST["defaults"]) { ?><script>editingHideDefaults()</script><?php } ?>
 <?php echo (support("comment")
 	? "<label><input type='checkbox' name='comments' value='1' class='jsonly' onclick=\"columnShow(this.checked, 6); toggle('Comment'); if (this.checked) this.form['Comment'].focus();\"" . ($comments ? " checked" : "") . ">" . lang('Comment') . "</label>"
 		. ' <input name="Comment" id="Comment" value="' . h($row["Comment"]) . '" maxlength="' . ($connection->server_info >= 5.5 ? 2048 : 60) . '"' . ($comments ? '' : ' class="hidden"') . '>'
diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index 98349f91..57a6643c 100644
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -66,7 +66,7 @@ echo ($_POST["add_x"] || strpos($name, "\n")
 	'mssql' => "ms187963.aspx",
 )) : "");
 ?>
-<script type='text/javascript'>focus(qs('#name'));</script>
+<script>focus(qs('#name'));</script>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if (DB != "") {
diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index 36c62737..8a99310a 100644
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -140,7 +140,7 @@ if ($adminer->homepage()) {
 				echo "</div></fieldset>\n";
 			}
 			echo "</form>\n";
-			echo "<script type='text/javascript'>tableCheck();</script>\n";
+			echo "<script>tableCheck();</script>\n";
 		}
 
 		echo '<p class="links"><a href="' . h(ME) . 'create=">' . lang('Create table') . "</a>\n";
@@ -221,7 +221,7 @@ if ($adminer->homepage()) {
 		}
 
 		if ($tables_list) {
-			echo "<script type='text/javascript'>ajaxSetHtml('" . js_escape(ME) . "script=db');</script>\n";
+			echo "<script>ajaxSetHtml('" . js_escape(ME) . "script=db');</script>\n";
 		}
 	}
 }
diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index 7af973a5..0dd819a0 100644
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -189,7 +189,7 @@ if (DB != "") {
 	echo $views;
 
 	if ($tables_list) {
-		echo "<script type='text/javascript'>ajaxSetHtml('" . js_escape(ME) . "script=db');</script>\n";
+		echo "<script>ajaxSetHtml('" . js_escape(ME) . "script=db');</script>\n";
 	}
 
 } else {
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index dfcc0f07..28293372 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -94,7 +94,7 @@ class Adminer {
 <tr><th><?php echo lang('Password'); ?><td><input type="password" name="auth[password]">
 <tr><th><?php echo lang('Database'); ?><td><input name="auth[db]" value="<?php echo h($_GET["db"]); ?>" autocapitalize="off">
 </table>
-<script type="text/javascript">
+<script>
 focus(qs('#username'));
 </script>
 <?php
@@ -399,7 +399,7 @@ focus(qs('#username'));
 		echo "<fieldset><legend>" . lang('Action') . "</legend><div>";
 		echo "<input type='submit' value='" . lang('Select') . "'>";
 		echo " <span id='noindex' title='" . lang('Full table scan') . "'></span>";
-		echo "<script type='text/javascript'>\n";
+		echo "<script>\n";
 		echo "var indexColumns = ";
 		$columns = array();
 		foreach ($indexes as $index) {
@@ -869,15 +869,15 @@ focus(qs('#username'));
 				$tables = table_status('', true);
 			}
 			?>
-<script type="text/javascript" src="../externals/jush/modules/jush.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-js.js"></script>
+<script src="../externals/jush/modules/jush.js"></script>
+<script src="../externals/jush/modules/jush-textarea.js"></script>
+<script src="../externals/jush/modules/jush-txt.js"></script>
+<script src="../externals/jush/modules/jush-js.js"></script>
 <?php
 			if (support("sql")) {
 				?>
-<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
-<script type="text/javascript">
+<script src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
+<script>
 <?php
 				if ($tables) {
 					$links = array();
diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index 3efa9ed3..061475a1 100644
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -61,7 +61,7 @@ function connect_error() {
 					. "</div></fieldset>\n"
 				: ""
 			);
-			echo "<script type='text/javascript'>tableCheck();</script>\n";
+			echo "<script>tableCheck();</script>\n";
 			echo "<input type='hidden' name='token' value='$token'>\n";
 			echo "</form>\n";
 		}
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 17263fd6..291273c8 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -19,13 +19,12 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <!DOCTYPE html>
 <html lang="<?php echo $LANG; ?>" dir="<?php echo lang('ltr'); ?>">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Script-Type" content="text/javascript">
 <meta name="robots" content="noindex">
 <meta name="referrer" content="origin-when-crossorigin">
 <title><?php echo $title_page; ?></title>
 <link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
-<script type="text/javascript" src="../adminer/static/functions.js"></script>
-<script type="text/javascript" src="static/editing.js"></script>
+<script src="../adminer/static/functions.js"></script>
+<script src="static/editing.js"></script>
 <?php if ($adminer->head()) { ?>
 <link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico">
 <link rel="apple-touch-icon" href="../adminer/static/favicon.ico">
@@ -35,7 +34,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <?php } ?>
 
 <body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);"<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " onload=\"verifyVersion('$VERSION');\""); ?>>
-<script type="text/javascript">
+<script>
 document.body.className = document.body.className.replace(/ nojs/, ' js');
 var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
 </script>
@@ -132,6 +131,6 @@ function page_footer($missing = "") {
 <div id="menu">
 <?php $adminer->navigation($missing); ?>
 </div>
-<script type="text/javascript">setupSubmitHighlight(document);</script>
+<script>setupSubmitHighlight(document);</script>
 <?php
 }
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 715d7f3e..2d5545f5 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -253,7 +253,7 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 <td id="label-default"><?php echo lang('Default value'); ?>
 <?php echo (support("comment") ? "<td id='label-comment'" . ($comments ? "" : " class='hidden'") . ">" . lang('Comment') : ""); ?>
 <?php } ?>
-<td><?php echo "<input type='image' class='icon' name='add[" . (support("move_col") ? 0 : count($fields)) . "]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?><script type="text/javascript">row_count = <?php echo count($fields); ?>;</script>
+<td><?php echo "<input type='image' class='icon' name='add[" . (support("move_col") ? 0 : count($fields)) . "]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?><script>row_count = <?php echo count($fields); ?>;</script>
 </thead>
 <tbody onkeydown="return editingKeydown(event);">
 <?php
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 81951fae..8eb7f852 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -1215,7 +1215,7 @@ function slow_query($query) {
 	if (support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
 		$kill = $connection2->result(connection_id()); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
 		?>
-<script type="text/javascript">
+<script>
 var timeout = setTimeout(function () {
 	ajax('<?php echo js_escape(ME); ?>script=kill', function () {
 	}, 'token=<?php echo $token; ?>&kill=<?php echo $kill; ?>');
@@ -1229,7 +1229,7 @@ var timeout = setTimeout(function () {
 	flush();
 	$return = @get_key_vals($query, $connection2, $timeout); // @ - may be killed
 	if ($connection2) {
-		echo "<script type='text/javascript'>clearTimeout(timeout);</script>\n";
+		echo "<script>clearTimeout(timeout);</script>\n";
 		ob_flush();
 		flush();
 	}
@@ -1383,7 +1383,7 @@ function edit_form($TABLE, $fields, $row, $update) {
 		}
 	}
 	echo ($update ? "<input type='submit' name='delete' value='" . lang('Delete') . "'" . confirm() . ">\n"
-		: ($_POST || !$fields ? "" : "<script type='text/javascript'>focus(qsa('td', qs('#form'))[1].firstChild);</script>\n")
+		: ($_POST || !$fields ? "" : "<script>focus(qsa('td', qs('#form'))[1].firstChild);</script>\n")
 	);
 	if (isset($_GET["select"])) {
 		hidden_fields(array("check" => (array) $_POST["check"], "clone" => $_POST["clone"], "all" => $_POST["all"]));
diff --git a/adminer/plugin.php b/adminer/plugin.php
index d948600f..7267f55e 100644
--- a/adminer/plugin.php
+++ b/adminer/plugin.php
@@ -17,7 +17,7 @@ function adminer_object() {
 		new AdminerDumpXml,
 		new AdminerDumpAlter,
 		//~ new AdminerSqlLog("past-" . rtrim(`git describe --tags --abbrev=0`) . ".sql"),
-		//~ new AdminerEditCalendar("<script type='text/javascript' src='../externals/jquery-ui/jquery-1.4.4.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.core.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.widget.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.datepicker.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.mouse.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.slider.js'></script>\n<script type='text/javascript' src='../externals/jquery-timepicker/jquery-ui-timepicker-addon.js'></script>\n<link rel='stylesheet' href='../externals/jquery-ui/themes/base/jquery.ui.all.css'>\n<style type='text/css'>\n.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }\n.ui-timepicker-div dl { text-align: left; }\n.ui-timepicker-div dl dt { height: 25px; }\n.ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }\n.ui-timepicker-div td { font-size: 90%; }\n</style>\n", "../externals/jquery-ui/ui/i18n/jquery.ui.datepicker-%s.js"),
+		//~ new AdminerEditCalendar("<script src='../externals/jquery-ui/jquery-1.4.4.js'></script>\n<script src='../externals/jquery-ui/ui/jquery.ui.core.js'></script>\n<script src='../externals/jquery-ui/ui/jquery.ui.widget.js'></script>\n<script src='../externals/jquery-ui/ui/jquery.ui.datepicker.js'></script>\n<script src='../externals/jquery-ui/ui/jquery.ui.mouse.js'></script>\n<script src='../externals/jquery-ui/ui/jquery.ui.slider.js'></script>\n<script src='../externals/jquery-timepicker/jquery-ui-timepicker-addon.js'></script>\n<link rel='stylesheet' href='../externals/jquery-ui/themes/base/jquery.ui.all.css'>\n<style type='text/css'>\n.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }\n.ui-timepicker-div dl { text-align: left; }\n.ui-timepicker-div dl dt { height: 25px; }\n.ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }\n.ui-timepicker-div td { font-size: 90%; }\n</style>\n", "../externals/jquery-ui/ui/i18n/jquery.ui.datepicker-%s.js"),
 		//~ new AdminerTinymce("../externals/tinymce/jscripts/tiny_mce/tiny_mce_dev.js"),
 		//~ new AdminerWymeditor(array("../externals/wymeditor/src/jquery/jquery.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.explorer.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.mozilla.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.opera.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.safari.js")),
 		new AdminerFileUpload(""),
diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php
index 6ddeb7bc..8f8e9638 100644
--- a/adminer/processlist.inc.php
+++ b/adminer/processlist.inc.php
@@ -44,7 +44,7 @@ foreach (process_list() as $i => $row) {
 }
 ?>
 </table>
-<script type='text/javascript'>tableCheck();</script>
+<script>tableCheck();</script>
 <p>
 <?php
 if (support("kill")) {
diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index dea8a5d0..6f58a2b4 100644
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -49,7 +49,7 @@ foreach (table_status('', true) as $table => $table_status) {
 
 ?>
 <div id="schema" style="height: <?php echo $top; ?>em;" onselectstart="return false;">
-<script type="text/javascript">
+<script>
 var tablePos = {<?php echo implode(",", $table_pos_js) . "\n"; ?>};
 var em = qs('#schema').offsetHeight / <?php echo $top; ?>;
 document.onmousemove = schemaMousemove;
diff --git a/adminer/scheme.inc.php b/adminer/scheme.inc.php
index c7d17d6e..fc588dd6 100644
--- a/adminer/scheme.inc.php
+++ b/adminer/scheme.inc.php
@@ -27,7 +27,7 @@ if (!$row) {
 
 <form action="" method="post">
 <p><input name="name" id="name" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
-<script type='text/javascript'>focus(qs('#name'));</script>
+<script>focus(qs('#name'));</script>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($_GET["ns"] != "") {
diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 46f297cf..3e7afd0f 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -519,7 +519,7 @@ if (!$columns && support("table")) {
 				echo "</div></fieldset>\n";
 			}
 
-			echo (!$group && $select ? "" : "<script type='text/javascript'>tableCheck();</script>\n");
+			echo (!$group && $select ? "" : "<script>tableCheck();</script>\n");
 		}
 
 		if ($adminer->selectImportPrint()) {
diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index ddd385a2..c51476c4 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -208,7 +208,7 @@ if (!isset($_GET["import"])) {
 	}
 	echo "<p>";
 	textarea("query", $q, 20);
-	echo ($_POST ? "" : "<script type='text/javascript'>qs('textarea').focus();</script>\n");
+	echo ($_POST ? "" : "<script>qs('textarea').focus();</script>\n");
 	echo "<p>$execute\n";
 	echo lang('Limit rows') . ": <input type='number' name='limit' class='size' value='" . h($_POST ? $_POST["limit"] : $_GET["limit"]) . "'>\n";
 	
diff --git a/adminer/trigger.inc.php b/adminer/trigger.inc.php
index 42afb976..94b98ba9 100644
--- a/adminer/trigger.inc.php
+++ b/adminer/trigger.inc.php
@@ -40,7 +40,7 @@ page_header(($name != "" ? lang('Alter trigger') . ": " . h($name) : lang('Creat
 <tr><th><?php echo lang('Type'); ?><td><?php echo html_select("Type", $trigger_options["Type"], $row["Type"]); ?>
 </table>
 <p><?php echo lang('Name'); ?>: <input name="Trigger" value="<?php echo h($row["Trigger"]); ?>" maxlength="64" autocapitalize="off">
-<script type="text/javascript">qs('#form')['Timing'].onchange();</script>
+<script>qs('#form')['Timing'].onchange();</script>
 <p><?php textarea("Statement", $row["Statement"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
diff --git a/adminer/user.inc.php b/adminer/user.inc.php
index 4d9afd9f..9442c487 100644
--- a/adminer/user.inc.php
+++ b/adminer/user.inc.php
@@ -135,7 +135,7 @@ if ($_POST) {
 <tr><th><?php echo lang('Server'); ?><td><input name="host" maxlength="60" value="<?php echo h($row["host"]); ?>" autocapitalize="off">
 <tr><th><?php echo lang('Username'); ?><td><input name="user" maxlength="16" value="<?php echo h($row["user"]); ?>" autocapitalize="off">
 <tr><th><?php echo lang('Password'); ?><td><input name="pass" id="pass" value="<?php echo h($row["pass"]); ?>">
-<?php if (!$row["hashed"]) { ?><script type="text/javascript">typePassword(qs('#pass'));</script><?php } ?>
+<?php if (!$row["hashed"]) { ?><script>typePassword(qs('#pass'));</script><?php } ?>
 <?php echo checkbox("hashed", 1, $row["hashed"], lang('Hashed'), "typePassword(this.form['pass'], this.checked);"); ?>
 </table>
 
diff --git a/compile.php b/compile.php
index 9982cb75..5e635ec9 100755
--- a/compile.php
+++ b/compile.php
@@ -393,11 +393,11 @@ if ($_SESSION["lang"]) {
 	$file = str_replace("<?php switch_lang(); ?>\n", "", $file);
 	$file = str_replace('<?php echo $LANG; ?>', $_SESSION["lang"], $file);
 }
-$file = str_replace('<script type="text/javascript" src="static/editing.js"></script>' . "\n", "", $file);
-$file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>' . "\n", "", $file);
-$file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>' . "\n", "", $file);
-$file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-js.js"></script>' . "\n", "", $file);
-$file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>' . "\n", "", $file);
+$file = str_replace('<script src="static/editing.js"></script>' . "\n", "", $file);
+$file = str_replace('<script src="../externals/jush/modules/jush-textarea.js"></script>' . "\n", "", $file);
+$file = str_replace('<script src="../externals/jush/modules/jush-txt.js"></script>' . "\n", "", $file);
+$file = str_replace('<script src="../externals/jush/modules/jush-js.js"></script>' . "\n", "", $file);
+$file = str_replace('<script src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>' . "\n", "", $file);
 $file = str_replace('<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">' . "\n", "", $file);
 $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
 $replace = 'h(preg_replace("~\\\\\\\\?.*~", "", ME)) . "?file=\\1&amp;version=' . $VERSION . ($driver ? '&amp;driver=' . $driver : '');
diff --git a/editor/db.inc.php b/editor/db.inc.php
index a3349601..352880e9 100644
--- a/editor/db.inc.php
+++ b/editor/db.inc.php
@@ -21,6 +21,6 @@ if ($adminer->homepage()) {
 	}
 	
 	echo "</table>\n";
-	echo "<script type='text/javascript'>tableCheck();</script>\n";
+	echo "<script>tableCheck();</script>\n";
 	echo "</form>\n";
 }
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index e0dd1383..0416dfa4 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -58,7 +58,7 @@ class Adminer {
 <tr><th><?php echo lang('Username'); ?><td><input type="hidden" name="auth[driver]" value="server"><input name="auth[username]" id="username" value="<?php echo h($_GET["username"]); ?>" autocapitalize="off">
 <tr><th><?php echo lang('Password'); ?><td><input type="password" name="auth[password]">
 </table>
-<script type="text/javascript">
+<script>
 focus(qs('#username'));
 </script>
 <?php
diff --git a/plugins/edit-calendar.php b/plugins/edit-calendar.php
index c485af3d..f4eca515 100644
--- a/plugins/edit-calendar.php
+++ b/plugins/edit-calendar.php
@@ -16,7 +16,7 @@ class AdminerEditCalendar {
 	* @param string text to append before first calendar usage
 	* @param string path to language file, %s stands for language code
 	*/
-	function __construct($prepend = "<script type='text/javascript' src='jquery-ui/jquery.js'></script>\n<script type='text/javascript' src='jquery-ui/jquery-ui.js'></script>\n<script type='text/javascript' src='jquery-ui/jquery-ui-timepicker-addon.js'></script>\n<link rel='stylesheet' type='text/css' href='jquery-ui/jquery-ui.css'>\n", $langPath = "jquery-ui/i18n/jquery.ui.datepicker-%s.js") {
+	function __construct($prepend = "<script src='jquery-ui/jquery.js'></script>\n<script src='jquery-ui/jquery-ui.js'></script>\n<script src='jquery-ui/jquery-ui-timepicker-addon.js'></script>\n<link rel='stylesheet' type='text/css' href='jquery-ui/jquery-ui.css'>\n", $langPath = "jquery-ui/i18n/jquery.ui.datepicker-%s.js") {
 		$this->prepend = $prepend;
 		$this->langPath = $langPath;
 	}
@@ -27,8 +27,8 @@ class AdminerEditCalendar {
 			$lang = get_lang();
 			$lang = ($lang == "zh" ? "zh-CN" : ($lang == "zh-tw" ? "zh-TW" : $lang));
 			if ($lang != "en" && file_exists(sprintf($this->langPath, $lang))) {
-				printf("<script type='text/javascript' src='$this->langPath'></script>\n", $lang);
-				echo "<script type='text/javascript'>jQuery(function () { jQuery.timepicker.setDefaults(jQuery.datepicker.regional['$lang']); });</script>\n";
+				printf("<script src='$this->langPath'></script>\n", $lang);
+				echo "<script>jQuery(function () { jQuery.timepicker.setDefaults(jQuery.datepicker.regional['$lang']); });</script>\n";
 			}
 		}
 	}
@@ -37,7 +37,7 @@ class AdminerEditCalendar {
 		if (preg_match("~date|time~", $field["type"])) {
 			$dateFormat = "changeYear: true, dateFormat: 'yy-mm-dd'"; //! yy-mm-dd regional
 			$timeFormat = "showSecond: true, timeFormat: 'HH:mm:ss.lcZ', timeInput: true";
-			return "<input id='fields-" . h($field["field"]) . "' value='" . h($value) . "'" . (@+$field["length"] ? " maxlength='" . (+$field["length"]) . "'" : "") . "$attrs><script type='text/javascript'>jQuery('#fields-" . js_escape($field["field"]) . "')."
+			return "<input id='fields-" . h($field["field"]) . "' value='" . h($value) . "'" . (@+$field["length"] ? " maxlength='" . (+$field["length"]) . "'" : "") . "$attrs><script>jQuery('#fields-" . js_escape($field["field"]) . "')."
 				. ($field["type"] == "time" ? "timepicker({ $timeFormat })"
 				: (preg_match("~time~", $field["type"]) ? "datetimepicker({ $dateFormat, $timeFormat })"
 				: "datepicker({ $dateFormat })"
diff --git a/plugins/login-sqlite.php b/plugins/login-sqlite.php
index b0e175b2..1d8bf0b8 100644
--- a/plugins/login-sqlite.php
+++ b/plugins/login-sqlite.php
@@ -14,7 +14,7 @@ class AdminerLoginSqlite {
 
 	function loginForm() {
 		?>
-<script type="text/javascript">
+<script>
 addEventListener('load', function () {
 	var driver = qs('name="auth[driver]"');
 	if (isTag(driver, 'select')) {
diff --git a/plugins/tables-filter.php b/plugins/tables-filter.php
index 4c14b672..b68c23da 100644
--- a/plugins/tables-filter.php
+++ b/plugins/tables-filter.php
@@ -23,7 +23,7 @@ foreach ($tables as $table => $status) {
 }
 ?>
 </ul>
-<script type="text/javascript">
+<script>
 var tablesFilterTimeout = null;
 var tablesFilterValue = '';
 
diff --git a/plugins/tinymce.php b/plugins/tinymce.php
index 1bd52c7a..e83d22d1 100644
--- a/plugins/tinymce.php
+++ b/plugins/tinymce.php
@@ -28,8 +28,8 @@ class AdminerTinymce {
 			}
 		}
 		?>
-<script type="text/javascript" src="<?php echo h($this->path); ?>"></script>
-<script type="text/javascript">
+<script src="<?php echo h($this->path); ?>"></script>
+<script>
 tinyMCE.init({
 	mode: 'none',
 	theme: 'advanced',
@@ -68,7 +68,7 @@ tinyMCE.init({
 
 	function editInput($table, $field, $attrs, $value) {
 		if (preg_match("~text~", $field["type"]) && preg_match("~_html~", $field["field"])) {
-			return "<textarea$attrs id='fields-" . h($field["field"]) . "' rows='12' cols='50'>" . h($value) . "</textarea><script type='text/javascript'>
+			return "<textarea$attrs id='fields-" . h($field["field"]) . "' rows='12' cols='50'>" . h($value) . "</textarea><script>
 tinyMCE.remove(tinyMCE.get('fields-" . js_escape($field["field"]) . "') || { });
 tinyMCE.execCommand('mceAddControl', true, 'fields-" . js_escape($field["field"]) . "');
 qs('#form').onsubmit = function () {
diff --git a/plugins/version-noverify.php b/plugins/version-noverify.php
index 41593d34..6d3d7a9b 100644
--- a/plugins/version-noverify.php
+++ b/plugins/version-noverify.php
@@ -10,7 +10,7 @@ class AdminerVersionNoverify {
 	
 	function navigation($missing) {
 		?>
-<script type="text/javascript">
+<script>
 verifyVersion = function () {
 };
 </script>
diff --git a/plugins/wymeditor.php b/plugins/wymeditor.php
index 7551924c..3dc2217d 100644
--- a/plugins/wymeditor.php
+++ b/plugins/wymeditor.php
@@ -22,7 +22,7 @@ class AdminerWymeditor {
 
 	function head() {
 		foreach ($this->scripts as $script) {
-			echo "<script type='text/javascript' src='" . h($script) . "'></script>\n";
+			echo "<script src='" . h($script) . "'></script>\n";
 		}
 	}
 
@@ -55,7 +55,7 @@ class AdminerWymeditor {
 				$lang = get_lang();
 				$lang = ($lang == "zh" || $lang == "zh-tw" ? "zh_cn" : $lang);
 			}
-			return "<textarea$attrs id='fields-" . h($field["field"]) . "' rows='12' cols='50'>" . h($value) . "</textarea><script type='text/javascript'>
+			return "<textarea$attrs id='fields-" . h($field["field"]) . "' rows='12' cols='50'>" . h($value) . "</textarea><script>
 jQuery('#fields-" . js_escape($field["field"]) . "').wymeditor({ updateSelector: '#form [type=\"submit\"]', lang: '$lang'" . ($this->options ? ", $this->options" : "") . " });
 </script>";
 		}