fix XHTML tags which are invalid and obsolete on HTML5

Since we are switcing to XHTML 1.0 > HTML 5 some of our html is invalid and some are obsolete, which is this pull fixes. These include: Removal of CDATA tags (invalid on HTML5) Removal of type attribute on link and script tags (purely advisory, works without it) Signed-off-by: Mustafa Can Elmacı <mustafacan@elmaci.net>
SimpleMachines · e813b56ff28a56ed4bea17937c15db7a436ba28b · Jul 10, 2015
commit e813b56ff28a56ed4bea17937c15db7a436ba28b
1 parent 354f8c1
@@ -1394,9 +1394,9 @@ function ssi_pollVote()
 		echo '<!DOCTYPE html>
 <html>
 <head>
-	<script><!-- // --><![CDATA[
+	<script>
 		history.go(-1);
-	// ]]></script>
+	</script>
 </head>
 <body>&laquo;</body>
 </html>';
@@ -647,7 +647,7 @@ function BookOfUnknown()
 <html', $context['right_to_left'] ? ' dir="rtl"' : '', '>
 	<head>
 		<title>The Book of Unknown, ', @$_GET['verse'] == '2:18' ? '2:18' : '4:16', '</title>
-		<style type="text/css">
+		<style>
 			em
 			{
 				font-size: 1.3em;
@@ -344,7 +344,7 @@ function ModifyMailSettings($return_config = false)
 	prepareDBSettingContext($config_vars);
 
 	$context['settings_insert_above'] = '
-	<script><!-- // --><![CDATA[
+	<script>
 		var bDay = {';
 
 	$i = 0;
@@ -365,7 +365,7 @@ function fetch_birthday_preview()
 			document.getElementById(\'birthday_subject\').innerHTML = bDay[index].subject;
 			document.getElementById(\'birthday_body\').innerHTML = bDay[index].body;
 		}
-	// ]]></script>';
+	</script>';
 }
 
 /**
@@ -2490,10 +2490,10 @@ function get_integration_hooks_data($start, $per_page, $sort)
 
 	if (!empty($hooks_filters))
 		$context['insert_after_template'] .= '
-		<script><!-- // --><![CDATA[
+		<script>
 			var hook_name_header = document.getElementById(\'header_list_integration_hooks_hook_name\');
 			hook_name_header.innerHTML += ' . JavaScriptEscape('<select style="margin-left:15px;" onchange="window.location=(\'' . $scripturl . '?action=admin;area=maintain;sa=hooks\' + (this.value ? \';filter=\' + this.value : \'\'));"><option value="">' . $txt['hooks_reset_filter'] . '</option>' . implode('', $hooks_filters) . '</select>'). ';
-		// ]]></script>';
+		</script>';
 
 	$temp_data = array();
 	$id = 0;
@@ -1893,7 +1893,7 @@ function create_control_richedit($editorOptions)
 		}
 		if (!empty($bbcodes_styles))
 			$context['html_headers'] .= '
-		<style type="text/css">' . $bbcodes_styles . '
+		<style>' . $bbcodes_styles . '
 		</style>';
 	}
 
@@ -2081,9 +2081,9 @@ function create_control_verification(&$verificationOptions, $do_test = false)
 	// Add javascript for the object.
 	if ($context['controls']['verification'][$verificationOptions['id']]['show_visual'] && !WIRELESS)
 		$context['insert_after_template'] .= '
-			<script><!-- // --><![CDATA[
+			<script>
 				var verification' . $verificationOptions['id'] . 'Handle = new smfCaptcha("' . $thisVerification['image_href'] . '", "' . $verificationOptions['id'] . '", ' . ($context['use_graphic_library'] ? 1 : 0) . ');
-			// ]]></script>';
+			</script>';
 
 	// Is there actually going to be anything?
 	if (empty($thisVerification['show_visual']) && empty($thisVerification['number_questions']))
@@ -2267,7 +2267,7 @@ function create_control_verification(&$verificationOptions, $do_test = false)
 	{
 		if (!isset($context['html_headers']))
 			$context['html_headers'] = '';
-		$context['html_headers'] .= '<style type="text/css">.vv_special { display:none; }</style>';
+		$context['html_headers'] .= '<style>.vv_special { display:none; }</style>';
 	}
 
 	// Have we got some questions to load?
@@ -3298,7 +3298,7 @@ function template_javascript($do_defered = false)
 	if (!empty($context['javascript_vars']) && !$do_defered)
 	{
 		echo '
-	<script><!-- // --><![CDATA[';
+	<script>';
 
 		foreach ($context['javascript_vars'] as $key => $value)
 		{
@@ -3315,7 +3315,7 @@ function template_javascript($do_defered = false)
 		}
 
 		echo '
-	// ]]></script>';
+	</script>';
 	}
 
 	// While we have Javascript files to place in the template
@@ -3328,9 +3328,9 @@ function template_javascript($do_defered = false)
 		// If we are loading JQuery and we are set to 'auto' load, put in our remote success or load local check
 		if ($id == 'jquery' && (!isset($modSettings['jquery_source']) || !in_array($modSettings['jquery_source'], array('local', 'cdn'))))
 		echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		window.jQuery || document.write(\'<script src="' . $settings['default_theme_url'] . '/scripts/jquery-1.11.0.min.js"><\/script>\');
-	// ]]></script>';
+	</script>';
 
 	}
 
@@ -3340,25 +3340,25 @@ function template_javascript($do_defered = false)
 		if (!empty($context['javascript_inline']['defer']) && $do_defered)
 		{
 			echo '
-<script><!-- // --><![CDATA[';
+<script>';
 
 			foreach ($context['javascript_inline']['defer'] as $js_code)
 				echo $js_code;
 
 			echo '
-// ]]></script>';
+</script>';
 		}
 
 		if (!empty($context['javascript_inline']['standard']) && !$do_defered)
 		{
 			echo '
-	<script><!-- // --><![CDATA[';
+	<script>';
 
 			foreach ($context['javascript_inline']['standard'] as $js_code)
 				echo $js_code;
 
 			echo '
-	// ]]></script>';
+	</script>';
 		}
 	}
 }
@@ -3375,7 +3375,7 @@ function template_css()
 
 	foreach ($context['css_files'] as $id => $file)
 		echo '
-	<link rel="stylesheet" type="text/css" href="', $file['filename'], '">';
+	<link rel="stylesheet" href="', $file['filename'], '">';
 
 	if ($db_show_debug === true)
 	{
@@ -55,8 +55,8 @@ function ViewQuery()
 <html', $context['right_to_left'] ? ' dir="rtl"' : '', '>
 	<head>
 		<title>', $context['forum_name_html_safe'], '</title>
-		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css?alp21">
-		<style type="text/css">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css?alp21">
+		<style>
 			body
 			{
 				margin: 1ex;
@@ -110,7 +110,7 @@ function template_admin()
 
 	// This sets the announcements and current versions themselves ;).
 	echo '
-					<script><!-- // --><![CDATA[
+					<script>
 						var oAdminIndex = new smf_AdminIndex({
 							sSelf: \'oAdminCenter\',
 
@@ -150,7 +150,7 @@ function template_admin()
 							sUpdateNotificationLink: smf_scripturl + ', JavaScriptEscape('?action=admin;area=packages;pgdownload;auto;package=%package%;' . $context['session_var'] . '=' . $context['session_id']), '
 
 						});
-					// ]]></script>';
+					</script>';
 }
 
 /**
@@ -253,7 +253,7 @@ function template_credits()
 
 	// This makes all the support information available to the support script...
 	echo '
-						<script><!-- // --><![CDATA[
+						<script>
 							var smfSupportVersions = {};
 
 							smfSupportVersions.forum = "', $context['forum_version'], '";';
@@ -265,13 +265,13 @@ function template_credits()
 
 	// Now we just have to include the script and wait ;).
 	echo '
-						// ]]></script>
+						</script>
 						<script src="', $scripturl, '?action=viewsmfile;filename=current-version.js"></script>
 						<script src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
 
 	// This sets the latest support stuff.
 	echo '
-						<script><!-- // --><![CDATA[
+						<script>
 							function smfCurrentVersion()
 							{
 								var smfVer, yourVer;
@@ -289,7 +289,7 @@ function smfCurrentVersion()
 									setInnerHTML(yourVer, "<span class=\"alert\">" + currentVersion + "</span>");
 							}
 							addLoadEvent(smfCurrentVersion)
-						// ]]></script>';
+						</script>';
 }
 
 /**
@@ -549,7 +549,7 @@ function template_view_versions()
 	   file categories. (sources, languages, and templates.) */
 	echo '
 						<script src="', $scripturl, '?action=viewsmfile;filename=detailed-version.js"></script>
-						<script><!-- // --><![CDATA[
+						<script>
 							var oViewVersions = new smf_ViewVersions({
 								aKnownLanguages: [
 									\'.', implode('\',
@@ -563,7 +563,7 @@ function template_view_versions()
 									Tasks: \'Tasks\'
 								}
 							});
-						// ]]></script>';
+						</script>';
 
 }
 
@@ -603,9 +603,9 @@ function template_edit_censored()
 								<div id="moreCensoredWords"></div><div class="block" style="display: none;" id="moreCensoredWords_link">
 									<a class="button_link" href="#;" onclick="addNewWord(); return false;">', $txt['censor_clickadd'], '</a><br>
 								</div>
-								<script><!-- // --><![CDATA[
+								<script>
 									document.getElementById("moreCensoredWords_link").style.display = "";
-								// ]]></script>
+								</script>
 								<hr width="100%" size="1" class="hrcolor clear">
 								<dl class="settings">
 									<dt>
@@ -687,7 +687,7 @@ function template_not_done()
 							</form>
 						</div>
 					</div>
-					<script><!-- // --><![CDATA[
+					<script>
 						var countdown = ', $context['continue_countdown'], ';
 						doAutoSubmit();
 
@@ -703,7 +703,7 @@ function doAutoSubmit()
 
 							setTimeout("doAutoSubmit();", 1000);
 						}
-					// ]]></script>';
+					</script>';
 }
 
 // Template for showing settings (Of any kind really!)
@@ -720,7 +720,7 @@ function template_show_settings()
 
 	if (!empty($context['settings_pre_javascript']))
 		echo '
-					<script><!-- // --><![CDATA[', $context['settings_pre_javascript'], '// ]]></script>';
+					<script>', $context['settings_pre_javascript'], '</script>';
 
 	if (!empty($context['settings_insert_above']))
 		echo $context['settings_insert_above'];
@@ -987,9 +987,9 @@ function template_show_settings()
 
 	if (!empty($context['settings_post_javascript']))
 		echo '
-					<script><!-- // --><![CDATA[
+					<script>
 					', $context['settings_post_javascript'], '
-					// ]]></script>';
+					</script>';
 
 	if (!empty($context['settings_insert_below']))
 		echo $context['settings_insert_below'];
@@ -1021,12 +1021,12 @@ function template_show_custom_profile()
 	template_show_list('standard_profile_fields');
 
 	echo '
