From b3aa13b6bb50aebd48e5c894f10d1b721f03be30 Mon Sep 17 00:00:00 2001
From: Sascha Greuel <sascha@softcreatr.de>
Date: Thu, 4 Jul 2013 21:00:05 +0200
Subject: [PATCH] Fixed usage of the script tag

---
 .../templates/__commentJavaScript.tpl         |  6 +--
 .../templates/__messageFormPoll.tpl           |  4 +-
 .../templates/aclPermissionJavaScript.tpl     |  2 +-
 com.woltlab.wcf/templates/aclPermissions.tpl  |  4 +-
 com.woltlab.wcf/templates/avatarEdit.tpl      |  2 +-
 com.woltlab.wcf/templates/benchmark.tpl       |  4 +-
 .../birthdaySearchableOptionType.tpl          |  2 +-
 .../templates/dashboardBoxRecentActivity.tpl  |  2 +-
 com.woltlab.wcf/templates/following.tpl       |  2 +-
 com.woltlab.wcf/templates/groupedUserList.tpl |  2 +-
 com.woltlab.wcf/templates/headInclude.tpl     | 42 +++++++++----------
 com.woltlab.wcf/templates/header.tpl          |  2 +-
 com.woltlab.wcf/templates/ignoredUsers.tpl    |  2 +-
 com.woltlab.wcf/templates/imageViewer.tpl     |  6 +--
 com.woltlab.wcf/templates/login.tpl           |  4 +-
 com.woltlab.wcf/templates/lostPassword.tpl    |  4 +-
 com.woltlab.wcf/templates/membersList.tpl     |  2 +-
 .../templates/messageFormAttachments.tpl      |  4 +-
 .../templates/messageFormMultilingualism.tpl  |  2 +-
 .../templates/messageFormPreviewButton.tpl    |  2 +-
 .../templates/messageFormSmilies.tpl          |  4 +-
 com.woltlab.wcf/templates/messageFormTabs.tpl |  2 +-
 .../templates/messageOptionType.tpl           |  2 +-
 com.woltlab.wcf/templates/messageSidebar.tpl  |  2 +-
 .../templates/messageUserOptionOutput.tpl     |  2 +-
 .../templates/moderationActivation.tpl        |  4 +-
 .../templates/moderationReport.tpl            |  4 +-
 .../multipleLanguageInputJavascript.tpl       |  2 +-
 .../templates/notificationList.tpl            |  2 +-
 .../templates/notificationSettings.tpl        |  2 +-
 com.woltlab.wcf/templates/poll.tpl            |  4 +-
 com.woltlab.wcf/templates/recaptcha.tpl       |  4 +-
 .../templates/recentActivities.tpl            |  2 +-
 .../templates/recentActivityList.tpl          |  2 +-
 com.woltlab.wcf/templates/register.tpl        |  4 +-
 com.woltlab.wcf/templates/search.tpl          |  4 +-
 com.woltlab.wcf/templates/searchArea.tpl      |  4 +-
 com.woltlab.wcf/templates/settings.tpl        |  2 +-
 com.woltlab.wcf/templates/shareButtons.tpl    |  2 +-
 com.woltlab.wcf/templates/signatureEdit.tpl   |  2 +-
 com.woltlab.wcf/templates/sitemap.tpl         |  2 +-
 .../templates/spoilerBBCodeTag.tpl            |  2 +-
 com.woltlab.wcf/templates/tagInput.tpl        |  4 +-
 com.woltlab.wcf/templates/team.tpl            |  2 +-
 .../templates/textI18nOptionType.tpl          |  2 +-
 .../templates/textareaI18nOptionType.tpl      |  2 +-
 com.woltlab.wcf/templates/user.tpl            |  4 +-
 com.woltlab.wcf/templates/userException.tpl   |  2 +-
 com.woltlab.wcf/templates/userMenuSidebar.tpl |  2 +-
 com.woltlab.wcf/templates/userPanel.tpl       | 10 ++---
 .../templates/userProfilePreview.tpl          |  2 +-
 com.woltlab.wcf/templates/userSearch.tpl      |  2 +-
 com.woltlab.wcf/templates/usersOnlineList.tpl |  2 +-
 com.woltlab.wcf/templates/wysiwyg.tpl         |  8 ++--
 .../acp/templates/aclPermissionJavaScript.tpl |  2 +-
 .../files/acp/templates/aclPermissions.tpl    |  4 +-
 .../files/acp/templates/applicationEdit.tpl   |  2 +-
 .../files/acp/templates/attachmentList.tpl    |  2 +-
 .../install/files/acp/templates/bbcodeAdd.tpl |  2 +-
 .../files/acp/templates/bbcodeList.tpl        |  2 +-
 .../acp/templates/bbcodeMediaProviderList.tpl |  2 +-
 .../install/files/acp/templates/benchmark.tpl |  4 +-
 .../birthdaySearchableOptionType.tpl          |  2 +-
 .../install/files/acp/templates/cacheList.tpl |  2 +-
 .../files/acp/templates/categoryList.tpl      |  2 +-
 .../files/acp/templates/codemirror.tpl        | 12 +++---
 .../files/acp/templates/cronjobList.tpl       |  2 +-
 .../files/acp/templates/cronjobLogList.tpl    |  2 +-
 .../files/acp/templates/dashboardOption.tpl   |  6 +--
 .../files/acp/templates/dataImport.tpl        |  2 +-
 .../files/acp/templates/exceptionLogView.tpl  |  2 +-
 .../install/files/acp/templates/header.tpl    | 18 ++++----
 .../files/acp/templates/imageViewer.tpl       |  6 +--
 .../install/files/acp/templates/index.tpl     |  2 +-
 .../install/files/acp/templates/labelAdd.tpl  |  4 +-
 .../files/acp/templates/labelGroupAdd.tpl     |  4 +-
 .../files/acp/templates/labelGroupList.tpl    |  2 +-
 .../install/files/acp/templates/labelList.tpl |  2 +-
 .../files/acp/templates/languageItemList.tpl  |  4 +-
 .../files/acp/templates/languageList.tpl      |  2 +-
 .../acp/templates/languageMultilingualism.tpl |  2 +-
 .../acp/templates/languageServerList.tpl      |  2 +-
 .../install/files/acp/templates/login.tpl     |  2 +-
 .../files/acp/templates/masterPassword.tpl    |  2 +-
 .../acp/templates/masterPasswordInit.tpl      |  2 +-
 .../multipleLanguageInputJavascript.tpl       |  2 +-
 .../install/files/acp/templates/option.tpl    |  2 +-
 .../install/files/acp/templates/package.tpl   |  2 +-
 .../templates/packageInstallationConfirm.tpl  |  2 +-
 .../templates/packageInstallationSetup.tpl    |  2 +-
 .../files/acp/templates/packageList.tpl       |  4 +-
 .../acp/templates/packageStartInstall.tpl     |  2 +-
 .../files/acp/templates/packageUpdate.tpl     |  2 +-
 .../acp/templates/packageUpdateServerList.tpl |  2 +-
 .../files/acp/templates/pageMenuItemAdd.tpl   |  2 +-
 .../files/acp/templates/pageMenuItemList.tpl  |  2 +-
 .../files/acp/templates/smileyList.tpl        |  2 +-
 .../install/files/acp/templates/styleAdd.tpl  |  6 +--
 .../files/acp/templates/styleExport.tpl       |  2 +-
 .../install/files/acp/templates/styleList.tpl |  4 +-
 .../install/files/acp/templates/tagAdd.tpl    |  4 +-
 .../install/files/acp/templates/tagList.tpl   |  2 +-
 .../files/acp/templates/templateGroupList.tpl |  2 +-
 .../files/acp/templates/templateList.tpl      |  2 +-
 .../acp/templates/textI18nOptionType.tpl      |  2 +-
 .../acp/templates/textareaI18nOptionType.tpl  |  2 +-
 .../acp/templates/userActivityPointOption.tpl |  2 +-
 .../install/files/acp/templates/userAdd.tpl   | 12 +++---
 .../acp/templates/userBulkProcessing.tpl      |  4 +-
 .../acp/templates/userEmailAddressExport.tpl  |  2 +-
 .../files/acp/templates/userException.tpl     |  2 +-
 .../files/acp/templates/userGroupAdd.tpl      |  2 +-
 .../files/acp/templates/userGroupList.tpl     |  2 +-
 .../files/acp/templates/userGroupOption.tpl   |  2 +-
 .../install/files/acp/templates/userList.tpl  |  2 +-
 .../install/files/acp/templates/userMail.tpl  |  2 +-
 .../acp/templates/userOptionCategoryList.tpl  |  2 +-
 .../files/acp/templates/userOptionList.tpl    |  2 +-
 .../files/acp/templates/userRankList.tpl      |  2 +-
 .../files/acp/templates/userSearch.tpl        |  2 +-
 .../ckeditor/plugins/wsc/dialogs/ciframe.html |  2 +-
 .../plugins/wsc/dialogs/tmpFrameset.html      |  2 +-
 .../setup/template/stepInstallPackages.tpl    |  2 +-
 wcfsetup/setup/template/stepNext.tpl          |  2 +-
 wcfsetup/setup/template/stepSearchWcfDir.tpl  |  4 +-
 125 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/com.woltlab.wcf/templates/__commentJavaScript.tpl b/com.woltlab.wcf/templates/__commentJavaScript.tpl
