diff --git a/contrib/blotter/theme.php b/contrib/blotter/theme.php
index 6fdd2d88..e8d82860 100644
--- a/contrib/blotter/theme.php
+++ b/contrib/blotter/theme.php
@@ -138,7 +138,7 @@ class BlotterTheme extends Themelet {
 #blotter1 {font-size: 80%; position: relative;}
 #blotter2 {font-size: 80%;}
 </style>";
-		$html .= "<script><!--
+		$html .= "<script type='text/javascript'><!--
 $(document).ready(function() {
 	$(\"#blotter2-toggle\").click(function() {
 		$(\"#blotter2\").slideToggle(\"slow\", function() {
diff --git a/contrib/image_hash_ban/theme.php b/contrib/image_hash_ban/theme.php
index c5b81788..1e858c79 100644
--- a/contrib/image_hash_ban/theme.php
+++ b/contrib/image_hash_ban/theme.php
@@ -39,7 +39,7 @@ class ImageBanTheme extends Themelet {
 			";
 		}
 		$html = "
-			<script>
+			<script type='text/javascript'>
 			$(document).ready(function() {
 				$(\"#image_bans\").tablesorter();
 			});
diff --git a/contrib/ipban/theme.php b/contrib/ipban/theme.php
index 78482473..f2706fb8 100644
--- a/contrib/ipban/theme.php
+++ b/contrib/ipban/theme.php
@@ -36,7 +36,7 @@ class IPBanTheme extends Themelet {
 			";
 		}
 		$html = "
-			<script>
+			<script type='text/javascript'>
 			$(document).ready(function() {
 				$(\"#bans\").tablesorter();
 			});
diff --git a/contrib/pm/theme.php b/contrib/pm/theme.php
index 2a6eb356..4689217f 100644
--- a/contrib/pm/theme.php
+++ b/contrib/pm/theme.php
@@ -5,7 +5,7 @@ class PrivMsgTheme extends Themelet {
 		global $user;
 
 		$html = "
-			<script>
+			<script type='text/javascript'>
 			$(document).ready(function() {
 				$(\"#pms\").tablesorter();
 			});
diff --git a/core/util.inc.php b/core/util.inc.php
index 358dbeb0..7b51be91 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -218,13 +218,14 @@ function make_http($link) {
 
 /**
  * Make a form tag with relevant auth token and stuff
+ * (Added optional Form ID field for helping jquery.)
  *
  * @retval string
  */
-function make_form($target, $method="POST", $multipart=False) {
+function make_form($target, $method="POST", $multipart=False, $form_id="") {
 	global $user;
 	$auth = $user->get_auth_html();
-	$extra = "";
+	$extra = empty($form_id) ? '' : " id='$form_id'";
 	if($multipart) {
 		$extra .= " enctype='multipart/form-data'";
 	}
diff --git a/ext/alias_editor/theme.php b/ext/alias_editor/theme.php
index 1fec6c25..cec35af0 100644
--- a/ext/alias_editor/theme.php
+++ b/ext/alias_editor/theme.php
@@ -46,7 +46,7 @@ class AliasEditorTheme extends Themelet {
 			$h_aliases .= "</tr>";
 		}
 		$html = "
-			<script>
+			<script type='text/javascript'>
 			$(document).ready(function() {
 				$(\"#aliases\").tablesorter();
 			});
diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php
index 99f8e12a..25f4aac7 100644
--- a/ext/ext_manager/theme.php
+++ b/ext/ext_manager/theme.php
@@ -6,7 +6,7 @@ class ExtManagerTheme extends Themelet {
 		$en = $editable ? "<th>Enabled</th>" : "";
 		$html = "
 			".make_form(make_link("ext_manager/set"))."
-				<script>
+				<script type='text/javascript'>
 				$(document).ready(function() {
 					$(\"#extensions\").tablesorter();
 				});
diff --git a/ext/image/theme.php b/ext/image/theme.php
index e1554af4..2682314e 100644
--- a/ext/image/theme.php
+++ b/ext/image/theme.php
@@ -2,6 +2,7 @@
 class ImageIOTheme {
 	/*
 	 * Display a link to delete an image
+	 * (Added inline Javascript to confirm the deletion)
 	 *
 	 * $image_id = the image to delete
 	 */
@@ -10,9 +11,9 @@ class ImageIOTheme {
 
 		$i_image_id = int_escape($image_id);
 		$html = "
-			".make_form(make_link("image_admin/delete"))."
+			".make_form(make_link("image_admin/delete"),'POST',false,'delete_image')."
 				<input type='hidden' name='image_id' value='$i_image_id'>
-				<input type='submit' value='Delete'>
+				<input type='submit' value='Delete' onclick='return confirm(\"Delete the image?\");'>
 			</form>
 		";
 		return $html;
diff --git a/ext/index/theme.php b/ext/index/theme.php
index 7b531191..56775736 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -79,7 +79,7 @@ EOD;
 		$h_search_string = html_escape(implode(" ", $search_terms));
 		$h_search_link = make_link();
 		$h_search = "
-			<script><!--
+			<script type='text/javascript'><!--
 			$(document).ready(function() {
 				$('#search_input').DefaultValue('Search');
 				$('#search_input').autocomplete('".make_link("api/internal/tag_list/complete")."', {
diff --git a/ext/setup/theme.php b/ext/setup/theme.php
index 500b5791..7cf834a6 100644
--- a/ext/setup/theme.php
+++ b/ext/setup/theme.php
@@ -79,7 +79,7 @@ class SetupTheme extends Themelet {
 		}
 
 		$table = "
-			<script>
+			<script type='text/javascript'>
 			$(document).ready(function() {
 				$(\"#settings\").tablesorter();
 			});
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index 98631dbb..aaf88dfe 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -35,7 +35,7 @@ class UploadTheme extends Themelet {
 		$max_size = $config->get_int('upload_size');
 		$max_kb = to_shorthand_int($max_size);
 		$html = "
-			<script>
+			<script type='text/javascript'>
 			$(document).ready(function() {
 				$('#tag_box').DefaultValue('tagme');
 				$('#tag_box').autocomplete('".make_link("api/internal/tag_list/complete")."', {
@@ -105,7 +105,7 @@ class UploadTheme extends Themelet {
 		$max_kb = to_shorthand_int($max_size);
 		// <input type='hidden' name='max_file_size' value='$max_size' />
 		return "
-			<script>
+			<script type='text/javascript'>
 			$(document).ready(function() {
 				$('#tag_input').DefaultValue('tagme');
 				$('#tag_input').autocomplete('".make_link("api/internal/tag_list/complete")."', {
diff --git a/ext/view/theme.php b/ext/view/theme.php
index 5d7cce58..993243b3 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -44,7 +44,7 @@ class ViewImageTheme extends Themelet {
 		$h_index = "<a href='".make_link()."'>Index</a>";
 		$h_next = "<a id='nextlink' href='".make_link("post/next/{$image->id}", $query)."'>Next</a>";
 		$script = "
-		<script><!--
+		<script type='text/javascript'><!--
 		$(document).ready(function() {
 			if(document.location.hash.length > 3) {
 				query = document.location.hash.substring(1);
@@ -63,7 +63,7 @@ class ViewImageTheme extends Themelet {
 	protected function build_navigation(Image $image) {
 		$h_pin = $this->build_pin($image);
 		$h_search = "
-			<script><!--
+			<script type='text/javascript'><!--
 			$(document).ready(function() {
 				$(\"#search_input\").DefaultValue(\"Search\");
 			});
diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php
index d239b266..eed06b9b 100644
--- a/themes/default/layout.class.php
+++ b/themes/default/layout.class.php
@@ -89,7 +89,7 @@ EOD;
 		$html = "";
 		$i = str_replace(' ', '_', $h) . $salt;
 		if($hidable) $html .= "
-			<script><!--
+			<script type='text/javascript'><!--
 			$(document).ready(function() {
 				$(\"#$i-toggle\").click(function() {
 					$(\"#$i\").slideToggle(\"slow\", function() {
diff --git a/themes/default/setup.theme.php b/themes/default/setup.theme.php
index 6f55a711..ffd82027 100644
--- a/themes/default/setup.theme.php
+++ b/themes/default/setup.theme.php
@@ -8,7 +8,7 @@ class CustomSetupTheme extends SetupTheme {
 		$b = $block->body;
 		$i = preg_replace('/[^a-zA-Z0-9]/', '_', $h) . "-setup";
 		$html = "
-			<script><!--
+			<script type='text/javascript'><!--
 			$(document).ready(function() {
 				$(\"#$i-toggle\").click(function() {
 					$(\"#$i\").slideToggle(\"slow\", function() {
diff --git a/themes/flat/layout.class.php b/themes/flat/layout.class.php
index a6284557..d8fb4e0f 100644
--- a/themes/flat/layout.class.php
+++ b/themes/flat/layout.class.php
@@ -90,7 +90,7 @@ EOD;
 		$html = "";
 		$i = str_replace(' ', '_', $h) . $salt;
 		if($hidable) $html .= "
-			<script><!--
+			<script type='text/javascript'><!--
 			$(document).ready(function() {
 				$(\"#$i-toggle\").click(function() {
 					$(\"#$i\").slideToggle(\"slow\", function() {
diff --git a/themes/flat/setup.theme.php b/themes/flat/setup.theme.php
index 2d54ec3e..282e80b6 100644
--- a/themes/flat/setup.theme.php
+++ b/themes/flat/setup.theme.php
@@ -8,7 +8,7 @@ class CustomSetupTheme extends SetupTheme {
 		$b = $block->body;
 		$i = preg_replace('/[^a-zA-Z0-9]/', '_', $h) . "-setup";
 		$html = "
-			<script><!--
+			<script type='text/javascript'><!--
 			$(document).ready(function() {
 				$(\"#$i-toggle\").click(function() {
 					$(\"#$i\").slideToggle(\"slow\", function() {
diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php
index 7ba95c57..5e9bed77 100644
--- a/themes/lite/layout.class.php
+++ b/themes/lite/layout.class.php
@@ -196,7 +196,7 @@ EOD;
 		$html = "";
 		$i = str_replace(' ', '_', $h) . $salt;
 		if($hidable) $html .= "
-			<script><!--
+			<script type='text/javascript'><!--
 			$(document).ready(function() {
 				$(\"#$i-toggle\").click(function() {
 					$(\"#$i\").slideToggle(\"slow\", function() {
diff --git a/themes/lite/setup.theme.php b/themes/lite/setup.theme.php
index 2d54ec3e..282e80b6 100644
--- a/themes/lite/setup.theme.php
+++ b/themes/lite/setup.theme.php
@@ -8,7 +8,7 @@ class CustomSetupTheme extends SetupTheme {
 		$b = $block->body;
 		$i = preg_replace('/[^a-zA-Z0-9]/', '_', $h) . "-setup";
 		$html = "
-			<script><!--
+			<script type='text/javascript'><!--
 			$(document).ready(function() {
 				$(\"#$i-toggle\").click(function() {
 					$(\"#$i\").slideToggle(\"slow\", function() {
diff --git a/themes/warm/layout.class.php b/themes/warm/layout.class.php
index 330c5756..3bd85755 100644
--- a/themes/warm/layout.class.php
+++ b/themes/warm/layout.class.php
@@ -102,7 +102,7 @@ EOD;
 		$html = "";
 		$i = str_replace(' ', '_', $h) . $salt;
 		if($hidable) $html .= "
-			<script><!--
+			<script type='text/javascript'><!--
 			$(document).ready(function() {
 				$(\"#$i-toggle\").click(function() {
 					$(\"#$i\").slideToggle(\"slow\", function() {