-					<script><!-- // --><![CDATA[
+					<script>
 						var iNumChecks = document.forms.standardProfileFields.length;
 						for (var i = 0; i < iNumChecks; i++)
 							if (document.forms.standardProfileFields[i].id.indexOf(\'reg_\') == 0)
 								document.forms.standardProfileFields[i].disabled = document.forms.standardProfileFields[i].disabled || !document.getElementById(\'active_\' + document.forms.standardProfileFields[i].id.substr(4)).checked;
-					// ]]></script><br>';
+					</script><br>';
 
 	// Custom fields.
 	template_show_list('custom_profile_fields');
@@ -1039,9 +1039,9 @@ function template_edit_profile_field()
 
 	// All the javascript for this page - quite a bit in script.js!
 	echo '
-					<script><!-- // --><![CDATA[
+					<script>
 						var startOptID = ', count($context['field']['options']), ';
-					// ]]></script>';
+					</script>';
 
 	// any errors messages to show?
 	if (isset($_GET['msg']))
@@ -1258,9 +1258,9 @@ function template_edit_profile_field()
 
 	// Get the javascript bits right!
 	echo '
-					<script><!-- // --><![CDATA[
+					<script>
 						updateInputBoxes();
-					// ]]></script>';
+					</script>';
 }
 
 // Results page for an admin search.
@@ -1455,7 +1455,7 @@ function template_repair_boards()
 	if (!empty($context['redirect_to_recount']))
 	{
 		echo '
-					<script><!-- // --><![CDATA[
+					<script>
 						var countdown = 5;
 						doAutoSubmit();
 
@@ -1471,7 +1471,7 @@ function doAutoSubmit()
 
 							setTimeout("doAutoSubmit();", 1000);
 						}
-					// ]]></script>';
+					</script>';
 	}
 }
 
@@ -203,7 +203,7 @@ function template_info_center()
 
 	// Info center collapse object.
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		var oInfoCenterToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: ', empty($options['collapse_header_ic']) ? 'false' : 'true', ',
@@ -235,7 +235,7 @@ function template_info_center()
 				sCookieName: \'upshrinkIC\'
 			}
 		});
-	// ]]></script>';
+	</script>';
 }
 
 function template_ic_block_recent()
@@ -686,7 +686,7 @@ function template_bcd()
 			</tr>
 		</table>
 
-		<script><!-- // --><![CDATA[
+		<script>
 		var icons = new Object();';
 
 		foreach ($context['clockicons'] as $t => $v)
@@ -748,7 +748,7 @@ function in_array(variable, theArray)
 		}
 
 		update();
-		// ]]></script>';
+		</script>';
 }
 
 function template_hms()
@@ -784,7 +784,7 @@ function template_hms()
 	';
 
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 	var icons = new Object();';
 
 	foreach ($context['clockicons'] as $t => $v)
@@ -838,7 +838,7 @@ function in_array(variable, theArray)
 	}
 
 	update();
-	// ]]></script>';
+	</script>';
 }
 
 function template_omfg()
@@ -869,7 +869,7 @@ function template_omfg()
 	';
 
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 	var icons = new Object();';
 
 	foreach ($context['clockicons'] as $t => $v)
@@ -927,7 +927,7 @@ function in_array(variable, theArray)
 	}
 
 	update();
-	// ]]></script>';
+	</script>';
 }
 
 function template_thetime()
@@ -218,7 +218,7 @@ function template_main()
 	template_quickreply();
 
 		echo '
-				<script><!-- // --><![CDATA[';
+				<script>';
 
 	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $context['can_remove_post'])
 		echo '
@@ -316,7 +316,7 @@ function template_main()
 					ignore_toggles([', implode(', ', $context['ignoredMsgs']), '], ', JavaScriptEscape($txt['show_ignore_user_post']), ');';
 
 	echo '
-				// ]]></script>';
+				</script>';
 
 }
 
@@ -870,7 +870,7 @@ function template_quickreply()
 
 		echo '
 						', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message'), '
-						<script><!-- // --><![CDATA[
+						<script>
 							function insertQuoteFast(messageid)
 							{
 								if (window.XMLHttpRequest)
@@ -888,7 +888,7 @@ function onDocReceived(XMLDoc)
 
 								ajax_indicator(false);
 							}
-						// ]]></script>';
+						</script>';
 
 	// Is visual verification enabled?
 	if ($context['require_verification'])
@@ -916,7 +916,7 @@ function onDocReceived(XMLDoc)
 	// draft autosave available and the user has it enabled?
 	if (!empty($context['drafts_autosave']))
 		echo '
-			<script><!-- // --><![CDATA[
+			<script>
 				var oDraftAutoSave = new smf_DraftAutoSave({
 					sSelf: \'oDraftAutoSave\',
 					sLastNote: \'draft_lastautosave\',
@@ -926,14 +926,14 @@ function onDocReceived(XMLDoc)
 					iBoard: ', (empty($context['current_board']) ? 0 : $context['current_board']), ',
 					iFreq: ', (empty($modSettings['masterAutoSaveDraftsDelay']) ? 60000 : $modSettings['masterAutoSaveDraftsDelay'] * 1000), '
 				});
-			// ]]></script>';
+			</script>';
 
 	if ($context['show_spellchecking'])
 		echo '
 			<form action="', $scripturl, '?action=spellcheck" method="post" accept-charset="', $context['character_set'], '" name="spell_form" id="spell_form" target="spellWindow"><input type="hidden" name="spellstring" value=""></form>';
 
 	echo '
-				<script><!-- // --><![CDATA[
+				<script>
 					var oQuickReply = new QuickReply({
 						bDefaultCollapsed: false,
 						iTopicId: ', $context['current_topic'], ',
@@ -950,6 +950,6 @@ function onDocReceived(XMLDoc)
 					var oEditorID = "', $context['post_box_name'] ,'";
 					var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
 					var oJumpAnchor = "quickreply";
-				// ]]></script>';
+				</script>';
 }
 ?>
@@ -207,7 +207,7 @@ function template_show_file()
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $context['file_data']['file'], '</title>
-		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
 	</head>
 	<body>
 		<table class="errorfile_table">';
@@ -21,7 +21,7 @@ function template_control_richedit($editor_id, $smileyContainer = null, $bbcCont
 		<textarea class="editor" name="', $editor_id, '" id="', $editor_id, '" cols="600" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onchange="storeCaret(this);" tabindex="', $context['tabindex']++, '" style="width: ', $editor_context['width'], '; height: ', $editor_context['height'], ';', isset($context['post_error']['no_message']) || isset($context['post_error']['long_message']) ? 'border: 1px solid red;' : '', '"', !empty($context['editor']['required']) ? ' required' : '', '>', $editor_context['value'], '</textarea>
 		<div id="', $editor_id, '_resizer" class="richedit_resize"></div>
 		<input type="hidden" name="', $editor_id, '_mode" id="', $editor_id, '_mode" value="0">
-		<script><!-- // --><![CDATA[
+		<script>
 			$(document).ready(function() {
 				', !empty($context['bbcodes_handlers']) ? $context['bbcodes_handlers'] : '', '
 
@@ -119,7 +119,7 @@ function template_control_richedit($editor_id, $smileyContainer = null, $bbcCont
 					oBBCBox: null
 				});
 				smf_editorArray[smf_editorArray.length] = oEditorHandle_', $editor_id, ';
-			// ]]></script>';
+			</script>';
 }
 
 function template_control_richedit_buttons($editor_id)
@@ -176,7 +176,7 @@ function template_control_richedit_buttons($editor_id)
 			<span id="draft_lastautosave" ></span>
 		</span>
 		<script src="', $settings['default_theme_url'], '/scripts/drafts.js', $modSettings['browser_cache'] ,'"></script>
-		<script><!-- // --><![CDATA[
+		<script>
 			var oDraftAutoSave = new smf_DraftAutoSave({
 				sSelf: \'oDraftAutoSave\',
 				sLastNote: \'draft_lastautosave\',
@@ -187,7 +187,7 @@ function template_control_richedit_buttons($editor_id)
 				iBoard: 0,
 				iFreq: ', (empty($modSettings['drafts_autosave_frequency']) ? 60000 : $modSettings['drafts_autosave_frequency'] * 1000), '
 			});
-		// ]]></script>';
+		</script>';
 
 	// Start an instance of the auto saver if its enabled
 	if (!empty($context['drafts_save']) && !empty($context['drafts_autosave']))
@@ -197,7 +197,7 @@ function template_control_richedit_buttons($editor_id)
 			<span id="draft_lastautosave" ></span>
 		</span>
 		<script src="', $settings['default_theme_url'], '/scripts/drafts.js', $modSettings['browser_cache'] ,'"></script>
-		<script><!-- // --><![CDATA[
+		<script>
 			var oDraftAutoSave = new smf_DraftAutoSave({
 				sSelf: \'oDraftAutoSave\',
 				sLastNote: \'draft_lastautosave\',
@@ -207,7 +207,7 @@ function template_control_richedit_buttons($editor_id)
 				iBoard: ', (empty($context['current_board']) ? 0 : $context['current_board']), ',
 				iFreq: ', $context['drafts_autosave_frequency'], '
 			});
-		// ]]></script>';
+		</script>';
 }
 
 // What's this, verification?!
@@ -159,9 +159,9 @@ function template_show_list($list_id = null)
 
 	if (isset($cur_list['javascript']))
 		echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		', $cur_list['javascript'], '
-	// ]]></script>';
+	</script>';
 }
 
 function template_additional_rows($row_position, $cur_list)
@@ -21,7 +21,7 @@ function template_popup()
 		<meta charset="', $context['character_set'], '">
 		<meta name="robots" content="noindex">
 		<title>', $context['page_title'], '</title>
-		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
 		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
 	</head>
 	<body id="help_popup">
@@ -44,9 +44,9 @@ function template_find_members()
 		<title>', $txt['find_members'], '</title>
 		<meta charset="', $context['character_set'], '">
 		<meta name="robots" content="noindex">
-		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
 		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
-		<script><!-- // --><![CDATA[
+		<script>
 			var membersAdded = [];
 			function addMember(name)
 			{
@@ -66,7 +66,7 @@ function addMember(name)
 
 				window.focus();
 			}
-		// ]]></script>
+		</script>
 	</head>
 	<body id="help_popup">
 		<form action="', $scripturl, '?action=findmember;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '" class="padding description">
@@ -131,9 +131,9 @@ function addMember(name)
 
 	if (empty($context['results']))
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			document.getElementById("search").focus();
-		// ]]></script>';
+		</script>';
 
 	echo '
 	</body>
@@ -21,7 +21,7 @@ function template_popup()
 		<meta charset="', $context['character_set'], '">
 		<meta name="robots" content="noindex">
 		<title>', $context['page_title'], '</title>
-		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
 		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
 	</head>
 	<body id="likes_popup">
@@ -60,7 +60,7 @@ function template_login()
 					<input type="hidden" name="hash_passwrd" value="">
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 					<input type="hidden" name="', $context['login_token_var'], '" value="', $context['login_token'], '">
-					<script type="text/javascript">
+					<script>
 						setTimeout(function() {
 							document.getElementById("', !empty($context['from_ajax']) ? 'ajax_' : '', isset($context['default_username']) && $context['default_username'] != '' ? 'loginpass' : 'loginuser', '").focus();
 						}, 150);';
@@ -137,7 +137,7 @@ function template_login_tfa()
 						<input type="submit" class="button_submit" name="submit" value="', $txt['login'], '">
 					</div>
 				</form>