index 275474aa32..3981bf3ec5 100644
--- a/com.woltlab.wcf/templates/__commentJavaScript.tpl
+++ b/com.woltlab.wcf/templates/__commentJavaScript.tpl
@@ -1,6 +1,6 @@
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Comment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}js/WCF.Comment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/__messageFormPoll.tpl b/com.woltlab.wcf/templates/__messageFormPoll.tpl
index 129619702d..8eef1cf9b6 100644
--- a/com.woltlab.wcf/templates/__messageFormPoll.tpl
+++ b/com.woltlab.wcf/templates/__messageFormPoll.tpl
@@ -1,6 +1,6 @@
 {if $__showPoll|isset && $__showPoll}
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript">
+	<script src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+	<script>
 		//<![CDATA[
 		$(function() {
 			WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl b/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl
index 897fd83d67..645f5249bd 100644
--- a/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl
+++ b/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		{if $aclValues[$objectTypeID]|isset}
diff --git a/com.woltlab.wcf/templates/aclPermissions.tpl b/com.woltlab.wcf/templates/aclPermissions.tpl
index 01750219e1..97a646b9ac 100644
--- a/com.woltlab.wcf/templates/aclPermissions.tpl
+++ b/com.woltlab.wcf/templates/aclPermissions.tpl
@@ -1,5 +1,5 @@
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.ACL{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}js/WCF.ACL{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl
index 694f626716..48fae06007 100644
--- a/com.woltlab.wcf/templates/avatarEdit.tpl
+++ b/com.woltlab.wcf/templates/avatarEdit.tpl
@@ -113,7 +113,7 @@
 
 {include file='footer'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/benchmark.tpl b/com.woltlab.wcf/templates/benchmark.tpl
index a118ec3169..42259ffc3c 100644
--- a/com.woltlab.wcf/templates/benchmark.tpl
+++ b/com.woltlab.wcf/templates/benchmark.tpl
@@ -1,7 +1,7 @@
 <p class="marginTop" id="benchmark"><small>Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</small></p>
 
 {if ENABLE_DEBUG_MODE}	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			$('#benchmarkDetails > li > span').click(function() {
@@ -23,7 +23,7 @@
 		{/foreach}
 	</ul>
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			$('#benchmark').click(function() {
diff --git a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
index 29760df57b..14e149757d 100644
--- a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
@@ -1,7 +1,7 @@
 <input type="number" id="{$option->optionName}" name="values[{$option->optionName}][ageFrom]" value="{@$valueAgeFrom}" placeholder="{lang}wcf.user.birthday.age.from{/lang}" min="0" max="120" class="tiny" />
 <input type="number" id="{$option->optionName}_age_to" name="values[{$option->optionName}][ageTo]" value="{@$valueAgeTo}" placeholder="{lang}wcf.user.birthday.age.to{/lang}" min="0" max="120" class="tiny" />
 
-<script type="text/javascript">
+<script>
 //<![CDATA[
 $(function() {
 	$('#{$option->optionName}').parents('dl:eq(0)').find('> dt > label').text('{lang}wcf.user.birthday.age{/lang}');
diff --git a/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl b/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl
index fa9d92338f..0426c0a5ea 100644
--- a/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl
+++ b/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl
@@ -9,7 +9,7 @@
 	</ul>
 </div>
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/following.tpl b/com.woltlab.wcf/templates/following.tpl
index bea4d63422..1949595338 100644
--- a/com.woltlab.wcf/templates/following.tpl
+++ b/com.woltlab.wcf/templates/following.tpl
@@ -4,7 +4,7 @@
 	<title>{lang}wcf.user.following{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
 	{include file='headInclude'}
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Action.Delete('wcf\\data\\user\\follow\\UserFollowAction', '.jsFollowing');
diff --git a/com.woltlab.wcf/templates/groupedUserList.tpl b/com.woltlab.wcf/templates/groupedUserList.tpl
index a54acccba9..83746793e9 100644
--- a/com.woltlab.wcf/templates/groupedUserList.tpl
+++ b/com.woltlab.wcf/templates/groupedUserList.tpl
@@ -20,7 +20,7 @@
 
 <div class="contentNavigation"><div class="jsPagination"></div></div>
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 		$(function() {
 			WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index 490164017d..dfe24067e2 100644
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -6,7 +6,7 @@
 {implode from=$__wcf->getMetaTagHandler() item=__metaTag glue="\n"}{@$__metaTag}{/implode}
 {event name='metaTags'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	var SID_ARG_2ND	= '{@SID_ARG_2ND_NOT_ENCODED}';
 	var WCF_PATH = '{@$__wcf->getPath()}';
@@ -16,39 +16,39 @@
 	//]]>
 </script>
 {if JQUERY_SOURCE == 'google'}
-<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.0.1/jquery.min.js"></script>
-<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.1/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
 {elseif JQUERY_SOURCE == 'microsoft'}
-<script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-2.0.1.min.js"></script>
-<script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.10.3/jquery-ui.min.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-2.0.1.min.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.10.3/jquery-ui.min.js"></script>
 {elseif JQUERY_SOURCE == 'cloudflare'}
-<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.1/jquery.min.js"></script>
-<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.1/jquery.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
 {else}
-<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"></script>
+<script src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"></script>
+<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"></script>
 {/if}
 {if JQUERY_SOURCE != 'local'}
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	if (!window.jQuery) {
-		document.write('<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"><\/script>');
-		document.write('<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"><\/script>');
+		document.write('<script src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"><\/script>');
+		document.write('<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"><\/script>');
 	}
 	//]]>
 </script>
 {/if}
-<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js?v={@$__wcfVersion}"></script>
+<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js?v={@$__wcfVersion}"></script>
+<script src="{@$__wcf->getPath()}js/WCF{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	WCF.User.init({@$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');
 	//]]>
 </script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.Like{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script src="{@$__wcf->getPath('wcf')}js/WCF.Like{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 {event name='javascriptInclude'}
 
 <!-- Stylesheets -->
@@ -67,7 +67,7 @@
 	</style>
 </noscript>
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
@@ -165,7 +165,7 @@
 	//]]>
 </script>
  <!--[IF IE 9]>
- <script type="text/javascript">
+ <script>
  	$(function() {
  		function fixButtonTypeIE9() {
  			$('button').each(function(index, button) {
diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl
index cd7dc12098..6409879b1b 100644
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -59,7 +59,7 @@
 					</aside>
 					
 					{if $sidebarOrientation|isset && $sidebarOrientation == 'right'}
-						<script type="text/javascript">
+						<script>
 							//<![CDATA[
 							$(function() {
 								new WCF.Collapsible.Sidebar();
diff --git a/com.woltlab.wcf/templates/ignoredUsers.tpl b/com.woltlab.wcf/templates/ignoredUsers.tpl
index f70ad26b12..a3f45604fb 100644
--- a/com.woltlab.wcf/templates/ignoredUsers.tpl
+++ b/com.woltlab.wcf/templates/ignoredUsers.tpl
@@ -4,7 +4,7 @@
 	<title>{lang}wcf.user.ignoredUsers{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
 	{include file='headInclude'}
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Action.Delete('wcf\\data\\user\\ignore\\UserIgnoreAction', '.jsIgnoredUser');
diff --git a/com.woltlab.wcf/templates/imageViewer.tpl b/com.woltlab.wcf/templates/imageViewer.tpl
index b59ffd6324..d21b01753d 100644
--- a/com.woltlab.wcf/templates/imageViewer.tpl
+++ b/com.woltlab.wcf/templates/imageViewer.tpl
@@ -1,7 +1,7 @@
 {if !$__imageViewerLoaded|isset}
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/slimbox2.min.js"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.ImageViewer{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript">
+	<script src="{@$__wcf->getPath()}js/3rdParty/slimbox2.min.js"></script>
+	<script src="{@$__wcf->getPath()}js/WCF.ImageViewer{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+	<script>
 		//<![CDATA[
 		var $imageViewer = null;
 		$(function() {
diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl
index 577656bc90..999d7d731d 100644
--- a/com.woltlab.wcf/templates/login.tpl
+++ b/com.woltlab.wcf/templates/login.tpl
@@ -5,8 +5,8 @@
 	
 	{include file='headInclude'}
 	
-	<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript">
+	<script src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.User.Login(false);
diff --git a/com.woltlab.wcf/templates/lostPassword.tpl b/com.woltlab.wcf/templates/lostPassword.tpl
index 7be49bfce7..706a9cb7bb 100644
--- a/com.woltlab.wcf/templates/lostPassword.tpl
+++ b/com.woltlab.wcf/templates/lostPassword.tpl
@@ -4,8 +4,8 @@
 	<title>{lang}wcf.user.lostPassword{/lang} - {PAGE_TITLE|language}</title>
 	{include file='headInclude'}
 	
-	<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript">
+	<script src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.User.Registration.LostPassword();
diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index 91cd06673e..e5b71eaf2a 100644
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -14,7 +14,7 @@
 	{/if}
 	<link rel="canonical" href="{link controller='MembersList'}{if $pageNo > 1}pageNo={@$pageNo}&{/if}{@$canonicalURLParameters}{/link}" />
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 			$(function() {
 				WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/messageFormAttachments.tpl b/com.woltlab.wcf/templates/messageFormAttachments.tpl
index 4aeffef962..e1a87b7df2 100644
--- a/com.woltlab.wcf/templates/messageFormAttachments.tpl
+++ b/com.woltlab.wcf/templates/messageFormAttachments.tpl
@@ -33,8 +33,8 @@
 	{event name='fields'}
 </div>
 
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Attachment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}js/WCF.Attachment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/messageFormMultilingualism.tpl b/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
index bcfa5681c2..ad7a3b408b 100644
--- a/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
+++ b/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
@@ -12,7 +12,7 @@
 		</dd>
 	</dl>
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			var $languages = {
diff --git a/com.woltlab.wcf/templates/messageFormPreviewButton.tpl b/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
index b175ced1bf..ca209a81c1 100644
--- a/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
+++ b/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
@@ -1,6 +1,6 @@
 <button id="previewButton" class="jsOnly" accesskey="p">{lang}wcf.global.button.preview{/lang}</button>
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/messageFormSmilies.tpl b/com.woltlab.wcf/templates/messageFormSmilies.tpl
index d7c7e7cdf0..6a48c2e798 100644
--- a/com.woltlab.wcf/templates/messageFormSmilies.tpl
+++ b/com.woltlab.wcf/templates/messageFormSmilies.tpl
@@ -27,7 +27,7 @@
 			{/if}
 		{/foreach}
 		
-		<script type="text/javascript">
+		<script>
 			//<![CDATA[
 			$(function() {
 				new WCF.Message.SmileyCategories();
@@ -40,7 +40,7 @@
 	
 	{event name='fields'}
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Message.Smilies('{if $wysiwygSelector|isset}{$wysiwygSelector|encodeJS}{else}text{/if}');
diff --git a/com.woltlab.wcf/templates/messageFormTabs.tpl b/com.woltlab.wcf/templates/messageFormTabs.tpl
index b81e937a97..f3e8d33a35 100644
--- a/com.woltlab.wcf/templates/messageFormTabs.tpl
+++ b/com.woltlab.wcf/templates/messageFormTabs.tpl
@@ -18,7 +18,7 @@
 	{event name='tabMenuContents'}
 </div>
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		if (jQuery.browser.mobile) $('#smiliesTab, #smilies').remove();
diff --git a/com.woltlab.wcf/templates/messageOptionType.tpl b/com.woltlab.wcf/templates/messageOptionType.tpl
index 15009ac8c0..79571b400a 100644
--- a/com.woltlab.wcf/templates/messageOptionType.tpl
+++ b/com.woltlab.wcf/templates/messageOptionType.tpl
@@ -1,7 +1,7 @@
 <textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10">{$value}</textarea>
 {include file='wysiwyg' wysiwygSelector=$option->optionName}
 
-<script type="text/javascript">
+<script>
 //<![CDATA[
 $(function() {
 	$('#{$option->optionName}').parents('dl:eq(0)').addClass('wide');
diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index 559eb30b05..df5c933130 100644
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -1,5 +1,5 @@
 {if !$__messageSidebarJavascript|isset}
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/messageUserOptionOutput.tpl b/com.woltlab.wcf/templates/messageUserOptionOutput.tpl
index 0260af3b0e..4b46481301 100644
--- a/com.woltlab.wcf/templates/messageUserOptionOutput.tpl
+++ b/com.woltlab.wcf/templates/messageUserOptionOutput.tpl
@@ -5,7 +5,7 @@
 		{/content}
 	</div>
 	
-	<script type="text/javascript">
+	<script>
 	//<![CDATA[
 	$(function() {
 		$('#{$option->optionName}').parents('dl:eq(0)').addClass('wide');
diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index 010f00cb50..1ddd77cb5e 100644
--- a/com.woltlab.wcf/templates/moderationActivation.tpl
+++ b/com.woltlab.wcf/templates/moderationActivation.tpl
@@ -5,8 +5,8 @@
 	
 	{include file='headInclude'}
 	
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript">
+	<script src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Moderation.Activation.Management({@$queue->queueID}, '{link controller='ModerationList'}{/link}');
diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index b4a3432d04..f2d52bff5e 100644
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -5,8 +5,8 @@
 	
 	{include file='headInclude'}
 	
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript">
+	<script src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Moderation.Report.Management({@$queue->queueID}, '{link controller='ModerationList'}{/link}');
diff --git a/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl b/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl
index 2a4a32a834..22ea3e1bf0 100644
--- a/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl
+++ b/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl
@@ -1,5 +1,5 @@
 {if !$forceSelection|isset}{assign var=forceSelection value=false}{/if}
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index 373b496556..3fac798d58 100644
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -4,7 +4,7 @@
 	<title>{lang}wcf.user.notification.notifications{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
 	{include file='headInclude'}
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/notificationSettings.tpl b/com.woltlab.wcf/templates/notificationSettings.tpl
index dbb021ad2a..3c805b163b 100644
--- a/com.woltlab.wcf/templates/notificationSettings.tpl
+++ b/com.woltlab.wcf/templates/notificationSettings.tpl
@@ -5,7 +5,7 @@
 	
 	{include file='headInclude'}
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			$('#notificationSettings > fieldset > dl > dd > label > input').each(function(index, value) {
diff --git a/com.woltlab.wcf/templates/poll.tpl b/com.woltlab.wcf/templates/poll.tpl
index 9810cb7341..a352b3a844 100644
--- a/com.woltlab.wcf/templates/poll.tpl
+++ b/com.woltlab.wcf/templates/poll.tpl
@@ -1,7 +1,7 @@
 {if $__wcf->getUser()->userID && !$__pollLoadedJavaScript|isset}
 	{assign var=__pollLoadedJavaScript value=true}
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript">
+	<script src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Poll.Manager('.pollContainer');
diff --git a/com.woltlab.wcf/templates/recaptcha.tpl b/com.woltlab.wcf/templates/recaptcha.tpl
index c8aa647afc..d801058603 100644
--- a/com.woltlab.wcf/templates/recaptcha.tpl
+++ b/com.woltlab.wcf/templates/recaptcha.tpl
@@ -3,7 +3,7 @@
 	<small>{lang}wcf.recaptcha.description{/lang}</small>
 	
 	<dl class="wide reCaptcha{if $errorField == 'recaptchaString'} formError{/if}">
-		<script type="text/javascript">
+		<script>
 			//<![CDATA[
 			var RecaptchaOptions = {
 				lang: '{@$recaptchaLanguageCode}',
@@ -37,7 +37,7 @@
 			</ul>
 		</dd>
 		
-		<script type="text/javascript" src="http{if $recaptchaUseSSL}s{/if}://www.google.com/recaptcha/api/challenge?k={$recaptchaPublicKey}"></script>
+		<script src="http{if $recaptchaUseSSL}s{/if}://www.google.com/recaptcha/api/challenge?k={$recaptchaPublicKey}"></script>
 		<noscript>
 			<dd>
 				<iframe src="http{if $recaptchaUseSSL}s{/if}://www.google.com/recaptcha/api/noscript?k={$recaptchaPublicKey}" height="300" width="500" seamless="seamless"></iframe><br />
diff --git a/com.woltlab.wcf/templates/recentActivities.tpl b/com.woltlab.wcf/templates/recentActivities.tpl
index 713c5b4555..2130cf86cc 100644
--- a/com.woltlab.wcf/templates/recentActivities.tpl
+++ b/com.woltlab.wcf/templates/recentActivities.tpl
@@ -1,5 +1,5 @@
 {hascontent}
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/recentActivityList.tpl b/com.woltlab.wcf/templates/recentActivityList.tpl
index 8cfcc4b6fd..e6f200257d 100644
--- a/com.woltlab.wcf/templates/recentActivityList.tpl
+++ b/com.woltlab.wcf/templates/recentActivityList.tpl
@@ -7,7 +7,7 @@
 	
 	<link rel="canonical" href="{link controller='RecentActivityList'}{/link}" />
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index a1dac1c8ac..6d8aea3b74 100644
--- a/com.woltlab.wcf/templates/register.tpl
+++ b/com.woltlab.wcf/templates/register.tpl
@@ -4,8 +4,8 @@
 	<title>{lang}wcf.user.register{/lang} - {PAGE_TITLE|language}</title>
 	{include file='headInclude'}
 	
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript">
+	<script src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+	<script>
 		//<![CDATA[
 		$(function() {
 			WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl
index dc94079699..f718916229 100644
--- a/com.woltlab.wcf/templates/search.tpl
+++ b/com.woltlab.wcf/templates/search.tpl
@@ -110,7 +110,7 @@
 					
 					{include file=$objectType->getFormTemplateName() application=$objectType->getApplication()}
 					
-					<script type="text/javascript">
+					<script>
 						//<![CDATA[
 						$(function() {
 							$('#{@$__jsID}').click(function() {
@@ -133,7 +133,7 @@
 
 {include file='footer'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Search.User($('#searchAuthor'), function(data) {
diff --git a/com.woltlab.wcf/templates/searchArea.tpl b/com.woltlab.wcf/templates/searchArea.tpl
index a6427880a1..c0e061c7a4 100644
--- a/com.woltlab.wcf/templates/searchArea.tpl
+++ b/com.woltlab.wcf/templates/searchArea.tpl
@@ -25,8 +25,8 @@
 	</form>
 </aside>
 
-<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.Search.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath('wcf')}js/WCF.Search.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Search.Message.SearchArea($('#search'));
diff --git a/com.woltlab.wcf/templates/settings.tpl b/com.woltlab.wcf/templates/settings.tpl
index 1031376469..d88785a99f 100644
--- a/com.woltlab.wcf/templates/settings.tpl
+++ b/com.woltlab.wcf/templates/settings.tpl
@@ -43,7 +43,7 @@
 					<dl>
 						<dt><label>{lang}wcf.user.language{/lang}</label></dt>
 						<dd id="languageIDContainer">
-							<script type="text/javascript">
+							<script>
 								//<![CDATA[
 								$(function() {
 									var $languages = {
diff --git a/com.woltlab.wcf/templates/shareButtons.tpl b/com.woltlab.wcf/templates/shareButtons.tpl
index 83514dc660..55808ec5a8 100644
--- a/com.woltlab.wcf/templates/shareButtons.tpl
+++ b/com.woltlab.wcf/templates/shareButtons.tpl
@@ -32,7 +32,7 @@
 		{event name='buttons'}
 	</ul>
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/signatureEdit.tpl b/com.woltlab.wcf/templates/signatureEdit.tpl
index c7a2821086..2bba8eab0b 100644
--- a/com.woltlab.wcf/templates/signatureEdit.tpl
+++ b/com.woltlab.wcf/templates/signatureEdit.tpl
@@ -5,7 +5,7 @@
 	
 	{include file='headInclude'}
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/sitemap.tpl b/com.woltlab.wcf/templates/sitemap.tpl
index 4a752c2049..5fe6d06856 100644
--- a/com.woltlab.wcf/templates/sitemap.tpl
+++ b/com.woltlab.wcf/templates/sitemap.tpl
@@ -18,7 +18,7 @@
 			{/foreach}
 		</div>
 		
-		<script type="text/javascript">
+		<script>
 			//<![CDATA[
 			$(function() {
 				// fix anchor
diff --git a/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl b/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
index 515e214585..ff6be9d1d4 100644
--- a/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
+++ b/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
@@ -11,7 +11,7 @@
 </div>
 
 <!-- begin:parser_nonessential -->
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		var $spoilerBox = $('.jsSpoilerBox').removeClass('jsSpoilerBox');
diff --git a/com.woltlab.wcf/templates/tagInput.tpl b/com.woltlab.wcf/templates/tagInput.tpl
index b81ac0b56d..8cea3fecc7 100644
--- a/com.woltlab.wcf/templates/tagInput.tpl
+++ b/com.woltlab.wcf/templates/tagInput.tpl
@@ -6,8 +6,8 @@
 		<small>{lang}wcf.tagging.tags.description{/lang}</small>
 	</dd>
 </dl>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		var $tagList = new WCF.Tagging.TagList('#tagList{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}', '#tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}', {@TAGGING_MAX_TAG_LENGTH});
diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl
index 940eb52061..f8174dbcae 100644
--- a/com.woltlab.wcf/templates/team.tpl
+++ b/com.woltlab.wcf/templates/team.tpl
@@ -7,7 +7,7 @@
 	
 	<link rel="canonical" href="{link controller='Team'}{/link}" />
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 			$(function() {
 				WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/textI18nOptionType.tpl b/com.woltlab.wcf/templates/textI18nOptionType.tpl
index 8caccffa7c..bd92a3713a 100644
--- a/com.woltlab.wcf/templates/textI18nOptionType.tpl
+++ b/com.woltlab.wcf/templates/textI18nOptionType.tpl
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
diff --git a/com.woltlab.wcf/templates/textareaI18nOptionType.tpl b/com.woltlab.wcf/templates/textareaI18nOptionType.tpl
index ecc8981bc2..18d22971e4 100644
--- a/com.woltlab.wcf/templates/textareaI18nOptionType.tpl
+++ b/com.woltlab.wcf/templates/textareaI18nOptionType.tpl
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 59f2854e89..8a735a0039 100644
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -7,9 +7,9 @@
 	
 	<link rel="canonical" href="{link controller='User' object=$user}{/link}" />
 	
-	<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+	<script src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 	{event name='javascriptInclude'}
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			{if $__wcf->getUser()->userID && $__wcf->getUser()->userID != $user->userID}
diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl
index 7d7052c159..f444cf7ffb 100644
--- a/com.woltlab.wcf/templates/userException.tpl
+++ b/com.woltlab.wcf/templates/userException.tpl
@@ -12,7 +12,7 @@
 <p id="errorMessage" class="error">
 	{@$message}
 </p>
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	if (document.referrer) {
 		$('#errorMessage').append('<br /><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 
diff --git a/com.woltlab.wcf/templates/userMenuSidebar.tpl b/com.woltlab.wcf/templates/userMenuSidebar.tpl
index 42d0a9733b..936466c859 100644
--- a/com.woltlab.wcf/templates/userMenuSidebar.tpl
+++ b/com.woltlab.wcf/templates/userMenuSidebar.tpl
@@ -1,7 +1,7 @@
 {capture assign='sidebar'}
 	{assign var=__userMenuActiveItems value=$__wcf->getUserMenu()->getActiveMenuItems()}
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			// mobile safari hover workaround
diff --git a/com.woltlab.wcf/templates/userPanel.tpl b/com.woltlab.wcf/templates/userPanel.tpl
index 2e012225db..d39fff4207 100644
--- a/com.woltlab.wcf/templates/userPanel.tpl
+++ b/com.woltlab.wcf/templates/userPanel.tpl
@@ -31,7 +31,7 @@
 	{if !$__hideUserMenu|isset}
 		<li id="userNotifications" data-count="{#$__wcf->getUserNotificationHandler()->getNotificationCount()}">
 			<a href="{link controller='NotificationList'}{/link}"><span class="icon icon16 icon-bell-alt"></span> <span>{lang}wcf.user.notification.notifications{/lang}</span>{if $__wcf->getUserNotificationHandler()->getNotificationCount()} <span class="badge badgeInverse">{#$__wcf->getUserNotificationHandler()->getNotificationCount()}</span>{/if}</a>
-			<script type="text/javascript">
+			<script>
 				//<![CDATA[
 				$(function() {
 					WCF.Language.addObject({
@@ -133,7 +133,7 @@
 				</form>
 			</div>
 			
-			<script type="text/javascript">
+			<script>
 				//<![CDATA[
 				$(function() {
 					WCF.Language.addObject({
@@ -149,7 +149,7 @@
 	{/if}
 	{if $__wcf->getLanguage()->getLanguages()|count > 1}
 		<li id="pageLanguageContainer">
-			<script type="text/javascript">
+			<script>
 				//<![CDATA[
 				$(function() {
 					var $languages = {
@@ -182,8 +182,8 @@
 				<span>{lang}wcf.moderation.moderation{/lang}</span>
 				{if $__wcf->getModerationQueueManager()->getOutstandingModerationCount()}<span class="badge badgeInverse">{#$__wcf->getModerationQueueManager()->getOutstandingModerationCount()}</span>{/if}
 			</a>
-			<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-			<script type="text/javascript">
+			<script src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+			<script>
 				//<![CDATA[
 				$(function() {
 					WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/userProfilePreview.tpl b/com.woltlab.wcf/templates/userProfilePreview.tpl
index fa8a2c86fb..f3f3f27ae6 100644
--- a/com.woltlab.wcf/templates/userProfilePreview.tpl
+++ b/com.woltlab.wcf/templates/userProfilePreview.tpl
@@ -2,7 +2,7 @@
 	<a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(128)}</a>
 	
 	{if $__wcf->getUser()->userID && $__wcf->getUser()->userID != $user->userID}
-		<script type="text/javascript">
+		<script>
 			//<![CDATA[
 				$(function() {
 					WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/userSearch.tpl b/com.woltlab.wcf/templates/userSearch.tpl
index db534a1ddb..42505c9bcf 100644
--- a/com.woltlab.wcf/templates/userSearch.tpl
+++ b/com.woltlab.wcf/templates/userSearch.tpl
@@ -5,7 +5,7 @@
 	
 	{include file='headInclude'}
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Search.User('#username', null, false, [ ], false);
diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index 3b11d2e8e9..02ea8c79e9 100644
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -7,7 +7,7 @@
 	
 	<link rel="canonical" href="{link controller='UsersOnlineList'}{/link}" />
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 			$(function() {
 				WCF.Language.addObject({
diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index c89e28f720..44422ec9a9 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -1,14 +1,14 @@
-<script type="text/javascript">
+<script>
 //<![CDATA[
 	var CKEDITOR_BASEPATH = '{@$__wcf->getPath()}js/3rdParty/ckeditor/';
 	var __CKEDITOR_BUTTONS = [ {implode from=$__wcf->getBBCodeHandler()->getButtonBBCodes() item=__bbcode}{ icon: '../../../icon/{$__bbcode->wysiwygIcon}', label: '{$__bbcode->buttonLabel|language}', name: '{$__bbcode->bbcodeTag}' }{/implode} ];
 //]]>
 </script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/ckeditor/ckeditor.js"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/ckeditor/adapters/jquery.js"></script>
+<script src="{@$__wcf->getPath()}js/3rdParty/ckeditor/ckeditor.js"></script>
+<script src="{@$__wcf->getPath()}js/3rdParty/ckeditor/adapters/jquery.js"></script>
 {event name='javascriptIncludes'}
 
-<script type="text/javascript">
+<script>
 //<![CDATA[
 $(function() {
 	if ($.browser.mobile) {
diff --git a/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl b/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl
index 897fd83d67..645f5249bd 100644
--- a/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl
+++ b/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		{if $aclValues[$objectTypeID]|isset}
diff --git a/wcfsetup/install/files/acp/templates/aclPermissions.tpl b/wcfsetup/install/files/acp/templates/aclPermissions.tpl
index 044330f729..a2434ed10a 100644
--- a/wcfsetup/install/files/acp/templates/aclPermissions.tpl
+++ b/wcfsetup/install/files/acp/templates/aclPermissions.tpl
@@ -1,5 +1,5 @@
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.ACL.js"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}js/WCF.ACL.js"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/wcfsetup/install/files/acp/templates/applicationEdit.tpl b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
index e8ce28f16a..e9d310e0b6 100644
--- a/wcfsetup/install/files/acp/templates/applicationEdit.tpl
+++ b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.application.edit'}
 
 {if $application->packageID != 1 && !$application->isPrimary}
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			WCF.Language.addObject({
diff --git a/wcfsetup/install/files/acp/templates/attachmentList.tpl b/wcfsetup/install/files/acp/templates/attachmentList.tpl
index c32f3fd80a..1e0c0c4cfd 100644
--- a/wcfsetup/install/files/acp/templates/attachmentList.tpl
+++ b/wcfsetup/install/files/acp/templates/attachmentList.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.attachment.list'}
 
 {include file='imageViewer'}
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\attachment\\AttachmentAction', '.jsAttachmentRow');
diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
index 193c720399..0079bb019c 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
@@ -33,7 +33,7 @@
 		{event name='attributeFields'}
 	</fieldset>
 {/capture}
-<script type="text/javascript">
+<script>
 //<![CDATA[
 	$(function() {
 		$('.jsDeleteButton').click(function (event) {
diff --git a/wcfsetup/install/files/acp/templates/bbcodeList.tpl b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
index f1449fb04f..d2dd73b513 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeList.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
 	<h1>{lang}wcf.acp.bbcode.list{/lang}</h1>
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Action.Delete('wcf\\data\\bbcode\\BBCodeAction', '.jsBBCodeRow');
diff --git a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
index 101d3bb915..08414d990e 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
 	<h1>{lang}wcf.acp.bbcode.mediaProvider.list{/lang}</h1>
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Action.Delete('wcf\\data\\bbcode\\media\\provider\\BBCodeMediaProviderAction', '.jsMediaProviderRow');
diff --git a/wcfsetup/install/files/acp/templates/benchmark.tpl b/wcfsetup/install/files/acp/templates/benchmark.tpl
index a118ec3169..42259ffc3c 100644
--- a/wcfsetup/install/files/acp/templates/benchmark.tpl
+++ b/wcfsetup/install/files/acp/templates/benchmark.tpl
@@ -1,7 +1,7 @@
 <p class="marginTop" id="benchmark"><small>Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</small></p>
 
 {if ENABLE_DEBUG_MODE}	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			$('#benchmarkDetails > li > span').click(function() {
@@ -23,7 +23,7 @@
 		{/foreach}
 	</ul>
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			$('#benchmark').click(function() {
diff --git a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
index c8e5aeb9e1..314f7d10c1 100644
--- a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
@@ -1,7 +1,7 @@
 <input type="number" id="{$option->optionName}_age_from" name="values[{$option->optionName}][ageFrom]" value="{@$valueAgeFrom}" placeholder="{lang}wcf.user.birthday.age.from{/lang}" min="0" max="120" class="tiny" />
 <input type="number" id="{$option->optionName}_age_to" name="values[{$option->optionName}][ageTo]" value="{@$valueAgeTo}" placeholder="{lang}wcf.user.birthday.age.to{/lang}" min="0" max="120" class="tiny" />
 
-<script type="text/javascript">
+<script>
 //<![CDATA[
 $(function() {
 	$('#{$option->optionName}_age_from').parents('dl:eq(0)').find('> dt > label').text('{lang}wcf.user.birthday.age{/lang}').attr('for', '{$option->optionName}_age_from');
diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index f02a6eb342..743ceffce1 100644
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.cache.list'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Collapsible.Simple.init();
diff --git a/wcfsetup/install/files/acp/templates/categoryList.tpl b/wcfsetup/install/files/acp/templates/categoryList.tpl
index 9ce3114182..a9f0f4e3a6 100644
--- a/wcfsetup/install/files/acp/templates/categoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryList.tpl
@@ -1,7 +1,7 @@
 {include file='header'}
 
 {if $categoryNodeList->hasChildren()}
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			{if $collapsibleObjectTypeID}
diff --git a/wcfsetup/install/files/acp/templates/codemirror.tpl b/wcfsetup/install/files/acp/templates/codemirror.tpl
index 12f5c353c2..ab30233d72 100644
--- a/wcfsetup/install/files/acp/templates/codemirror.tpl
+++ b/wcfsetup/install/files/acp/templates/codemirror.tpl
@@ -1,13 +1,13 @@
 {if !$codemirrorLoaded|isset}
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/codemirror/codemirror.js"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/dialog/dialog.js"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/search/searchcursor.js"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/search/search.js"></script>
+	<script src="{@$__wcf->getPath()}js/3rdParty/codemirror/codemirror.js"></script>
+	<script src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/dialog/dialog.js"></script>
+	<script src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/search/searchcursor.js"></script>
+	<script src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/search/search.js"></script>
 {/if}
-{if $codemirrorMode|isset}<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/{$codemirrorMode}/{$codemirrorMode}.js"></script>{/if}
+{if $codemirrorMode|isset}<script src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/{$codemirrorMode}/{$codemirrorMode}.js"></script>{/if}
 {event name='javascriptIncludes'}
 
-<script type="text/javascript">
+<script>
 //<![CDATA[
 	{if !$codemirrorLoaded|isset}
 		$('<link rel="stylesheet" href="{@$__wcf->getPath()}js/3rdParty/codemirror/codemirror.css" />').appendTo('head');
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 6c5c404fea..766ebea64a 100644
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -5,7 +5,7 @@
 	<p>{lang}wcf.acp.cronjob.subtitle{/lang}</p>
 </header>
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\cronjob\\CronjobAction', '.jsCronjobRow');
diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 69133c9aa0..0cc39e5211 100644
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.cronjob.log'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/wcfsetup/install/files/acp/templates/dashboardOption.tpl b/wcfsetup/install/files/acp/templates/dashboardOption.tpl
index d14b57fdd7..15f432c967 100644
--- a/wcfsetup/install/files/acp/templates/dashboardOption.tpl
+++ b/wcfsetup/install/files/acp/templates/dashboardOption.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.dashboard.option'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.TabMenu.init();
@@ -77,7 +77,7 @@
 				<button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
 			</div>
 			
-			<script type="text/javascript">
+			<script>
 				//<![CDATA[
 				$(function() {
 					new WCF.Sortable.List('dashboard-content', 'wcf\\data\\dashboard\\box\\DashboardBoxAction', 0, { }, true, { boxType: 'content', objectTypeID: {@$objectTypeID} });
@@ -125,7 +125,7 @@
 				<button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
 			</div>
 			
-			<script type="text/javascript">
+			<script>
 				//<![CDATA[
 				$(function() {
 					new WCF.Sortable.List('dashboard-sidebar', 'wcf\\data\\dashboard\\box\\DashboardBoxAction', 0, { }, true, { boxType: 'sidebar', objectTypeID: {@$objectTypeID} });
diff --git a/wcfsetup/install/files/acp/templates/dataImport.tpl b/wcfsetup/install/files/acp/templates/dataImport.tpl
index 987bfe7eb8..bdd6997c7b 100644
--- a/wcfsetup/install/files/acp/templates/dataImport.tpl
+++ b/wcfsetup/install/files/acp/templates/dataImport.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.dataImport'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		{if $queue|isset}
diff --git a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
index 22dbd8415f..609aeb79df 100644
--- a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
+++ b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
@@ -1,5 +1,5 @@
 {include file='header' pageTitle='wcf.acp.exceptionLog'}
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		{if $exceptionID}window.location.hash = '{$exceptionID|encodeJS}';{/if}
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index e9e4162674..6e240d6fd1 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -4,7 +4,7 @@
 	<base href="{$baseHref}" />
 	<meta charset="utf-8" />
 	<title>{if $pageTitle|isset}{@$pageTitle|language} - {/if}{lang}wcf.global.acp{/lang}{if PACKAGE_ID} - {PAGE_TITLE|language}{/if}</title>
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		var SID_ARG_2ND = '{@SID_ARG_2ND_NOT_ENCODED}';
 		var WCF_PATH = '{@$__wcf->getPath()}';
@@ -13,13 +13,13 @@
 		var TIME_NOW = {@TIME_NOW};
 		//]]>
 	</script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}acp/js/WCF.ACP.js?v={@$__wcfVersion}"></script>
-	<script type="text/javascript">
+	<script src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"></script>
+	<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"></script>
+	<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js?v={@$__wcfVersion}"></script>
+	<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js?v={@$__wcfVersion}"></script>
+	<script src="{@$__wcf->getPath()}js/WCF.js?v={@$__wcfVersion}"></script>
+	<script src="{@$__wcf->getPath()}acp/js/WCF.ACP.js?v={@$__wcfVersion}"></script>
+	<script>
 		//<![CDATA[
 		WCF.User.init({$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');
 		//]]>
@@ -30,7 +30,7 @@
 	{@$__wcf->getStyleHandler()->getStylesheet()}
 	{event name='stylesheets'}
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			{* work-around for unknown core-object during WCFSetup *}
diff --git a/wcfsetup/install/files/acp/templates/imageViewer.tpl b/wcfsetup/install/files/acp/templates/imageViewer.tpl
index 72c51f6111..d41fa9e272 100644
--- a/wcfsetup/install/files/acp/templates/imageViewer.tpl
+++ b/wcfsetup/install/files/acp/templates/imageViewer.tpl
@@ -1,7 +1,7 @@
 {if !$__imageViewerLoaded|isset}
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/slimbox2.min.js"></script>
-	<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.ImageViewer.js"></script>
-	<script type="text/javascript">
+	<script src="{@$__wcf->getPath()}js/3rdParty/slimbox2.min.js"></script>
+	<script src="{@$__wcf->getPath()}js/WCF.ImageViewer.js"></script>
+	<script>
 		//<![CDATA[
 		var $imageViewer = null;
 		$(function() {
diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl
index cb09902e7f..df70ba1913 100644
--- a/wcfsetup/install/files/acp/templates/index.tpl
+++ b/wcfsetup/install/files/acp/templates/index.tpl
@@ -1,6 +1,6 @@
 {include file='header'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.TabMenu.init();
diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index abfddde241..4e992c391b 100644
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -1,6 +1,6 @@
 {include file='header'}
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
index 2cf58522fa..11fa040b3f 100644
--- a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
@@ -1,8 +1,8 @@
 {include file='header'}
 
 {include file='aclPermissions'}
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.ACL.List($('#groupPermissions'), {@$objectTypeID}{if $groupID|isset}, '', {@$groupID}{/if});
diff --git a/wcfsetup/install/files/acp/templates/labelGroupList.tpl b/wcfsetup/install/files/acp/templates/labelGroupList.tpl
index 21e5d88643..7af3305b2c 100644
--- a/wcfsetup/install/files/acp/templates/labelGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupList.tpl
@@ -1,6 +1,6 @@
 {include file='header'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\label\\group\\LabelGroupAction', '.jsLabelGroupRow');
diff --git a/wcfsetup/install/files/acp/templates/labelList.tpl b/wcfsetup/install/files/acp/templates/labelList.tpl
index 48dc4ded27..a21e7c807e 100644
--- a/wcfsetup/install/files/acp/templates/labelList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelList.tpl
@@ -1,6 +1,6 @@
 {include file='header'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\label\\LabelAction', '.jsLabelRow');
diff --git a/wcfsetup/install/files/acp/templates/languageItemList.tpl b/wcfsetup/install/files/acp/templates/languageItemList.tpl
index fec2b07b97..61af39f9bc 100644
--- a/wcfsetup/install/files/acp/templates/languageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemList.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle="wcf.acp.language.item.list"}
 
-<script type="text/javascript" src="{@$__wcf->getPath()}acp/js/WCF.ACP.Language.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}acp/js/WCF.ACP.Language.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.ACP.Language.ItemList();
diff --git a/wcfsetup/install/files/acp/templates/languageList.tpl b/wcfsetup/install/files/acp/templates/languageList.tpl
index 4274798cfe..91414274dd 100644
--- a/wcfsetup/install/files/acp/templates/languageList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.language.list'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\language\\LanguageAction', '.jsLanguageRow');
diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
index ef5dc01590..40fe92a017 100644
--- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
+++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.language.multilingualism'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		var $languageIDs = $('#languageIDs');
diff --git a/wcfsetup/install/files/acp/templates/languageServerList.tpl b/wcfsetup/install/files/acp/templates/languageServerList.tpl
index e423d17cdb..67b3d89d04 100644
--- a/wcfsetup/install/files/acp/templates/languageServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageServerList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.languageServer.list'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\language\\server\\LanguageServerAction', '.jsLanguageServerRow');
diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index fce276da15..cbaa9e2645 100644
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.user.login'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		if (!$('#username').val() || '{$errorField}' == 'username') {
diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index a16198e8f4..62d9e39f50 100644
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.masterPassword.enter'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		$('#masterPassword').focus();
diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index cdf67a4a6d..2dfd6fc16b 100644
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.masterPassword.init'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		$('#setPassword').click(function() {
diff --git a/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl b/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl
index 57b8d55c7e..022dc01a66 100644
--- a/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl
+++ b/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl
index 3813a6f2f3..15ed4034d5 100644
--- a/wcfsetup/install/files/acp/templates/option.tpl
+++ b/wcfsetup/install/files/acp/templates/option.tpl
@@ -2,7 +2,7 @@
 
 {event name='javascriptInclude'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.TabMenu.init();
diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index ff82d88bd9..0d4dc7ff55 100644
--- a/wcfsetup/install/files/acp/templates/package.tpl
+++ b/wcfsetup/install/files/acp/templates/package.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle=$package->getName()}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.TabMenu.init()
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index 8f28c0ee4a..4e52dbba09 100644
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -1,7 +1,7 @@
 {capture assign='pageTitle'}{lang}wcf.acp.package.{@$queue->action}.title{/lang}: {$archive->getLocalizedPackageInfo('packageName')}{/capture}
 {include file='header'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
index 2612d6f2e6..8618669896 100644
--- a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
@@ -1,6 +1,6 @@
 {include file='header' templateName='packageInstallationSetup'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.add('wcf.acp.package.install.title', '{lang}wcf.acp.package.install.title{/lang}');
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 28b5fb3998..74201d7f85 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.package.list'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
@@ -94,7 +94,7 @@
 		{@$pagesLinks}
 		
 		{hascontent}
-			<script type="text/javascript">
+			<script>
 				//<![CDATA[
 				$(function() {
 					new WCF.ACP.Package.Uninstallation($('.jsPluginContainer .jsUninstallButton'));
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 18a7f184cf..503b8d1464 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -5,7 +5,7 @@
 {/if}
 {include file='header'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index f8f72d3af9..480fffe98e 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.package.update.title'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
index adfde058fe..f494be9136 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.updateServer.list'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\package\\update\\server\\PackageUpdateServerAction', '.jsUpdateServerRow');
diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
index 4750e11f95..e8f3877f26 100644
--- a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.pageMenu.'|concat:$action}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		var $menuPosition = $('#menuPosition');
diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
index 07a53fd125..a470768f55 100644
--- a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.pageMenu.list'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\page\\menu\\item\\PageMenuItemAction', '.sortableNode', '> .sortableNodeLabel .jsDeleteButton');
diff --git a/wcfsetup/install/files/acp/templates/smileyList.tpl b/wcfsetup/install/files/acp/templates/smileyList.tpl
index 57c3c7d69d..a50644d91a 100644
--- a/wcfsetup/install/files/acp/templates/smileyList.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyList.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.smiley.list'}
 
 {if $objects|count}
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Action.Delete('wcf\\data\\smiley\\SmileyAction', $('.smileyRow'));
diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 0f44d3df99..91be3b83c2 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -1,8 +1,8 @@
 {include file='header' pageTitle='wcf.acp.style.'|concat:$action}
 
-<script type="text/javascript" src="{@$__wcf->getPath()}acp/js/WCF.ACP.Style.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.ColorPicker.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}acp/js/WCF.ACP.Style.js?v={@$__wcfVersion}"></script>
+<script src="{@$__wcf->getPath()}js/WCF.ColorPicker.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.ColorPicker('.jsColorPicker');
diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl
index 885afed46c..b7291c707a 100644
--- a/wcfsetup/install/files/acp/templates/styleExport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleExport.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.style.exportStyle'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		$('#exportAsPackage').change(function (event) {
diff --git a/wcfsetup/install/files/acp/templates/styleList.tpl b/wcfsetup/install/files/acp/templates/styleList.tpl
index 941403a472..40c3857caf 100644
--- a/wcfsetup/install/files/acp/templates/styleList.tpl
+++ b/wcfsetup/install/files/acp/templates/styleList.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.style.list'}
 
-<script type="text/javascript" src="{@$__wcf->getPath()}acp/js/WCF.ACP.Style.js?v={@$__wcfVersion}"></script>
-<script type="text/javascript">
+<script src="{@$__wcf->getPath()}acp/js/WCF.ACP.Style.js?v={@$__wcfVersion}"></script>
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Toggle('wcf\\data\\style\\StyleAction', '.buttonList');
diff --git a/wcfsetup/install/files/acp/templates/tagAdd.tpl b/wcfsetup/install/files/acp/templates/tagAdd.tpl
index 799a8d7361..c826629f1f 100644
--- a/wcfsetup/install/files/acp/templates/tagAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/tagAdd.tpl
@@ -79,8 +79,8 @@
 					</dd>
 				</dl>
 				
-				<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-				<script type="text/javascript">
+				<script src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+				<script>
 					//<![CDATA[
 					$(function() {
 						var $tagList = new WCF.Tagging.TagList('#synonymList', '#synonyms');
diff --git a/wcfsetup/install/files/acp/templates/tagList.tpl b/wcfsetup/install/files/acp/templates/tagList.tpl
index 11ad852106..1de04491a9 100644
--- a/wcfsetup/install/files/acp/templates/tagList.tpl
+++ b/wcfsetup/install/files/acp/templates/tagList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.tag.list'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\tag\\TagAction', '.jsTagRow');
diff --git a/wcfsetup/install/files/acp/templates/templateGroupList.tpl b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
index bdd9a170b3..47c5fbf69b 100644
--- a/wcfsetup/install/files/acp/templates/templateGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
 	<h1>{lang}wcf.acp.template.group.list{/lang}</h1>
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Action.Delete('wcf\\data\\template\\group\\TemplateGroupAction', '.jsTemplateGroupRow');
diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl
index 7905137ec9..e68bd3b2dd 100644
--- a/wcfsetup/install/files/acp/templates/templateList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle="wcf.acp.template.list"}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\template\\TemplateAction', '.jsTemplateRow');
diff --git a/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
index 8caccffa7c..bd92a3713a 100644
--- a/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
diff --git a/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl b/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
index ecc8981bc2..18d22971e4 100644
--- a/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
diff --git a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
index d6eeed8317..366ef05c24 100644
--- a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.user.activityPoint.option'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		$('#updateCache').click(function () {
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 8d2d01c2d4..0d4ce3da38 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.user.'|concat:$action}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.TabMenu.init();
@@ -185,7 +185,7 @@
 					{event name='banFields'}
 				</fieldset>
 				
-				<script type="text/javascript">
+				<script>
 					//<![CDATA[
 					$('#banned').change(function (event) {
 						if ($('#banned').is(':checked')) {
@@ -306,7 +306,7 @@
 					</dl>
 				</fieldset>
 				
-				<script type="text/javascript">
+				<script>
 					//<![CDATA[
 					$('#disableSignature').change(function (event) {
 						if ($('#disableSignature').is(':checked')) {
@@ -382,9 +382,9 @@
 					</dl>
 				</fieldset>
 				
-				<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-				<script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-				<script type="text/javascript">
+				<script src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+				<script src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+				<script>
 					//<![CDATA[
 					$(function() {
 						$('#disableAvatar').change(function (event) {
diff --git a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
index e36ed4a1d5..10e94543b3 100644
--- a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.bulkProcessing'}
 
 {if $mailID|isset}
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.ACP.Worker('mail', 'wcf\\system\\worker\\MailWorker', '', {
@@ -12,7 +12,7 @@
 	</script>
 {/if}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		function toggleContainer(value) {
diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index fac1b5d58b..8b77f99fe5 100644
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.user.exportEmailAddress'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.ACP.Options();
diff --git a/wcfsetup/install/files/acp/templates/userException.tpl b/wcfsetup/install/files/acp/templates/userException.tpl
index 1516e703df..345c74cb8a 100644
--- a/wcfsetup/install/files/acp/templates/userException.tpl
+++ b/wcfsetup/install/files/acp/templates/userException.tpl
@@ -4,7 +4,7 @@
 	{@$message}
 </p>
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	if (document.referrer) {
 		$('#errorMessage').append('<br /><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 97309ced0b..5ef23e58a9 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.group.'|concat:$action}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.TabMenu.init();
diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index 24a23cff50..2c39122794 100644
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.group.list'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.Action.Delete('wcf\\data\\user\\group\\UserGroupAction', '.jsUserGroupRow');
diff --git a/wcfsetup/install/files/acp/templates/userGroupOption.tpl b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
index c11b569af7..2ad5e4295a 100644
--- a/wcfsetup/install/files/acp/templates/userGroupOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
@@ -1,6 +1,6 @@
 {include file='header'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		new WCF.ACP.Options.Group({if $canEditEveryone}true{else}false{/if});
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index 8cbd165008..0cca2fe22e 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -7,7 +7,7 @@
 {include file='header'}
 
 {event name='javascriptInclude'}
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		var actionObjects = { };
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 9017853955..a4f862429e 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -9,7 +9,7 @@
 {include file='header'}
 
 {if $mailID|isset}
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.ACP.Worker('mail', 'wcf\\system\\worker\\MailWorker', '', {
diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
index 7f96565771..6565770e2d 100644
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
 	<h1>{lang}wcf.acp.user.option.category.list{/lang}</h1>
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Action.Delete('wcf\\data\\user\\option\\category\\UserOptionCategoryAction', '.jsCategoryRow');
diff --git a/wcfsetup/install/files/acp/templates/userOptionList.tpl b/wcfsetup/install/files/acp/templates/userOptionList.tpl
index e3a71f7a50..c3d8a9edef 100644
--- a/wcfsetup/install/files/acp/templates/userOptionList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
 	<h1>{lang}wcf.acp.user.option.list{/lang}</h1>
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Action.Delete('wcf\\data\\user\\option\\UserOptionAction', '.jsOptionRow');
diff --git a/wcfsetup/install/files/acp/templates/userRankList.tpl b/wcfsetup/install/files/acp/templates/userRankList.tpl
index 42b0e7e8fd..e33e9002b3 100644
--- a/wcfsetup/install/files/acp/templates/userRankList.tpl
+++ b/wcfsetup/install/files/acp/templates/userRankList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
 	<h1>{lang}wcf.acp.user.rank.list{/lang}</h1>
 	
-	<script type="text/javascript">
+	<script>
 		//<![CDATA[
 		$(function() {
 			new WCF.Action.Delete('wcf\\data\\user\\rank\\UserRankAction', '.jsUserRankRow');
diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 169301b3b4..5da912c9f6 100644
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.user.search'}
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	$(function() {
 		WCF.TabMenu.init();
diff --git a/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wsc/dialogs/ciframe.html b/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wsc/dialogs/ciframe.html
index 5cc9254c57..535014b549 100644
--- a/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wsc/dialogs/ciframe.html
+++ b/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wsc/dialogs/ciframe.html
@@ -7,7 +7,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 <head>
 	<title></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<script type="text/javascript">
+	<script>
 
 function gup( name )
 {
diff --git a/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
index 0d675f4d69..7c478feee3 100644
--- a/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
+++ b/wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
@@ -7,7 +7,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 <head>
 	<title></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<script type="text/javascript">
+	<script>
 
 function doLoadScript( url )
 {
diff --git a/wcfsetup/setup/template/stepInstallPackages.tpl b/wcfsetup/setup/template/stepInstallPackages.tpl
index 26969f18f8..09a55804e7 100644
--- a/wcfsetup/setup/template/stepInstallPackages.tpl
+++ b/wcfsetup/setup/template/stepInstallPackages.tpl
@@ -13,7 +13,7 @@
 	</div>
 </form>
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	window.onload = function() {
 		document.forms[0].submit();
diff --git a/wcfsetup/setup/template/stepNext.tpl b/wcfsetup/setup/template/stepNext.tpl
index d4c0182901..93da3a6e3a 100644
--- a/wcfsetup/setup/template/stepNext.tpl
+++ b/wcfsetup/setup/template/stepNext.tpl
@@ -22,7 +22,7 @@
 	</div>
 </form>
 
-<script type="text/javascript">
+<script>
 	//<![CDATA[
 	window.onload = function() {
 		document.forms[0].submit();
diff --git a/wcfsetup/setup/template/stepSearchWcfDir.tpl b/wcfsetup/setup/template/stepSearchWcfDir.tpl
index c087fc37b6..17757905e3 100644
--- a/wcfsetup/setup/template/stepSearchWcfDir.tpl
+++ b/wcfsetup/setup/template/stepSearchWcfDir.tpl
@@ -1,7 +1,7 @@
 {include file='header'}
 
-<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
-<script type="text/javascript">
+<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
+<script>
 	//<![CDATA[
 	if (window.jQuery) {
 		$(function() {
-- 
2.20.1