-				<script type="text/javascript">
+				<script>
 						form = $("#frmTfa");';
 	if (!empty($context['from_ajax']))
 		echo '
@@ -222,9 +222,9 @@ function template_kick_guest()
 
 	// Do the focus thing...
 	echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			document.forms.frmLogin.user.focus();
-		// ]]></script>';
+		</script>';
 }
 
 // This is for maintenance mode.
@@ -304,9 +304,9 @@ function template_admin_login()
 
 	// Focus on the password box.
 	echo '
-<script><!-- // --><![CDATA[
+<script>
 	document.forms.frmLogin.', $context['sessionCheckType'], '_pass.focus();
-// ]]></script>';
+</script>';
 }
 
 // Activate your account manually?
@@ -18,7 +18,7 @@ function template_avatar_settings_above()
 function template_avatar_settings_below()
 {
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 	var fUpdateStatus = function ()
 	{
 		document.getElementById("avatar_max_width_external").disabled = document.getElementById("avatar_download_external").checked;
@@ -27,7 +27,7 @@ function template_avatar_settings_below()
 
 	}
 	addLoadEvent(fUpdateStatus);
-// ]]></script>
+</script>
 ';
 }
 
@@ -157,7 +157,7 @@ function template_maintenance()
 					<div id="show_progress" class="padding"></div>
 					<br class="clear_right">
 				</form>
-				<script><!-- // --><![CDATA[
+				<script>
 					function start_progress() {
 						setTimeout(\'show_msg()\', 1000);
 					}
@@ -172,7 +172,7 @@ function show_progress() {
 						setTimeout(\'show_progress()\', 1500);
 					}
 
-				// ]]></script>
+				</script>
 			</div>
 			<br class="clear">';
 }
@@ -188,7 +188,7 @@ function template_ban_edit()
 
 	echo '
 	</div>
-	<script><!-- // --><![CDATA[
+	<script>
 		var fUpdateStatus = function ()
 		{
 			document.getElementById("expire_date").disabled = !document.getElementById("expires_one_day").checked;
@@ -233,7 +233,7 @@ function confirmBan(aForm)
 				alert(\'', $txt['ban_restriction_empty'], '\');
 				return false;
 			}
-		}// ]]></script>';
+		}</script>';
 }
 
 function template_ban_edit_trigger()
@@ -297,7 +297,7 @@ function template_ban_edit_trigger()
 			<input type="hidden" name="', $context['admin-bet_token_var'], '" value="', $context['admin-bet_token'], '">
 		</form>
 	</div>
-	<script><!-- // --><![CDATA[
+	<script>
 		var oAddMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oAddMemberSuggest\',
 			sSessionId: smf_session_id,
@@ -315,7 +315,7 @@ function onUpdateName(oAutoSuggest)
 			return true;
 		}
 		oAddMemberSuggest.registerCallback(\'onBeforeUpdate\', \'onUpdateName\');
-	// ]]></script>';
+	</script>';
 }
 
 ?>
@@ -432,13 +432,13 @@ function template_modify_board()
 						<div id="moderator_group_container"></div>
 					</dd>
 				</dl>
-				<script><!-- // --><![CDATA[
+				<script>
 					$(document).ready(function () {
 						$(".select_all_box").each(function () {
 							$(this).removeClass(\'select_all_box\');
 						});
 					});
-				// ]]></script>
+				</script>
 				<hr class="hrcolor">';
 
 	if (empty($context['board']['is_recycle']) && empty($context['board']['topics']))
@@ -558,7 +558,7 @@ function template_modify_board()
 		</form>
 	</div>
 
-<script><!-- // --><![CDATA[
+<script>
 	var oModeratorSuggest = new smc_AutoSuggest({
 		sSelf: \'oModeratorSuggest\',
 		sSessionId: smf_session_id,
@@ -608,11 +608,11 @@ function template_modify_board()
 		echo '
 			]
 		});
-// ]]></script>';
+</script>';
 
 	// Javascript for deciding what to show.
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		function refreshOptions()
 		{
 			var redirect = document.getElementById("redirect_enable");
@@ -637,7 +637,7 @@ function refreshOptions()
 	echo '
 		}
 		refreshOptions();
-	// ]]></script>';
+	</script>';
 }
 
 // A template used when a user is deleting a board with child boards in it - to see what they want to do with them.
@@ -188,7 +188,7 @@ function template_download_language()
 
 	// The javascript for expand and collapse of sections.
 	echo '
-	<script><!-- // --><![CDATA[';
+	<script>';
 
 	// Each theme gets its own handler.
 	foreach ($context['files']['images'] as $theme => $group)
@@ -218,7 +218,7 @@ function template_download_language()
 	}
 
 	echo '
-	// ]]></script>';
+	</script>';
 }
 
 /**
@@ -178,7 +178,7 @@ function template_maintain_members()
 	global $context, $settings, $txt, $scripturl;
 
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		var warningMessage = \'\';
 		var membersSwap = false;
 
@@ -228,7 +228,7 @@ function checkAttributeValidity()
 			return valid;
 		}
 		setTimeout("checkAttributeValidity();", 500);
-	// ]]></script>
+	</script>
 	<div id="manage_maintenance">';
 
 	// If maintenance has finished tell the user.
@@ -318,7 +318,7 @@ function checkAttributeValidity()
 		</div>
 	</div>
 
-	<script><!-- // --><![CDATA[
+	<script>
 		var oAttributeMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oAttributeMemberSuggest\',
 			sSessionId: smf_session_id,
@@ -329,7 +329,7 @@ function checkAttributeValidity()
 			sTextDeleteItem: \'', $txt['autosuggest_delete_item'], '\',
 			bItemList: false
 		});
-	// ]]></script>';
+	</script>';
 }
 
 // Template for the topic maintenance tasks.
@@ -346,7 +346,7 @@ function template_maintain_topics()
 
 	// Bit of javascript for showing which boards to prune in an otherwise hidden list.
 	echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			var rotSwap = false;
 			function swapRot()
 			{
@@ -368,7 +368,7 @@ function swapRot()
 						oBoardCheckBoxes[i].checked = !rotSwap;
 				}
 			}
-		// ]]></script>';
+		</script>';
 
 	echo '
 	<div id="manage_maintenance">
@@ -127,7 +127,7 @@ function template_new_group()
 	if ($context['undefined_group'])
 	{
 		echo '
-			<script><!-- // --><![CDATA[
+			<script>
 				function swapPostGroup(isChecked)
 				{
 					var min_posts_text = document.getElementById(\'min_posts_text\');
@@ -135,7 +135,7 @@ function swapPostGroup(isChecked)
 					min_posts_text.style.color = isChecked ? "" : "#888888";
 				}
 				swapPostGroup(', $context['post_group'] ? 'true' : 'false', ');
-			// ]]></script>';
+			</script>';
 	}
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -340,7 +340,7 @@ function template_edit_group()
 			<input type="hidden" name="', $context['admin-mmg_token_var'], '" value="', $context['admin-mmg_token'], '">
 		</form>
 	</div>
-		<script><!-- // --><![CDATA[
+		<script>
 			var oModeratorSuggest = new smc_AutoSuggest({
 				sSelf: \'oModeratorSuggest\',
 				sSessionId: smf_session_id,
@@ -365,11 +365,11 @@ function template_edit_group()
 			echo '
 				]
 			});
-		// ]]></script>';
+		</script>';
 
 	if ($context['group']['allow_post_group'])
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			function swapPostGroup(isChecked)
 			{
 				var is_moderator_group = ', $context['is_moderator_group'], ';
@@ -415,7 +415,7 @@ function swapPostGroup(isChecked)
 			}
 
 			swapPostGroup(', $context['group']['is_post_group'] ? 'true' : 'false', ');
-		// ]]></script>';
+		</script>';
 }
 
 function template_add_edit_group_boards_list($collapse = true)
@@ -490,21 +490,21 @@ function template_add_edit_group_boards_list($collapse = true)
 									<input type="radio" name="select_all" id="deny_all" class="input_radio" onclick="selectAllRadio(this, this.form, \'boardaccess\', \'deny\');"> <label for="deny_all">', $txt['board_perms_deny'], '</label>
 								</span>
 							</fieldset>
-							<script><!-- // --><![CDATA[
+							<script>
 								$(document).ready(function () {
 									$(".select_all_box").each(function () {
 										$(this).removeClass(\'select_all_box\');
 									});
 								});
-							// ]]></script>';
+							</script>';
 
 	if ($collapse)
 		echo '
 							<a href="javascript:void(0);" onclick="document.getElementById(\'visible_boards\').style.display = \'block\'; document.getElementById(\'visible_boards_link\').style.display = \'none\'; return false;" id="visible_boards_link" style="display: none;">[ ', $txt['membergroups_select_visible_boards'], ' ]</a>
-							<script><!-- // --><![CDATA[
+							<script>
 								document.getElementById("visible_boards_link").style.display = "";
 								document.getElementById("visible_boards").style.display = "none";
-							// ]]></script>';
+							</script>';
 }
 
 // Templating for viewing the members of a group.
@@ -664,7 +664,7 @@ function template_group_members()
 
 	if (!empty($context['group']['assignable']))
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			var oAddMemberSuggest = new smc_AutoSuggest({
 				sSelf: \'oAddMemberSuggest\',
 				sSessionId: \'', $context['session_id'], '\',
@@ -678,7 +678,7 @@ function template_group_members()
 				bItemList: true,
 				sItemListContainerId: \'toAddItemContainer\'
 			});
-		// ]]></script>';
+		</script>';
 }
 
 // Allow the moderator to enter a reason to each user being rejected.
@@ -231,7 +231,7 @@ function template_admin_browse()
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['admin_browse_outstanding'], '</h3>
 			</div>
-			<script><!-- // --><![CDATA[
+			<script>
 				function onOutstandingSubmit()
 				{
 					if (document.forms.postFormOutstanding.todo.value == "")
@@ -252,7 +252,7 @@ function onOutstandingSubmit()
 					else
 						return false;
 				}
-			// ]]></script>
+			</script>
 
 			<div class="windowbg">
 				<dl class="settings">
@@ -121,7 +121,7 @@ function template_email_members()
 
 	// This is some javascript for the simple/advanced toggling and member suggest
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		var oAdvancedPanelToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: true,
@@ -143,8 +143,8 @@ function template_email_members()
 				}
 			]
 		});
-	// ]]></script>
-	<script><!-- // --><![CDATA[
+	</script>
+	<script>
 		var oMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oMemberSuggest\',
 			sSessionId: smf_session_id,
@@ -173,7 +173,7 @@ function template_email_members()
 			sItemListContainerId: \'exclude_members_container\',
 			aListItems: []
 		});
-	// ]]></script>';
+	</script>';
 }
 
 function template_email_members_compose()
@@ -255,7 +255,7 @@ function template_email_members_compose()
 			<input type="hidden" name="', $key, '" value="', implode(($key == 'emails' ? ';' : ','), $values), '">';
 
 	echo '
-		<script><!-- // --><![CDATA[';
+		<script>';
 	// The functions used to preview a posts without loading a new page.
 	echo '
 			var txt_preview_title = "', $txt['preview_title'], '";
@@ -360,10 +360,10 @@ function onDocSent(XMLDoc)
 			}';
 
 	echo '
-		// ]]></script>';
+		</script>';
 
 	echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			function checkboxes_status (item)
 			{
 				if (item.id == \'send_html\')
@@ -377,7 +377,7 @@ function checkboxes_status (item)
 					document.getElementById(\'send_html\').disabled = !document.getElementById(\'send_html\').disabled;
 				}
 			}
-		// ]]></script>
+		</script>
 		</form>
 	</div>';
 }
@@ -421,7 +421,7 @@ function template_email_members_send()
 		</form>
 	</div>
 
-	<script><!-- // --><![CDATA[
+	<script>
 		var countdown = 2;
 		doAutoSubmit();
 
@@ -437,7 +437,7 @@ function doAutoSubmit()
 
 			setTimeout("doAutoSubmit();", 1000);
 		}
-	// ]]></script>';
+	</script>';
 }
 
 function template_news_lists()
@@ -221,9 +221,9 @@ function template_modify_user_subscription()
 
 	// Some quickly stolen javascript from Post, could do with being more efficient :)
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-		// ]]></script>';
+		</script>';
 
 	echo '
 	<div id="admincenter">
@@ -332,7 +332,7 @@ function template_modify_user_subscription()
 			</div>
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 		</form>
-		<script><!-- // --><![CDATA[
+		<script>
 		var oAddMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oAddMemberSuggest\',
 			sSessionId: smf_session_id,
@@ -343,7 +343,7 @@ function template_modify_user_subscription()
 			sTextDeleteItem: \'', $txt['autosuggest_delete_item'], '\',
 			bItemList: false
 			});
-		// ]]></script>';
+		</script>';
 
 	if (!empty($context['pending_payments']))
 	{
@@ -558,9 +558,9 @@ function template_choose_payment()
 
 		if (!empty($gateway['javascript']))
 			echo '
-					<script><!-- // --><![CDATA[
+					<script>
 						', $gateway['javascript'], '
-					// ]]></script>';
+					</script>';
 
 		foreach ($gateway['hidden'] as $name => $value)
 			echo '
@@ -191,7 +191,7 @@ function template_permission_index()
 
 		// Javascript for the advanced stuff.
 		echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		var oPermissionsPanelToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: ', empty($context['show_advanced_options']) ? 'true' : 'false', ',
@@ -241,7 +241,7 @@ function checkSubmit()
 
 			return true;
 		}
-	// ]]></script>';
+	</script>';
 
 		if (!empty($context['profile']))
 			echo '
@@ -456,7 +456,7 @@ function template_modify_group()
 	else
 	{
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			window.smf_usedDeny = false;
 
 			function warnAboutDeny()
@@ -466,7 +466,7 @@ function warnAboutDeny()
 				else
 					return true;
 			}
-		// ]]></script>';
+		</script>';
 	}
 
 	echo '
@@ -726,10 +726,10 @@ function template_inline_permissions()
 
 											<a href="javascript:void(0);" onclick="document.getElementById(\'', $context['current_permission'], '\').style.display = \'block\'; document.getElementById(\'', $context['current_permission'], '_groups_link\').style.display = \'none\'; return false;" id="', $context['current_permission'], '_groups_link" style="display: none;" class="toggle_down"> ', $txt['avatar_select_permission'], '</a>
 
-											<script><!-- // --><![CDATA[
+											<script>
 												document.getElementById("', $context['current_permission'], '").style.display = "none";
 												document.getElementById("', $context['current_permission'], '_groups_link").style.display = "";
-											// ]]></script>';
+											</script>';
 }
 
 // Edit post moderation permissions.
@@ -269,7 +269,7 @@ function template_create_index_progress()
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 		</form>
 	</div>
-	<script><!-- // --><![CDATA[
+	<script>
 		var countdown = 10;
 		doAutoSubmit();
 
@@ -285,7 +285,7 @@ function doAutoSubmit()
 
 			setTimeout("doAutoSubmit();", 1000);
 		}
-	// ]]></script>';
+	</script>';
 
 }
 
@@ -323,7 +323,7 @@ function template_main()
 
 	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
 		echo '
-			<script><!-- // --><![CDATA[
+			<script>
 				if (typeof(window.XMLHttpRequest) != "undefined")
 					aJumpTo[aJumpTo.length] = new JumpTo({
 						sContainerId: "quick_mod_jump_to",
@@ -340,16 +340,16 @@ function template_main()
 						bDisabled: true,
 						sCustomName: "move_to"
 					});
-			// ]]></script>';
+			</script>';
 
 	// Javascript for inline editing.
 	echo '
-<script><!-- // --><![CDATA[
+<script>
 	var oQuickModifyTopic = new QuickModifyTopic({
 		aHidePrefixes: Array("lockicon", "stickyicon", "pages", "newicon"),
 		bMouseOnDiv: false,
 	});
-// ]]></script>';
+</script>';
 
 	template_topic_legend();
 }
@@ -377,7 +377,7 @@ function template_topic_legend()
 
 	if (!empty($context['jump_to']))
 		echo '
-			<script><!-- // --><![CDATA[
+			<script>
 				if (typeof(window.XMLHttpRequest) != "undefined")
 					aJumpTo[aJumpTo.length] = new JumpTo({
 						sContainerId: "message_index_jump_to",
@@ -391,7 +391,7 @@ function template_topic_legend()
 						sCatPrefix: "",
 						sGoButtonLabel: "', $txt['quick_mod_go'], '"
 					});
-			// ]]></script>';
+			</script>';
 
 	echo '
 			<br class="clear">
@@ -68,7 +68,7 @@ function template_group_requests_block()
 			</div>
 		</div>
 
-	<script><!-- // --><![CDATA[
+	<script>
 		var oGroupRequestsPanelToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: ', !empty($context['admin_prefs']['mcgr']) ? 'true' : 'false', ',
@@ -98,7 +98,7 @@ function template_group_requests_block()
 				sAdditionalVars: \';admin_key=mcgr\'
 			}
 		});
-	// ]]></script>';
+	</script>';
 }
 
 function template_watched_users()
@@ -134,7 +134,7 @@ function template_watched_users()
 			</div>
 		</div>
 
-	<script><!-- // --><![CDATA[
+	<script>
 		var oWatchedUsersToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: ', !empty($context['admin_prefs']['mcwu']) ? 'true' : 'false', ',
@@ -164,7 +164,7 @@ function template_watched_users()
 				sAdditionalVars: \';admin_key=mcwu\'
 			}
 		});
-	// ]]></script>';
+	</script>';
 }
 
 function template_reported_posts_block()
@@ -200,7 +200,7 @@ function template_reported_posts_block()
 			</div>
 		</div>
 
-	<script><!-- // --><![CDATA[
+	<script>
 		var oWatchedUsersToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: ', !empty($context['admin_prefs']['mcrp']) ? 'true' : 'false', ',
@@ -230,7 +230,7 @@ function template_reported_posts_block()
 				sAdditionalVars: \';admin_key=mcrp\'
 			}
 		});
-	// ]]></script>';
+	</script>';
 }
 
 function template_reported_users_block()
@@ -266,7 +266,7 @@ function template_reported_users_block()
 			</div>
 		</div>
 
-	<script><!-- // --><![CDATA[
+	<script>
 		var oWatchedUsersToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: ', !empty($context['admin_prefs']['mcur']) ? 'true' : 'false', ',
@@ -296,7 +296,7 @@ function template_reported_users_block()
 				sAdditionalVars: \';admin_key=mcur\'
 			}
 		});
-	// ]]></script>';
+	</script>';
 }
 
 // Little section for making... notes.
@@ -519,7 +519,7 @@ function template_show_notice()
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $context['page_title'], '</title>
-		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
 	</head>
 	<body>
 		<div class="cat_bar">
@@ -614,7 +614,7 @@ function template_warn_template()
 		</form>
 	</div>
 
-	<script><!-- // --><![CDATA[
+	<script>
 		$(document).ready(function() {
 			$("#preview_button").click(function() {
 				return ajax_getTemplatePreview();
@@ -651,7 +651,7 @@ function ajax_getTemplatePreview ()
 			});
 			return false;
 		}
-	// ]]></script>';
+	</script>';
 }
 
 ?>
@@ -319,7 +319,7 @@ function template_view_package()
 
 	// Toggle options.
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		var aOperationElements = new Array();';
 
 		// Operations.
@@ -349,11 +349,11 @@ function template_view_package()
 		}
 
 	echo '
-	// ]]></script>';
+	</script>';
 
 	// Get the currently selected item from a select list
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 	function get_selected(id)
 	{
 		var aSelected = document.getElementById(id);
@@ -364,16 +364,16 @@ function get_selected(id)
 		}
 		return aSelected.options[0];
 	}
-	// ]]></script>';
+	</script>';
 
 	// And a bit more for database changes.
 	if (!empty($context['database_changes']))
 		echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		var database_changes_area = document.getElementById(\'db_changes_div\');
 		var db_vis = false;
 		database_changes_area.style.display = "none";
-	// ]]></script>';
+	</script>';
 }
 
 function template_extract_package()
@@ -383,14 +383,14 @@ function template_extract_package()
 	if (!empty($context['redirect_url']))
 	{
 		echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		setTimeout("doRedirect();", ', empty($context['redirect_timeout']) ? '5000' : $context['redirect_timeout'], ');
 
 		function doRedirect()
 		{
 			window.location = "', $context['redirect_url'], '";
 		}
-	// ]]></script>';
+	</script>';
 	}
 
 	echo '
@@ -516,7 +516,7 @@ function template_browse()
 				', $txt['packages_adding'], '
 			</div>
 
-			<script><!-- // --><![CDATA[
+			<script>
 				window.smfForum_scripturl = smf_scripturl;
 				window.smfForum_sessionid = smf_session_id;
 				window.smfForum_sessionvar = smf_session_var;';
@@ -525,7 +525,7 @@ function template_browse()
 	echo '
 				window.smfInstalledPackages = ["', implode('", "', $context['installed_mods']), '"];
 				window.smfVersion = "', $context['forum_version'], '";
-			// ]]></script>
+			</script>
 			<div id="yourVersion" style="display:none">', $context['forum_version'], '</div>';
 
 	if (empty($modSettings['disable_smf_js']))
@@ -534,7 +534,7 @@ function template_browse()
 
 	// This sets the announcements and current versions themselves ;).
 	echo '
-			<script><!-- // --><![CDATA[
+			<script>
 				var oAdminIndex = new smf_AdminIndex({
 					sSelf: \'oAdminCenter\',
 					bLoadAnnouncements: false,
@@ -554,7 +554,7 @@ function template_browse()
 					sUpdateNotificationLink: smf_scripturl + ', JavaScriptEscape('?action=admin;area=packages;pgdownload;auto;package=%package%;' . $context['session_var'] . '=' . $context['session_id']), '
 
 				});
-			// ]]></script>';
+			</script>';
 
 	echo '
 		</div>';
@@ -623,7 +623,7 @@ function template_browse()
 
 	echo '
 	</div>
-	<script><!-- // --><![CDATA[
+	<script>
 		var oAdvancedPanelToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: true,
@@ -653,7 +653,7 @@ function revert()
 			}).attr("selected", "selected");
 			return false;
 		}
-	// ]]></script>';
+	</script>';
 }
 
 function template_servers()
@@ -939,7 +939,7 @@ function template_package_list()
 		{
 			$section_count = count($context['package_list']);
 			echo '
-			<script><!-- // --><![CDATA[';
+			<script>';
 			foreach ($context['package_list'] as $section => $ps)
 			{
 				echo '
@@ -979,7 +979,7 @@ function template_package_list()
 				}
 			}
 			echo '
-			// ]]></script>';
+			</script>';
 		}
 }
 
@@ -1146,13 +1146,13 @@ function template_control_chmod()
 	// Hide the details of the list.
 	if (empty($context['package_ftp']['form_elements_only']))
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			document.getElementById(\'need_writable_list\').style.display = \'none\';
-		// ]]></script>';
+		</script>';
 
 	// Quick generate the test button.
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		// Generate a "test ftp" button.
 		var generatedButton = false;
 		function generateFTPTest()
@@ -1204,13 +1204,13 @@ function testFTPResults(oXMLDoc)
 			setInnerHTML(document.getElementById("ftp_error_message"), message);
 		}
 		generateFTPTest();
-	// ]]></script>';
+	</script>';
 
 	// Make sure the button gets generated last.
 	$context['insert_after_template'] .= '
-	<script><!-- // --><![CDATA[
+	<script>
 		generateFTPTest();
-	// ]]></script>';
+	</script>';
 }
 
 function template_ftp_required()
@@ -1237,8 +1237,8 @@ function template_view_operations()
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['operation_title'], '</title>
-		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
-		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/admin.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/admin.css', $modSettings['browser_cache'] ,'">
 		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
 		<script src="', $settings['default_theme_url'], '/scripts/theme.js', $modSettings['browser_cache'] ,'"></script>
 	</head>
@@ -1261,7 +1261,7 @@ function template_file_permissions()
 
 	// This will handle expanding the selection.
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		var oRadioValues = {
 			0: "read",
 			1: "writable",
@@ -1455,7 +1455,7 @@ function onNewFolderReceived(oXMLDoc)
 
 			curCol.appendChild(curInput);
 		}
-	// ]]></script>';
+	</script>';
 
 		echo '
 	<div class="noticebox">
@@ -1648,9 +1648,9 @@ function template_permission_show_contents($ident, $contents, $level, $has_more
 
 		if ($level > 1 && !$isFound)
 			echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			expandFolder(\'', $js_ident, '\', \'\');
-		// ]]></script>';
+		</script>';
 	}
 }
 
@@ -1744,7 +1744,7 @@ function template_action_permissions()
 
 	// Just the countdown stuff
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		var countdown = ', $countDown, ';
 		doAutoSubmit();
 
@@ -1760,7 +1760,7 @@ function doAutoSubmit()
 
 			setTimeout("doAutoSubmit();", 1000);
 		}
-	// ]]></script>';
+	</script>';
 
 }
 
@@ -97,7 +97,7 @@ function template_folder()
 
 	// The every helpful javascript!
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		var allLabels = {};
 		var currentLabels = {};
 		function loadLabelChoices()
@@ -172,7 +172,7 @@ function loadLabelChoices()
 				}
 			}
 		}
-	// ]]></script>';
+	</script>';
 
 	echo '
 <form class="flow_hidden" action="', $scripturl, '?action=pm;sa=pmactions;', $context['display_mode'] == 2 ? 'conversation;' : '', 'f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', '" method="post" accept-charset="', $context['character_set'], '" name="pmFolder">';
@@ -625,7 +625,7 @@ function template_subject_list()
 		echo '
 		<tr class="windowbg">
 			<td width="4%">
-			<script><!-- // --><![CDATA[
+			<script>
 				currentLabels[', $message['id'], '] = {';
 
 		if (!empty($message['labels']))
@@ -641,7 +641,7 @@ function template_subject_list()
 
 		echo '
 				};
-			// ]]></script>
+			</script>
 				', $message['is_replied_to'] ? '<span class="generic_icons replied" title="' . $txt['pm_replied'] . '"></span>' : '<span class="generic_icons im_off" title="' . $txt['pm_read'] . '"></span>', '</td>
 			<td>', $message['time'], '</td>
 			<td>', ($context['display_mode'] != 0 && $context['current_pm'] == $message['id'] ? '<img src="' . $settings['images_url'] . '/selected.png" alt="*">' : ''), '<a href="', ($context['display_mode'] == 0 || $context['current_pm'] == $message['id'] ? '' : ($scripturl . '?action=pm;pmid=' . $message['id'] . ';kstart;f=' . $context['folder'] . ';start=' . $context['start'] . ';sort=' . $context['sort_by'] . ($context['sort_direction'] == 'up' ? ';' : ';desc') . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : ''))), '#msg', $message['id'], '">', $message['subject'], $message['is_unread'] ? '&nbsp;<span class="new_posts">' . $txt['new'] . '</span>' : '', '</a></td>
@@ -727,10 +727,10 @@ function template_search()
 				<span class="enhanced">
 					<strong>', $txt['pm_search_text'], ':</strong>
 					<input type="search" name="search"', !empty($context['search_params']['search']) ? ' value="' . $context['search_params']['search'] . '"' : '', ' size="40" class="input_text">
-					<script><!-- // --><![CDATA[
+					<script>
 						createEventListener(window);
 						window.addEventListener("load", initSearch, false);
-					// ]]></script>
+					</script>
 					<select name="searchtype">
 						<option value="1"', empty($context['search_params']['searchtype']) ? ' selected' : '', '>', $txt['pm_search_match_all'], '</option>
 						<option value="2"', !empty($context['search_params']['searchtype']) ? ' selected' : '', '>', $txt['pm_search_match_any'], '</option>
@@ -797,7 +797,7 @@ function template_search()
 
 		// Some javascript for the advanced toggling
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			var oAdvancedPanelToggle = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: true,
@@ -819,7 +819,7 @@ function template_search()
 					}
 				]
 			});
-		// ]]></script>';
+		</script>';
 	}
 
 	echo '
@@ -1120,7 +1120,7 @@ function template_send()
 	}
 
 	echo '
-		<script><!-- // --><![CDATA[';
+		<script>';
 	// The functions used to preview a personal message without loading a new page.
 	echo '
 			var txt_preview_title = "', $txt['preview_title'], '";
@@ -1252,7 +1252,7 @@ function onDocSent(XMLDoc)
 			});';
 
 	echo '
-		// ]]></script>';
+		</script>';
 
 	// Show the message you're replying to.
 	if ($context['reply'])
@@ -1272,7 +1272,7 @@ function onDocSent(XMLDoc)
 	</div><br class="clear">';
 
 	echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			var oPersonalMessageSend = new smf_PersonalMessageSend({
 				sSelf: \'oPersonalMessageSend\',
 				sSessionId: smf_session_id,
@@ -1312,7 +1312,7 @@ function onDocSent(XMLDoc)
 		';
 
 	echo '
-		// ]]></script>';
+		</script>';
 }
 
 // This template asks the user whether they wish to empty out their folder/messages.
@@ -1586,7 +1586,7 @@ function template_add_rule()
 	global $context, $txt, $scripturl;
 
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 			var criteriaNum = 0;
 			var actionNum = 0;
 			var groups = new Array()
@@ -1721,7 +1721,7 @@ function rebuildRuleDesc()
 				// Set the actual HTML!
 				setInnerHTML(document.getElementById("ruletext"), text);
 			}
-	// ]]></script>';
+	</script>';
 
 	echo '
 	<form action="', $scripturl, '?action=pm;sa=manrules;save;rid=', $context['rid'], '" method="post" accept-charset="', $context['character_set'], '" name="addrule" id="addrule" class="flow_hidden">
@@ -1853,7 +1853,7 @@ function rebuildRuleDesc()
 
 	// Now setup all the bits!
 		echo '
-	<script><!-- // --><![CDATA[';
+	<script>';
 
 	foreach ($context['rule']['criteria'] as $k => $c)
 		echo '
@@ -1877,7 +1877,7 @@ function rebuildRuleDesc()
 			document.getElementById("addonjs2").style.display = "";';
 
 	echo '
-		// ]]></script>';
+		</script>';
 }
 
 // Template for showing all the PM drafts of the user.
@@ -16,7 +16,7 @@ function template_main()
 
 	// Some javascript for adding more options.
 	echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			var pollOptionNum = 0;
 			var pollOptionId = ', $context['last_choice_id'], ';
 
@@ -33,7 +33,7 @@ function addPollOption()
 
 				setOuterHTML(document.getElementById("pollMoreOptions"), \'<li><label for="options-\' + pollOptionId + \'" ', (isset($context['poll_error']['no_question']) ? ' class="error"' : ''), '>', $txt['option'], ' \' + pollOptionNum + \'</label>: <input type="text" name="options[\' + (pollOptionId) + \']" id="options-\' + (pollOptionId) + \'" value="" size="80" maxlength="255" class="input_text"></li><li id="pollMoreOptions"></li\');
 			}
-		// ]]></script>';
+		</script>';
 
 	// Start the main poll form.
 	echo '
@@ -17,7 +17,7 @@ function template_main()
 
 	// Start the javascript... and boy is there a lot.
 	echo '
-		<script><!-- // --><![CDATA[';
+		<script>';
 
 	// When using Go Back due to fatal_error, allow the form to be re-submitted with changes.
 	if (isBrowser('is_firefox'))
@@ -62,7 +62,7 @@ function addPollOption()
 
 	// End of the javascript, start the form and display the link tree.
 	echo '
-		// ]]></script>
+		</script>
 		<form action="', $scripturl, '?action=', $context['destination'], ';', empty($context['current_board']) ? '' : 'board=' . $context['current_board'], '" method="post" accept-charset="', $context['character_set'], '" name="postmodify" id="postmodify" class="flow_hidden" onsubmit="', ($context['becomes_approved'] ? '' : 'alert(\'' . $txt['js_post_will_require_approval'] . '\');'), 'submitonce(this);smc_saveEntities(\'postmodify\', [\'subject\', \'', $context['post_box_name'], '\', \'guestname\', \'evtitle\', \'question\'], \'options\');" enctype="multipart/form-data">';
 
 	// If the user wants to see how their message looks - the preview section is where it's at!
@@ -445,7 +445,7 @@ function addPollOption()
 			// Show more boxes if they aren't approaching that limit.
 			if ($context['num_allowed_attachments'] > 1)
 				echo '
-								<script><!-- // --><![CDATA[
+								<script>
 									var allowed_attachments = ', $context['num_allowed_attachments'], ';
 									var current_attachment = 1;
 
@@ -460,7 +460,7 @@ function addAttachment()
 
 										return true;
 									}
-								// ]]></script>
+								</script>
 							</dd>
 							<dd class="smalltext" id="moreAttachments"><a href="#" onclick="addAttachment(); return false;">(', $txt['more_attachments'], ')</a></dd>';
 			else
@@ -562,7 +562,7 @@ function addAttachment()
 		</form>';
 
 	echo '
-		<script><!-- // --><![CDATA[';
+		<script>';
 
 	// The functions used to preview a posts without loading a new page.
 	echo '
@@ -806,7 +806,7 @@ function onDocSent(XMLDoc)
 	echo '
 			var oEditorID = "', $context['post_box_name'] ,'";
 			var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
-		// ]]></script>';
+		</script>';
 
 	// If the user is replying to a topic show the previous posts.
 	if (isset($context['previous_posts']) && count($context['previous_posts']) > 0)
@@ -861,7 +861,7 @@ function onDocSent(XMLDoc)
 
 		echo '
 		</div>
-		<script><!-- // --><![CDATA[
+		<script>
 			var aIgnoreToggles = new Array();';
 
 		foreach ($ignored_posts as $post_id)
@@ -906,7 +906,7 @@ function onReceiveOpener(text)
 			{
 				$("#', $context['post_box_name'], '").data("sceditor").InsertText(text);
 			}
-		// ]]></script>';
+		</script>';
 	}
 }
 
@@ -921,8 +921,8 @@ function template_spellcheck()
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['spell_check'], '</title>
-		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
-		<style type="text/css">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<style>
 			body, td
 			{
 				font-size: small;
@@ -950,15 +950,15 @@ function template_spellcheck()
 	// As you may expect - we need a lot of javascript for this... load it form the separate files.
 	echo '
 		</style>
-		<script><!-- // --><![CDATA[
+		<script>
 			var spell_formname = window.opener.spell_formname;
 			var spell_fieldname = window.opener.spell_fieldname;
-		// ]]></script>
+		</script>
 		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script>
 		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
-		<script><!-- // --><![CDATA[
+		<script>
 			', $context['spell_js'], '
-		// ]]></script>
+		</script>
 	</head>
 	<body onload="nextWord(false);">
 		<form action="#" method="post" accept-charset="', $context['character_set'], '" name="spellingForm" id="spellingForm" onsubmit="return false;" style="margin: 0;">
@@ -999,7 +999,7 @@ function template_quotefast()
 	<body>
 		', $txt['retrieving_quote'], '
 		<div id="temporary_posting_area" style="display: none;"></div>
-		<script><!-- // --><![CDATA[';
+		<script>';
 
 	if ($context['close_window'])
 		echo '
@@ -1031,7 +1031,7 @@ function template_quotefast()
 			setTimeout("window.close();", 400);';
 	}
 	echo '
-		// ]]></script>
+		</script>
 	</body>
 </html>';
 }
@@ -1109,7 +1109,7 @@ function template_announcement_send()
 		</form>
 	</div>
 	<br>
-		<script><!-- // --><![CDATA[
+		<script>
 			var countdown = 2;
 			doAutoSubmit();
 
@@ -1125,7 +1125,7 @@ function doAutoSubmit()
 
 				setTimeout("doAutoSubmit();", 1000);
 			}
-		// ]]></script>';
+		</script>';
 }
 
 ?>
@@ -24,7 +24,7 @@ function template_print_above()
 		<meta name="robots" content="noindex">
 		<link rel="canonical" href="', $context['canonical_url'], '">
 		<title>', $txt['print_page'], ' - ', $context['topic_subject'], '</title>
-		<style type="text/css">
+		<style>
 			body, a {
 				color: #000;
 				background: #fff;
@@ -18,9 +18,9 @@ function template_profile_above()
 	// Prevent Chrome from auto completing fields when viewing/editing other members profiles
 	if (isBrowser('is_chrome') && !$context['user']['is_owner'])
 		echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		disableAutoComplete();
-	// ]]></script>';
+	</script>';
 
 	// If an error occurred while trying to save previously, give the user a clue!
 	echo '
@@ -113,7 +113,7 @@ function template_alerts_popup()
 
 	echo '
 		</div>
-		<script><!-- // --><![CDATA[
+		<script>
 		function markAlertsRead(obj) {
 			ajax_indicator(true);
 			$.get(
@@ -126,7 +126,7 @@ function(data) {
 			);
 			return false;
 		}
-		// ]]></script>';
+		</script>';
 }
 
 function template_alerts_all_read()
@@ -752,7 +752,7 @@ function template_editBuddies()
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 	</form>
-	<script><!-- // --><![CDATA[
+	<script>
 		var oAddBuddySuggest = new smc_AutoSuggest({
 			sSelf: \'oAddBuddySuggest\',
 			sSessionId: smf_session_id,
@@ -763,7 +763,7 @@ function template_editBuddies()
 			sTextDeleteItem: \'', $txt['autosuggest_delete_item'], '\',
 			bItemList: false
 		});
-	// ]]></script>';
+	</script>';
 }
 
 // Template for showing the ignore list of the current user.
@@ -848,7 +848,7 @@ function template_editIgnoreList()
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 		<input type="submit" value="', $txt['ignore_add_button'], '" class="button_submit">
 	</form>
-	<script><!-- // --><![CDATA[
+	<script>
 		var oAddIgnoreSuggest = new smc_AutoSuggest({
 			sSelf: \'oAddIgnoreSuggest\',
 			sSessionId: \'', $context['session_id'], '\',
@@ -859,7 +859,7 @@ function template_editIgnoreList()
 			sTextDeleteItem: \'', $txt['autosuggest_delete_item'], '\',
 			bItemList: false
 		});
-	// ]]></script>';
+	</script>';
 }
 
 // This template shows an admin information on a users IP addresses used and errors attributed to them.
@@ -2033,7 +2033,7 @@ function template_groupMembership()
 
 		// Javascript for the selector stuff.
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 		var prevClass = "";
 		var prevDiv = "";
 		function highlightSelected(box)
@@ -2051,7 +2051,7 @@ function highlightSelected(box)
 			echo '
 		highlightSelected("primdiv_' . $context['primary_group'] . '");';
 		echo '
-	// ]]></script>';
+	</script>';
 	}
 
 	echo '
@@ -2220,7 +2220,7 @@ function template_issueWarning()
 	template_load_warning_variables();
 
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		// Disable notification boxes as required.
 		function modifyWarnNotify()
 		{
@@ -2262,7 +2262,7 @@ function updateSlider(slideAmount)
 	echo '
 			setInnerHTML(document.getElementById(\'cur_level_div\'), slideAmount + \'% (\' + effectText + \')\');
 		}
-	// ]]></script>';
+	</script>';
 
 	echo '
 	<form action="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=issuewarning" method="post" class="flow_hidden" accept-charset="', $context['character_set'], '">
@@ -2379,7 +2379,7 @@ function updateSlider(slideAmount)
 	template_show_list('view_warnings');
 
 	echo '
-	<script><!-- // --><![CDATA[';
+	<script>';
 
 	if (!$context['user']['is_owner'])
 		echo '
@@ -2423,7 +2423,7 @@ function ajax_getTemplatePreview ()
 		}';
 
 	echo '
-	// ]]></script>';
+	</script>';
 }
 
 // Template to show for deleting a users account - now with added delete post capability!
@@ -2615,10 +2615,10 @@ function template_profile_group_manage()
 		echo '
 								</span>
 								<a href="javascript:void(0);" onclick="document.getElementById(\'additional_groupsList\').style.display = \'block\'; document.getElementById(\'additional_groupsLink\').style.display = \'none\'; return false;" id="additional_groupsLink" style="display: none;" class="toggle_down">', $txt['additional_membergroups_show'], '</a>
-								<script><!-- // --><![CDATA[
+								<script>
 									document.getElementById("additional_groupsList").style.display = "none";
 									document.getElementById("additional_groupsLink").style.display = "";
-								// ]]></script>
+								</script>
 							</dd>';
 
 }
@@ -2691,7 +2691,7 @@ function template_profile_signature_modify()
 
 	// Some javascript used to count how many characters have been used so far in the signature.
 	echo '
-								<script><!-- // --><![CDATA[
+								<script>
 									var maxLength = ', $context['signature_limits']['max_length'], ';
 
 									$(document).ready(function() {
@@ -2700,7 +2700,7 @@ function template_profile_signature_modify()
 											return ajax_getSignaturePreview(true);
 										});
 									});
-								// ]]></script>
+								</script>
 							</dd>';
 }
 
@@ -2738,7 +2738,7 @@ function template_profile_avatar_select()
 										<select name="file" id="file" size="10" style="display: none;" onchange="showAvatar()" onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'server_stored\');" disabled><option></option></select>
 									</div>
 									<div><img name="avatar" id="avatar" src="', !empty($context['member']['avatar']['allow_external']) && $context['member']['avatar']['choice'] == 'external' ? $context['member']['avatar']['external'] : $modSettings['avatar_url'] . '/blank.png', '" alt="Do Nothing"></div>
-									<script><!-- // --><![CDATA[
+									<script>
 										var files = ["' . implode('", "', $context['avatar_list']) . '"];
 										var avatar = document.getElementById("avatar");
 										var cat = document.getElementById("cat");
@@ -2754,7 +2754,7 @@ function template_profile_avatar_select()
 										else
 											previewExternalAvatar(avatar.src)
 
-									// ]]></script>
+									</script>
 								</div>';
 	}
 
@@ -2805,7 +2805,7 @@ function template_profile_avatar_select()
 	}
 
 	echo '
-								<script><!-- // --><![CDATA[
+								<script>
 									', !empty($context['member']['avatar']['allow_server_stored']) ? 'document.getElementById("avatar_server_stored").style.display = "' . ($context['member']['avatar']['choice'] == 'server_stored' ? '' : 'none') . '";' : '', '
 									', !empty($context['member']['avatar']['allow_external']) ? 'document.getElementById("avatar_external").style.display = "' . ($context['member']['avatar']['choice'] == 'external' ? '' : 'none') . '";' : '', '
 									', !empty($context['member']['avatar']['allow_upload']) ? 'document.getElementById("avatar_upload").style.display = "' . ($context['member']['avatar']['choice'] == 'upload' ? '' : 'none') . '";' : '', '
@@ -2849,7 +2849,7 @@ function swap_avatar(type)
 												break;
 										}
 									}
-								// ]]></script>
+								</script>
 							</dd>';
 }
 
@@ -51,7 +51,7 @@ function template_registration_form()
 	global $context, $scripturl, $txt, $modSettings;
 
 	echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			function verifyAgree()
 			{
 				if (currentAuthMethod == \'passwd\' && document.forms.registration.smf_autov_pwmain.value != document.forms.registration.smf_autov_pwverify.value)
@@ -64,7 +64,7 @@ function verifyAgree()
 			}
 
 			var currentAuthMethod = \'passwd\';
-		// ]]></script>';
+		</script>';
 
 	// Any errors?
 	if (!empty($context['registration_errors']))
@@ -299,7 +299,7 @@ function verifyAgree()
 			<input type="hidden" name="', $context['register_token_var'], '" value="', $context['register_token'], '">
 			<input type="hidden" name="step" value="2">
 		</form>
-		<script><!-- // --><![CDATA[
+		<script>
 			var regTextStrings = {
 				"username_valid": "', $txt['registration_username_available'], '",
 				"username_invalid": "', $txt['registration_username_unavailable'], '",
@@ -311,7 +311,7 @@ function verifyAgree()
 				"password_valid": "', $txt['registration_password_valid'], '"
 			};
 			var verificationHandle = new smfRegister("registration", ', empty($modSettings['password_strength']) ? 0 : $modSettings['password_strength'], ', regTextStrings);
-		// ]]></script>';
+		</script>';
 }
 
 // After registration... all done ;).
@@ -420,8 +420,8 @@ function template_verification_sound()
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['visual_verification_sound'], '</title>
 		<meta name="robots" content="noindex">
-		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
-		<style type="text/css">';
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<style>';
 
 	// Just show the help text and a "close window" link.
 	echo '
@@ -118,7 +118,7 @@ function template_set_password()
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 		<input type="hidden" name="', $context['remind-sp_token_var'], '" value="', $context['remind-sp_token'], '">
 	</form>
-	<script><!-- // --><![CDATA[
+	<script>
 	var regTextStrings = {
 		"password_short": "', $txt['registration_password_short'], '",
 		"password_reserved": "', $txt['registration_password_reserved'], '",
@@ -127,7 +127,7 @@ function template_set_password()
 		"password_valid": "', $txt['registration_password_valid'], '"
 	};
 	var verificationHandle = new smfRegister("reminder_form", ', empty($modSettings['password_strength']) ? 0 : $modSettings['password_strength'], ', regTextStrings);
-// ]]></script>';
+</script>';
 }
 
 function template_ask()
@@ -172,7 +172,7 @@ function template_ask()
 			</div>
 		</div>
 	</form>
-<script><!-- // --><![CDATA[
+<script>
 	var regTextStrings = {
 		"password_short": "', $txt['registration_password_short'], '",
 		"password_reserved": "', $txt['registration_password_reserved'], '",
@@ -181,7 +181,7 @@ function template_ask()
 		"password_valid": "', $txt['registration_password_valid'], '"
 	};
 	var verificationHandle = new smfRegister("creator", ', empty($modSettings['password_strength']) ? 0 : $modSettings['password_strength'], ', regTextStrings);
-// ]]></script>';
+</script>';
 
 }
 
@@ -138,7 +138,7 @@ function template_reported_posts_block()
 			</div>
 		</div>
 
-	<script><!-- // --><![CDATA[
+	<script>
 		var oReportedPostsPanelToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: ', !empty($context['admin_prefs']['mcrp']) ? 'true' : 'false', ',
@@ -168,7 +168,7 @@ function template_reported_posts_block()
 				sAdditionalVars: \';admin_key=mcrp\'
 			}
 		});
-	// ]]></script>';
+	</script>';
 }
 
 
@@ -340,7 +340,7 @@ function template_reported_members_block()
 			</div>
 		</div>
 
-	<script><!-- // --><![CDATA[
+	<script>
 		var oReportedPostsPanelToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: ', !empty($context['admin_prefs']['mcrm']) ? 'true' : 'false', ',
@@ -370,7 +370,7 @@ function template_reported_members_block()
 				sAdditionalVars: \';admin_key=mcrm\'
 			}
 		});
-	// ]]></script>';
+	</script>';
 }
 
 function template_reported_members()
@@ -145,7 +145,7 @@ function template_print_above()
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $context['page_title'], '</title>
-		<link rel="stylesheet" type="text/css" href="', $settings['default_theme_url'], '/css/report.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/report.css', $modSettings['browser_cache'] ,'">
 	</head>
 	<body>';
 }
@@ -92,10 +92,10 @@ function template_main()
 						$txt['search_between'], '</label> <input type="number" name="minage" id="minage" value="', empty($context['search_params']['minage']) ? '0' : $context['search_params']['minage'], '" size="5" maxlength="4" class="input_text">&nbsp;<label for="maxage">', $txt['search_and'], '&nbsp;</label><input type="number" name="maxage" id="maxage" value="', empty($context['search_params']['maxage']) ? '9999' : $context['search_params']['maxage'], '" size="5" maxlength="4" class="input_text"> ', $txt['days_word'], '
 					</dd>
 				</dl>
-				<script><!-- // --><![CDATA[
+				<script>
 					createEventListener(window);
 					window.addEventListener("load", initSearch, false);
-				// ]]></script>
+				</script>
 				<input type="hidden" name="advanced" value="1">';
 
 	// Require an image to be typed to save spamming?
@@ -181,7 +181,7 @@ function template_main()
 		</fieldset>';
 
 		echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		var oAdvancedPanelToggle = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: ', $context['boards_check_all'] ? 'true' : 'false', ',
@@ -203,12 +203,12 @@ function template_main()
 				}
 			]
 		});
-	// ]]></script>';
+	</script>';
 	}
 
 	echo '
 	</form>
-	<script><!-- // --><![CDATA[
+	<script>
 		var oAddMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oAddMemberSuggest\',
 			sSessionId: smf_session_id,
@@ -217,7 +217,7 @@ function template_main()
 			sSearchType: \'member\',
 			bItemList: false
 		});
-	// ]]></script>';
+	</script>';
 }
 
 function template_results()
@@ -472,7 +472,7 @@ function template_results()
 	echo '
 		<br class="clear">
 		<div class="smalltext righttext" id="search_jump_to">&nbsp;</div>
-		<script><!-- // --><![CDATA[';
+		<script>';
 
 	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
 		echo '
@@ -505,7 +505,7 @@ function template_results()
 					sCatPrefix: "",
 					sGoButtonLabel: "', $txt['quick_mod_go'], '"
 				});
-		// ]]></script>';
+		</script>';
 
 }
 
@@ -146,7 +146,7 @@ function template_select()
 			</div>
 		</form>
 	</div>
-	<script><!-- // --><![CDATA[
+	<script>
 		var start = new Array();
 		start[0] = ', $context['not_selected']['start'], ';
 		start[1] = ', $context['selected']['start'], ';
@@ -216,7 +216,7 @@ function onDocReceived(XMLDoc)
 			applyWindowClasses(document.getElementById("messages_selected"));
 			applyWindowClasses(document.getElementById("messages_not_selected"));
 		}
-	// ]]></script>';
+	</script>';
 }
 
 ?>
@@ -215,7 +215,7 @@ function template_main()
 			</tbody>
 		</table>
 	</div>
-	<script><!-- // --><![CDATA[
+	<script>
 		var oStatsCenter = new smf_StatsCenter({
 			sTableId: \'stats\',
 
@@ -255,7 +255,7 @@ function template_main()
 				\'hits\'', '
 			]
 		});
-	// ]]></script>';
+	</script>';
 	}
 }
 
@@ -59,10 +59,10 @@ function template_main()
 		echo '
 						</div>
 						<a href="javascript:void(0);" onclick="document.getElementById(\'known_themes_list\').style.display=\'block\'; document.getElementById(\'known_themes_link\').style.display = \'none\'; return false; " id="known_themes_link" style="display: none;">[ ', $txt['themeadmin_themelist_link'], ' ]</a>
-						<script><!-- // --><![CDATA[
+						<script>
 							document.getElementById("known_themes_list").style.display = "none";
 							document.getElementById("known_themes_link").style.display = "";
-						// ]]></script>
+						</script>
 					</dd>
 					<dt>
 						<label for="theme_guests">', $txt['theme_guests'], ':</label>
@@ -179,12 +179,12 @@ function template_main()
 	</div>';
 
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		window.smfForum_scripturl = smf_scripturl;
 		window.smfForum_sessionid = smf_session_id;
 		window.smfForum_sessionvar = smf_session_var;
 		window.smfThemes_writable = ', $context['can_create_new'] ? 'true' : 'false', ';
-	// ]]></script>';
+	</script>';
 }
 
 function template_list_themes()
@@ -653,7 +653,7 @@ function template_set_settings()
 	if (!empty($context['theme_variants']))
 	{
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 		var oThumbnails = {';
 
 		// All the variant thumbnails.
@@ -667,7 +667,7 @@ function template_set_settings()
 
 		echo '
 		}
-		// ]]></script>';
+		</script>';
 	}
 }
 
@@ -732,7 +732,7 @@ function template_pick()
 		if (!empty($theme['variants']))
 		{
 			echo '
-			<script><!-- // --><![CDATA[
+			<script>
 			var sBaseUseUrl', $theme['id'], ' = smf_prepareScriptUrl(smf_scripturl) + \'action=theme;sa=pick;u=', $context['current_member'], ';th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], '\';
 			var sBasePreviewUrl', $theme['id'], ' = smf_prepareScriptUrl(smf_scripturl) + \'action=theme;sa=pick;u=', $context['current_member'], ';theme=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], '\';
 			var oThumbnails', $theme['id'], ' = {';
@@ -756,7 +756,7 @@ function changeVariant', $theme['id'], '(sVariant)
 				document.getElementById(\'theme_thumb_preview_', $theme['id'], '\').href = sBasePreviewUrl', $theme['id'], ' + \';vrt=\' + sVariant + \';variant=\' + sVariant;
 				document.getElementById(\'theme_preview_', $theme['id'], '\').href = sBasePreviewUrl', $theme['id'], ' + \';vrt=\' + sVariant + \';variant=\' + sVariant;
 			}
-			// ]]></script>';
+			</script>';
 		}
 	}
 
@@ -938,7 +938,7 @@ function template_edit_style()
 	// From now on no one can complain that editing css is difficult. If you disagree, go to www.w3schools.com.
 	echo '
 	<div id="admincenter">
-		<script><!-- // --><![CDATA[
+		<script>
 			var previewData = "";
 			var previewTimeout;
 			var editFilename = ', JavaScriptEscape($context['edit_filename']), ';
@@ -1047,7 +1047,7 @@ function refreshPreview(check)
 					};
 				}
 			}
-		// ]]></script>
+		</script>
 		<iframe id="css_preview_box" name="css_preview_box" src="about:blank" width="99%" height="300" frameborder="0" style="display: none; margin-bottom: 2ex; border: 1px solid black;"></iframe>';
 
 	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
@@ -93,7 +93,7 @@ function template_html_above()
 	// Save some database hits, if a width for multiple wrappers is set in admin.
 	if (!empty($settings['forum_width']))
 		echo '
-	<style type="text/css">#wrapper, .frame {width: ', $settings['forum_width'], ';}</style>';
+	<style>#wrapper, .frame {width: ', $settings['forum_width'], ';}</style>';
 
 	// load in any javascript files from mods and themes
 	template_javascript();
@@ -2126,9 +2126,9 @@ function template_install_above()
 		<meta http-equiv="Content-Type" content="text/html; charset=', isset($txt['lang_character_set']) ? $txt['lang_character_set'] : 'ISO-8859-1', '">
 		<meta name="robots" content="noindex">
 		<title>', $txt['smf_installer'], '</title>
-		<link rel="stylesheet" type="text/css" href="Themes/default/css/index.css?alp21">
-		<link rel="stylesheet" type="text/css" href="Themes/default/css/install.css?alp21">
-		', $txt['lang_rtl'] == true ? '<link rel="stylesheet" type="text/css" href="Themes/default/css/rtl.css?alp21">' : '' , '
+		<link rel="stylesheet" href="Themes/default/css/index.css?alp21">
+		<link rel="stylesheet" href="Themes/default/css/install.css?alp21">
+		', $txt['lang_rtl'] == true ? '<link rel="stylesheet" href="Themes/default/css/rtl.css?alp21">' : '' , '
 		<script src="Themes/default/scripts/script.js"></script>
 	</head>
 	<body>
@@ -2260,7 +2260,7 @@ function template_welcome_message()
 
 	// For the latest version stuff.
 	echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			// Latest version?
 			function smfCurrentVersion()
 			{
@@ -2281,7 +2281,7 @@ function smfCurrentVersion()
 					document.getElementById(\'version_warning\').style.display = \'\';
 			}
 			addLoadEvent(smfCurrentVersion);
-		// ]]></script>';
+		</script>';
 }
 
 // A shortcut for any warning stuff.
@@ -2470,7 +2470,7 @@ function template_database_settings()
 
 	// Toggles a warning related to db names in PostgreSQL
 	echo '
-	<script><!-- // --><![CDATA[
+	<script>
 		function toggleDBInput()
 		{
 			if (document.getElementById(\'db_type_input\').value == \'postgresql\')
@@ -2479,7 +2479,7 @@ function toggleDBInput()
 				document.getElementById(\'db_name_info_warning\').style.display = \'\';
 		}
 		toggleDBInput();
-	// ]]></script>';
+	</script>';
 }
 
 // Stick in their forum settings.
@@ -2698,7 +2698,7 @@ function template_delete_install()
 		<div style="margin: 1ex; font-weight: bold;">
 			<label for="delete_self"><input type="checkbox" id="delete_self" onclick="doTheDelete();" class="input_check" /> ', $txt['delete_installer'], !isset($_SESSION['installer_temp_ftp']) ? ' ' . $txt['delete_installer_maybe'] : '', '</label>
 		</div>
-		<script><!-- // --><![CDATA[
+		<script>
 			function doTheDelete()
 			{
 				var theCheck = document.getElementById ? document.getElementById("delete_self") : document.all.delete_self;
@@ -2708,7 +2708,7 @@ function doTheDelete()
 				tempImage.width = 0;
 				theCheck.disabled = true;
 			}
-		// ]]></script>
+		</script>
 		<br />';
 
 	echo '
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>SMF 2.1 Installation Guide</title>
-		<link rel="stylesheet" type="text/css" href="Themes/default/css/index.css?alp21" />
-		<style type="text/css">#wrapper, .frame {width: 90%;}</style>
-		<style type="text/css">
+		<link rel="stylesheet" href="Themes/default/css/index.css?alp21" />
+		<style>#wrapper, .frame {width: 90%;}</style>
+		<style>
 			#upper_section .user {
 				height: 1em;
 			}
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>SMF 2.1 Upgrade Guide</title>
-		<link rel="stylesheet" type="text/css" href="Themes/default/css/index.css?fin20" />
-		<style type="text/css">#wrapper, .frame {width: 90%;}</style>
-		<style type="text/css">
+		<link rel="stylesheet" href="Themes/default/css/index.css?fin20" />
+		<style>#wrapper, .frame {width: 90%;}</style>
+		<style>
 			#upper_section .user {
 				height: 1em;
 			}
@@ -3560,20 +3560,20 @@ function template_chmod()
 		<div class="panel">
 			<h2>Your FTP connection information</h2>
 			<h3>The upgrader can fix any issues with file permissions to make upgrading as simple as possible. Simply enter your connection information below or alternatively click <a href="#" onclick="warning_popup();">here</a> for a list of files which need to be changed.</h3>
-			<script><!-- // --><![CDATA[
+			<script>
 				function warning_popup()
 				{
 					popup = window.open(\'\',\'popup\',\'height=150,width=400,scrollbars=yes\');
 					var content = popup.document;
 					content.write(\'<!DOCTYPE html>\n\');
 					content.write(\'<html', $txt['lang_rtl'] == true ? ' dir="rtl"' : '', '>\n\t<head>\n\t\t<meta name="robots" content="noindex">\n\t\t\');
-					content.write(\'<title>Warning</title>\n\t\t<link rel="stylesheet" type="text/css" href="', $settings['default_theme_url'], '/css/index.css">\n\t</head>\n\t<body id="popup">\n\t\t\');
+					content.write(\'<title>Warning</title>\n\t\t<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/index.css">\n\t</head>\n\t<body id="popup">\n\t\t\');
 					content.write(\'<div class="windowbg description">\n\t\t\t<h4>The following files needs to be made writable to continue:</h4>\n\t\t\t\');
 					content.write(\'<p>', implode('<br>\n\t\t\t', $upcontext['chmod']['files']), '</p>\n\t\t\t\');
 					content.write(\'<a href="javascript:self.close();">close</a>\n\t\t</div>\n\t</body>\n</html>\');
 					content.close();
 				}
-		// ]]></script>';
+		</script>';
 
 	if (!empty($upcontext['chmod']['ftp_error']))
 		echo '
@@ -3638,11 +3638,11 @@ function template_upgrade_above()
 		<meta http-equiv="Content-Type" content="text/html; charset=', isset($txt['lang_character_set']) ? $txt['lang_character_set'] : 'ISO-8859-1', '">
 		<meta name="robots" content="noindex">
 		<title>', $txt['upgrade_upgrade_utility'], '</title>
-		<link rel="stylesheet" type="text/css" href="', $settings['default_theme_url'], '/css/index.css?alp21">
-		<link rel="stylesheet" type="text/css" href="', $settings['default_theme_url'], '/css/install.css?alp21">
-		', $txt['lang_rtl'] == true ? '<link rel="stylesheet" type="text/css" href="' . $settings['default_theme_url'] . '/css/rtl.css?alp21">' : '' , '
+		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/index.css?alp21">
+		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/install.css?alp21">
+		', $txt['lang_rtl'] == true ? '<link rel="stylesheet" href="' . $settings['default_theme_url'] . '/css/rtl.css?alp21">' : '' , '
 		<script src="', $settings['default_theme_url'], '/scripts/script.js"></script>
-		<script><!-- // --><![CDATA[
+		<script>
 			var smf_scripturl = \'', $upgradeurl, '\';
 			var smf_charset = \'', (empty($modSettings['global_character_set']) ? (empty($txt['lang_character_set']) ? 'ISO-8859-1' : $txt['lang_character_set']) : $modSettings['global_character_set']), '\';
 			var startPercent = ', $upcontext['overall_percent'], ';
@@ -3664,7 +3664,7 @@ function updateStepProgress(current, max, overall_weight)
 					setInnerHTML(document.getElementById(\'overall_text\'), overall_width + "%");
 				}
 			}
-		// ]]></script>
+		</script>
 	</head>
 	<body>
 	<div id="header"><div class="frame">
@@ -3779,7 +3779,7 @@ function template_upgrade_below()
 	if (!empty($upcontext['pause']))
 	{
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			window.onload = doAutoSubmit;
 			var countdown = 3;
 			var dontSubmit = false;
@@ -3796,7 +3796,7 @@ function doAutoSubmit()
 
 				setTimeout("doAutoSubmit();", 1000);
 			}
-		// ]]></script>';
+		</script>';
 	}
 }
 
@@ -3981,7 +3981,7 @@ function template_welcome_message()
 
 	// This defines whether javascript is going to work elsewhere :D
 	echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			if (\'XMLHttpRequest\' in window && document.getElementById(\'js_works\'))
 				document.getElementById(\'js_works\').value = 1;
 
@@ -4010,7 +4010,7 @@ function smfCurrentVersion()
 			if (typeof(smfSelectText) == \'undefined\')
 				document.getElementById(\'js_script_missing_error\').style.display = \'\';
 
-		// ]]></script>';
+		</script>';
 }
 
 function template_upgrade_options()
@@ -4149,7 +4149,7 @@ function template_backup_database()
 	if ($support_js)
 	{
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			var lastTable = ', $upcontext['cur_table_num'], ';
 			function getNextTables()
 			{
@@ -4190,7 +4190,7 @@ function onBackupUpdate(oXMLDoc)
 					getNextTables();
 			}
 			getNextTables();
-		// ]]></script>';
+		</script>';
 	}
 }
 
@@ -4262,7 +4262,7 @@ function template_database_changes()
 	if ($support_js)
 	{
 		echo '
-		<script><!-- // --><![CDATA[
+		<script>
 			var lastItem = ', $upcontext['current_debug_item_num'], ';
 			var sLastString = "', strtr($upcontext['current_debug_item_name'], array('"' => '&quot;')), '";
 			var iLastSubStepProgress = -1;
@@ -4515,7 +4515,7 @@ function retTimeout(attemptAgain)
 			getNextItem();';
 
 		echo '
-		// ]]></script>';
+		</script>';
 	}
 	return;
 }
@@ -4728,7 +4728,7 @@ function template_upgrade_complete()
 	if (!empty($upcontext['can_delete_script']))
 		echo '
 			<label for="delete_self"><input type="checkbox" id="delete_self" onclick="doTheDelete(this);" class="input_check"> Delete upgrade.php and its data files now</label> <em>(doesn\'t work on all servers).</em>
-			<script><!-- // --><![CDATA[
+			<script>
 				function doTheDelete(theCheck)
 				{
 					var theImage = document.getElementById ? document.getElementById("delete_upgrader") : document.all.delete_upgrader;
@@ -4736,7 +4736,7 @@ function doTheDelete(theCheck)
 					theImage.src = "', $upgradeurl, '?delete=1&ts_" + (new Date().getTime());
 					theCheck.disabled = true;
 				}
-			// ]]></script>
+			</script>
 			<img src="', $settings['default_theme_url'], '/images/blank.png" alt="" id="delete_upgrader"><br>';
 
 	echo '<br>
@@ -417,9 +417,9 @@ function template_ssi_above()
 <html>
 	<head>
 		<title>SMF 2.1 Beta 2 SSI.php Examples</title>
-		<link rel="stylesheet" type="text/css" href="', $settings['default_theme_url'], '/css/index.css?alp21">
-		<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/script.js"></script>
-		<style type="text/css">
+		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/index.css?alp21">
+		<script src="', $settings['default_theme_url'], '/scripts/script.js"></script>
+		<style>
 			#wrapper
 			{
 				width: 90%;
@@ -487,7 +487,7 @@ function template_ssi_above()
 				overflow: hidden;
 			}
 		</style>
-		<script type="text/javascript"><!-- // --><![CDATA[
+		<script>
 			var smf_scripturl = "', $scripturl, '";
 			var smf_iso_case_folding = ', $context['server']['iso_case_folding'] ? 'true' : 'false', ';
 			var smf_charset = "', $context['character_set'], '";
@@ -511,7 +511,7 @@ function toggleVisibleByClass(sClassName, bHide)
 					oSections[i].style.display = bHide ? "none" : "block";
 				}
 			}
-		// ]]></script>
+		</script>
 	</head>
 	<body>
 		<div id="header">
@@ -530,9 +530,9 @@ function toggleVisibleByClass(sClassName, bHide)
 function template_ssi_below()
 {
 	echo '
-						<script type="text/javascript"><!-- // --><![CDATA[
+						<script>
 							showSSIBlock("ssi_recentTopics");
-						// ]]></script>
+						</script>
 					</div>
 				</div>
 			</div>
@@ -559,7 +559,7 @@ function template_homepage_sample1($method = 'source')
 <html>
 <head>
 	<title>SSI.php example for home page</title>
-	<style type="text/css">
+	<style>
 		body { font-family: Arial, Tahoma, sans-serif; font-size: 80%; background: #DFDFDF; color: #FFFFFF; margin: 0 }
 		ul,ol { padding-left: 19px; margin: 0; }
 		li { font-size: 11px; }