From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 14 Jun 2016 10:20:54 +0000 (+0200)
Subject: Revert "Revert "Removed obsolete trailing slashes from void elements""
X-Git-Tag: 3.0.0_Beta_1~1453
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e5f9b56cd266af136ed059cdff56041fddc96517;p=GitHub%2FWoltLab%2FWCF.git

Revert "Revert "Removed obsolete trailing slashes from void elements""

This reverts commit ef1f5b4a0268d7d70cc2bd4152853d59801660cf.
---

diff --git a/com.woltlab.wcf/templates/__messageFormPoll.tpl b/com.woltlab.wcf/templates/__messageFormPoll.tpl
index d2c32596d5..642c181709 100644
--- a/com.woltlab.wcf/templates/__messageFormPoll.tpl
+++ b/com.woltlab.wcf/templates/__messageFormPoll.tpl
@@ -18,7 +18,7 @@
 				<label for="pollQuestion">{lang}wcf.poll.question{/lang}</label>
 			</dt>
 			<dd>
-				<input type="text" name="pollQuestion" id="pollQuestion" value="{$pollQuestion}" class="long" maxlength="255" />
+				<input type="text" name="pollQuestion" id="pollQuestion" value="{$pollQuestion}" class="long" maxlength="255">
 				{if $errorField == 'pollQuestion'}
 					<small class="innerError">
 						{lang}wcf.global.form.error.empty{/lang}
@@ -43,7 +43,7 @@
 				<label for="pollEndTime">{lang}wcf.poll.endTime{/lang}</label>
 			</dt>
 			<dd>
-				<input type="datetime" name="pollEndTime" id="pollEndTime" value="{if $pollEndTime}{@$pollEndTime|date:'c'}{/if}" class="medium" data-ignore-timezone="true" />
+				<input type="datetime" name="pollEndTime" id="pollEndTime" value="{if $pollEndTime}{@$pollEndTime|date:'c'}{/if}" class="medium" data-ignore-timezone="true">
 				{if $errorField == 'pollEndTime'}
 					<small class="innerError">
 						{lang}wcf.poll.endTime.error.{@$errorType}{/lang}
@@ -56,7 +56,7 @@
 				<label for="pollMaxVotes">{lang}wcf.poll.maxVotes{/lang}</label>
 			</dt>
 			<dd>
-				<input type="number" name="pollMaxVotes" id="pollMaxVotes" value="{@$pollMaxVotes}" min="1" class="tiny" />
+				<input type="number" name="pollMaxVotes" id="pollMaxVotes" value="{@$pollMaxVotes}" min="1" class="tiny">
 				{if $errorField == 'pollMaxVotes'}
 					<small class="innerError">
 						{lang}wcf.poll.maxVotes.error.{@$errorType}{/lang}
@@ -67,19 +67,19 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="pollIsChangeable" value="1"{if $pollIsChangeable} checked="checked"{/if} /> {lang}wcf.poll.isChangeable{/lang}</label>
+				<label><input type="checkbox" name="pollIsChangeable" value="1"{if $pollIsChangeable} checked="checked"{/if}> {lang}wcf.poll.isChangeable{/lang}</label>
 			</dd>
 			{if !$pollID && $__wcf->getPollManager()->canStartPublicPoll()}
 				<dd>
-					<label><input type="checkbox" name="pollIsPublic" value="1"{if $pollIsPublic} checked="checked"{/if} /> {lang}wcf.poll.isPublic{/lang}</label>
+					<label><input type="checkbox" name="pollIsPublic" value="1"{if $pollIsPublic} checked="checked"{/if}> {lang}wcf.poll.isPublic{/lang}</label>
 				</dd>
 			{/if}
 			<dd>
-				<label><input type="checkbox" name="pollResultsRequireVote" value="1"{if $pollResultsRequireVote} checked="checked"{/if} /> {lang}wcf.poll.resultsRequireVote{/lang}</label>
+				<label><input type="checkbox" name="pollResultsRequireVote" value="1"{if $pollResultsRequireVote} checked="checked"{/if}> {lang}wcf.poll.resultsRequireVote{/lang}</label>
 				<small>{lang}wcf.poll.resultsRequireVote.description{/lang}</small>
 			</dd>
 			<dd>
-				<label><input type="checkbox" name="pollSortByVotes" value="1"{if $pollSortByVotes} checked="checked"{/if} /> {lang}wcf.poll.sortByVotes{/lang}</label>
+				<label><input type="checkbox" name="pollSortByVotes" value="1"{if $pollSortByVotes} checked="checked"{/if}> {lang}wcf.poll.sortByVotes{/lang}</label>
 			</dd>
 		</dl>
 		
diff --git a/com.woltlab.wcf/templates/__messageFormSmilies.tpl b/com.woltlab.wcf/templates/__messageFormSmilies.tpl
index ef558d47a2..1d38ab5842 100644
--- a/com.woltlab.wcf/templates/__messageFormSmilies.tpl
+++ b/com.woltlab.wcf/templates/__messageFormSmilies.tpl
@@ -1,5 +1,5 @@
 <ul class="inlineList smileyList">
 	{foreach from=$smilies item=smiley}
-		<li><a title="{lang}{$smiley->smileyTitle}{/lang}" class="jsTooltip jsSmiley" data-smiley-code="{$smiley->smileyCode}" data-smiley-path="{$smiley->getURL()}"><img src="{$smiley->getURL()}" alt="{$smiley->smileyCode}" /></a></li>
+		<li><a title="{lang}{$smiley->smileyTitle}{/lang}" class="jsTooltip jsSmiley" data-smiley-code="{$smiley->smileyCode}" data-smiley-path="{$smiley->getURL()}"><img src="{$smiley->getURL()}" alt="{$smiley->smileyCode}"></a></li>
 	{/foreach}
 </ul>
\ No newline at end of file
diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl
index f59e151b55..ae2ebe5bdc 100644
--- a/com.woltlab.wcf/templates/accountManagement.tpl
+++ b/com.woltlab.wcf/templates/accountManagement.tpl
@@ -24,7 +24,7 @@
 			<dl{if $errorField == 'password'} class="formError"{/if}>
 				<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
 				<dd>
-					<input type="password" id="password" name="password" value="" required="required" class="medium" />
+					<input type="password" id="password" name="password" value="" required="required" class="medium">
 					{if $errorField == 'password'}
 						<small class="innerError">
 							{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -47,7 +47,7 @@
 			<dl{if $errorField == 'username'} class="formError"{/if}>
 				<dt><label for="username">{lang}wcf.user.newUsername{/lang}</label></dt>
 				<dd>
-					<input type="text" id="username" name="username" value="{$username}" required="required" pattern="^[^,]{ldelim}{REGISTER_USERNAME_MIN_LENGTH},{REGISTER_USERNAME_MAX_LENGTH}}$" class="medium" />
+					<input type="text" id="username" name="username" value="{$username}" required="required" pattern="^[^,]{ldelim}{REGISTER_USERNAME_MIN_LENGTH},{REGISTER_USERNAME_MAX_LENGTH}}$" class="medium">
 						
 					{if $errorField == 'username'}
 						<small class="innerError">
@@ -74,7 +74,7 @@
 			<dl{if $errorField == 'newPassword'} class="formError"{/if}>
 				<dt><label for="newPassword">{lang}wcf.user.newPassword{/lang}</label></dt>
 				<dd>
-					<input type="password" id="newPassword" name="newPassword" value="{$newPassword}" class="medium" />
+					<input type="password" id="newPassword" name="newPassword" value="{$newPassword}" class="medium">
 						
 					{if $errorField == 'newPassword'}
 						<small class="innerError">
@@ -88,7 +88,7 @@
 			<dl{if $errorField == 'confirmNewPassword'} class="formError"{/if}>
 				<dt><label for="confirmNewPassword">{lang}wcf.user.confirmPassword{/lang}</label></dt>
 				<dd>
-					<input type="password" id="confirmNewPassword" name="confirmNewPassword" value="{$confirmNewPassword}" class="medium" />
+					<input type="password" id="confirmNewPassword" name="confirmNewPassword" value="{$confirmNewPassword}" class="medium">
 						
 					{if $errorField == 'confirmNewPassword'}
 						<small class="innerError">
@@ -110,7 +110,7 @@
 			<dl{if $errorField == 'email'} class="formError"{/if}>
 				<dt><label for="email">{lang}wcf.user.newEmail{/lang}</label></dt>
 				<dd>
-					<input type="email" id="email" name="email" value="{$email}" class="medium" />
+					<input type="email" id="email" name="email" value="{$email}" class="medium">
 						
 					{if $errorField == 'email'}
 						<small class="innerError">
@@ -125,7 +125,7 @@
 			<dl{if $errorField == 'confirmEmail'} class="formError"{/if}>
 				<dt><label for="confirmEmail">{lang}wcf.user.confirmEmail{/lang}</label></dt>
 				<dd>
-					<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" class="medium" />
+					<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" class="medium">
 						
 					{if $errorField == 'confirmEmail'}
 						<small class="innerError">
@@ -159,14 +159,14 @@
 				<dl>
 					<dt></dt>
 					<dd>
-						<label><input type="checkbox" name="cancelQuit" value="1" {if $cancelQuit == 1}checked="checked" {/if}/> {lang}wcf.user.quit.cancel{/lang}</label>
+						<label><input type="checkbox" name="cancelQuit" value="1"{if $cancelQuit == 1} checked="checked"{/if}> {lang}wcf.user.quit.cancel{/lang}</label>
 					</dd>
 				</dl>
 			{else}
 				<dl>
 					<dt></dt>
 					<dd>
-						<label><input type="checkbox" name="quit" value="1" {if $quit == 1}checked="checked" {/if}/> {lang}wcf.user.quit.sure{/lang}</label>
+						<label><input type="checkbox" name="quit" value="1"{if $quit == 1} checked="checked"{/if}> {lang}wcf.user.quit.sure{/lang}</label>
 						<small>{lang}wcf.user.quit.description{/lang}</small>
 					</dd>
 				</dl>
@@ -185,7 +185,7 @@
 					<dl>
 						<dt>{lang}wcf.user.3rdparty.{@$__authProvider}{/lang}</dt>
 						<dd>
-							<label><input type="checkbox" name="{@$__authProvider}Disconnect" value="1" /> {lang}wcf.user.3rdparty.{@$__authProvider}.disconnect{/lang}</label>
+							<label><input type="checkbox" name="{@$__authProvider}Disconnect" value="1"> {lang}wcf.user.3rdparty.{@$__authProvider}.disconnect{/lang}</label>
 						</dd>
 					</dl>
 				{elseif !$__wcf->getUser()->hasAdministrativeAccess()}
@@ -194,7 +194,7 @@
 							<dt>{lang}wcf.user.3rdparty.github{/lang}</dt>
 							<dd>
 								{if $__wcf->getSession()->getVar('__githubToken')}
-									<label><input type="checkbox" name="githubConnect" value="1"{if $githubConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.github.connect{/lang}</label>
+									<label><input type="checkbox" name="githubConnect" value="1"{if $githubConnect} checked="checked"{/if}> {lang}wcf.user.3rdparty.github.connect{/lang}</label>
 								{else}
 									<a href="{link controller='GithubAuth'}{/link}" class="thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.connect{/lang}</span></a>
 								{/if}
@@ -207,7 +207,7 @@
 							<dt>{lang}wcf.user.3rdparty.twitter{/lang}</dt>
 							<dd>
 								{if $__wcf->getSession()->getVar('__twitterData')}
-									<label><input type="checkbox" name="twitterConnect" value="1"{if $twitterConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.twitter.connect{/lang}</label>
+									<label><input type="checkbox" name="twitterConnect" value="1"{if $twitterConnect} checked="checked"{/if}> {lang}wcf.user.3rdparty.twitter.connect{/lang}</label>
 								{else}
 									<a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.connect{/lang}</span></a>
 								{/if}
@@ -220,7 +220,7 @@
 							<dt>{lang}wcf.user.3rdparty.facebook{/lang}</dt>
 							<dd>
 								{if $__wcf->getSession()->getVar('__facebookData')}
-									<label><input type="checkbox" name="facebookConnect" value="1"{if $facebookConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.facebook.connect{/lang}</label>
+									<label><input type="checkbox" name="facebookConnect" value="1"{if $facebookConnect} checked="checked"{/if}> {lang}wcf.user.3rdparty.facebook.connect{/lang}</label>
 								{else}
 									<a href="{link controller='FacebookAuth'}{/link}" class="thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.connect{/lang}</span></a>
 								{/if}
@@ -233,7 +233,7 @@
 							<dt>{lang}wcf.user.3rdparty.google{/lang}</dt>
 							<dd>
 								{if $__wcf->getSession()->getVar('__googleData')}
-									<label><input type="checkbox" name="googleConnect" value="1"{if $googleConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.google.connect{/lang}</label>
+									<label><input type="checkbox" name="googleConnect" value="1"{if $googleConnect} checked="checked"{/if}> {lang}wcf.user.3rdparty.google.connect{/lang}</label>
 								{else}
 									<a href="{link controller='GoogleAuth'}{/link}" class="thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google-plus"></span> <span>{lang}wcf.user.3rdparty.google.connect{/lang}</span></a>
 								{/if}
@@ -250,7 +250,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index fdbb31609f..9657dd227a 100644
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -40,7 +40,7 @@
 						{if $article->isMultilingual}
 							<li class="dropdown">
 								<a class="dropdownToggle boxFlag box24 button">
-									<span><img src="{$articleContent->getLanguage()->getIconPath()}" alt="" class="iconFlag" /></span>
+									<span><img src="{$articleContent->getLanguage()->getIconPath()}" alt="" class="iconFlag"></span>
 									<span>{$articleContent->getLanguage()->languageName}</span>
 								</a>
 								<ul class="dropdownMenu">
@@ -48,7 +48,7 @@
 										{if $langArticleContent->getLanguage()}
 											<li class="boxFlag">
 												<a class="box24" href="{$langArticleContent->getLink()}">
-													<span><img src="{$langArticleContent->getLanguage()->getIconPath()}" alt="" class="iconFlag" /></span>
+													<span><img src="{$langArticleContent->getLanguage()->getIconPath()}" alt="" class="iconFlag"></span>
 													<span>{$langArticleContent->getLanguage()->languageName}</span>
 												</a>
 											</li>
@@ -71,7 +71,7 @@
 	{if $article->isMultilingual}
 		{foreach from=$article->getLanguageLinks() item='langArticleContent'}
 			{if $langArticleContent->getLanguage()}
-				<link rel="alternate" hreflang="{$langArticleContent->getLanguage()->languageCode}" href="{$langArticleContent->getLink()}" />
+				<link rel="alternate" hreflang="{$langArticleContent->getLanguage()->languageCode}" href="{$langArticleContent->getLink()}">
 			{/if}
 		{/foreach}
 	{/if}
diff --git a/com.woltlab.wcf/templates/articleList.tpl b/com.woltlab.wcf/templates/articleList.tpl
index 8f0a4a3ad9..dcf7f71998 100644
--- a/com.woltlab.wcf/templates/articleList.tpl
+++ b/com.woltlab.wcf/templates/articleList.tpl
@@ -1,15 +1,15 @@
 {capture assign='headContent'}
 	{if $pageNo < $pages}
-		<link rel="next" href="{link controller='ArticleList'}pageNo={@$pageNo+1}{/link}" />
+		<link rel="next" href="{link controller='ArticleList'}pageNo={@$pageNo+1}{/link}">
 	{/if}
 	{if $pageNo > 1}
-		<link rel="prev" href="{link controller='ArticleList'}{if $pageNo > 2}pageNo={@$pageNo-1}{/if}{/link}" />
+		<link rel="prev" href="{link controller='ArticleList'}{if $pageNo > 2}pageNo={@$pageNo-1}{/if}{/link}">
 	{/if}
 	
 	{if $__wcf->getUser()->userID}
-		<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}" />
+		<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">
 	{else}
-		<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' appendSession=false}{/link}" />
+		<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' appendSession=false}{/link}">
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/attachments.tpl b/com.woltlab.wcf/templates/attachments.tpl
index 6233772cf4..9d585fd554 100644
--- a/com.woltlab.wcf/templates/attachments.tpl
+++ b/com.woltlab.wcf/templates/attachments.tpl
@@ -15,9 +15,9 @@
 								<div class="attachmentThumbnailContainer">		
 									<span class="attachmentThumbnailImage">
 										{if $attachment->hasThumbnail()}
-											<img src="{link controller='Attachment' object=$attachment}thumbnail=1{/link}" alt="" {if $attachment->thumbnailWidth >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->thumbnailHeight >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}/>
+											<img src="{link controller='Attachment' object=$attachment}thumbnail=1{/link}" alt="" {if $attachment->thumbnailWidth >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->thumbnailHeight >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}>
 										{else}
-											<img src="{link controller='Attachment' object=$attachment}{/link}" alt="" {if $attachment->width >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->height >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}/>
+											<img src="{link controller='Attachment' object=$attachment}{/link}" alt="" {if $attachment->width >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->height >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}>
 										{/if}
 									</span>
 								
diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl
index eba0a80bdb..faaff97de9 100644
--- a/com.woltlab.wcf/templates/avatarEdit.tpl
+++ b/com.woltlab.wcf/templates/avatarEdit.tpl
@@ -17,7 +17,7 @@
 		<dl class="avatarType">
 			<dt></dt>
 			<dd>
-				<label><input type="radio" name="avatarType" value="none" {if $avatarType == 'none'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.none{/lang}</label>
+				<label><input type="radio" name="avatarType" value="none" {if $avatarType == 'none'}checked="checked" {/if}> {lang}wcf.user.avatar.type.none{/lang}</label>
 				<small>{lang}wcf.user.avatar.type.none.description{/lang}</small>
 			</dd>
 		</dl>
@@ -32,11 +32,11 @@
 							{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)}
 						{/if}
 					{else}
-						<img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage" style="width: 96px; height: 96px" />
+						<img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage" style="width: 96px; height: 96px">
 					{/if}
 				</dt>
 				<dd>
-					<label><input type="radio" name="avatarType" value="custom" {if $avatarType == 'custom'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.custom{/lang}</label>
+					<label><input type="radio" name="avatarType" value="custom"{if $avatarType == 'custom'} checked="checked"{/if}> {lang}wcf.user.avatar.type.custom{/lang}</label>
 					<small>{lang}wcf.user.avatar.type.custom.description{/lang}</small>
 					
 					{* placeholder for upload button: *}
@@ -53,9 +53,9 @@
 		
 		{if MODULE_GRAVATAR}
 			<dl class="avatarType{if $errorField == 'gravatar'} formError{/if}">
-				<dt><img src="https://secure.gravatar.com/avatar/{@$__wcf->user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="userAvatarImage icon96" /></dt>
+				<dt><img src="https://secure.gravatar.com/avatar/{@$__wcf->user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="userAvatarImage icon96"></dt>
 				<dd>
-					<label><input type="radio" name="avatarType" value="gravatar" {if $avatarType == 'gravatar'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
+					<label><input type="radio" name="avatarType" value="gravatar"{if $avatarType == 'gravatar'} checked="checked"{/if}> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
 					{if $errorField == 'gravatar'}
 						<small class="innerError">
 							{if $errorType == 'notFound'}{lang}wcf.user.avatar.type.gravatar.error.notFound{/lang}{/if}
@@ -73,7 +73,7 @@
 	
 	{if !$__wcf->user->disableAvatar}
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	{/if}
diff --git a/com.woltlab.wcf/templates/benchmark.tpl b/com.woltlab.wcf/templates/benchmark.tpl
index d790c9d7ba..b5bb5ddf3b 100644
--- a/com.woltlab.wcf/templates/benchmark.tpl
+++ b/com.woltlab.wcf/templates/benchmark.tpl
@@ -14,7 +14,7 @@
 		<ul id="benchmarkDetails" style="display: none;">
 			{foreach from=$__wcf->getBenchmark()->getItems() key=benchmarkIndex item=item}
 				<li id="benchmarkItem{@$benchmarkIndex}" style="margin-bottom: 8px;"{if $item.use >= 0.01} class="hot"{/if}>
-					<span>{if $item.type == 1}(SQL Query) {/if}{$item.text}</span><br />
+					<span>{if $item.type == 1}(SQL Query) {/if}{$item.text}</span><br>
 					<small style="font-size: .85em">Execution time: {@$item.use}s</small>
 				
 				<pre style="display: none">{foreach from=$item.trace key=traceNo item=traceItem}#{#$traceNo} {if !$traceItem.class|empty}{$traceItem.class}{$traceItem.type}{else}{if !$traceItem.file|empty}{$traceItem.file}: {/if}{/if}{$traceItem.function}() {if !$traceItem.line|empty}(line {#$traceItem.line}){/if} 
diff --git a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
index c1d02e26d9..c0a52f074a 100644
--- a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
@@ -1,5 +1,5 @@
-<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" />
+<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 data-relocate="true">
 //<![CDATA[
diff --git a/com.woltlab.wcf/templates/captchaQuestion.tpl b/com.woltlab.wcf/templates/captchaQuestion.tpl
index 9bd84ac69a..f02b985782 100644
--- a/com.woltlab.wcf/templates/captchaQuestion.tpl
+++ b/com.woltlab.wcf/templates/captchaQuestion.tpl
@@ -1,4 +1,4 @@
-<input type="hidden" name="captchaQuestion" value="{$captchaQuestion}" />
+<input type="hidden" name="captchaQuestion" value="{$captchaQuestion}">
 
 {if !$captchaQuestionAnswered}
 	<section class="section">
@@ -10,7 +10,7 @@
 		<dl class="condensed{if (($errorType|isset && $errorType|is_array && $errorType[captchaAnswer]|isset) || ($errorField|isset && $errorField == 'captchaAnswer'))} formError{/if}">
 			<dt><label for="captchaAnswer">{lang}{$captchaQuestionObject->question}{/lang}</label></dt>
 			<dd>
-				<input type="text" id="captchaAnswer" name="captchaAnswer" class="medium" />
+				<input type="text" id="captchaAnswer" name="captchaAnswer" class="medium">
 				{if (($errorType|isset && $errorType|is_array && $errorType[captchaAnswer]|isset) || ($errorField|isset && $errorField == 'captchaAnswer'))}
 					{if $errorType|is_array && $errorType[captchaAnswer]|isset}
 						{assign var='__errorType' value=$errorType[captchaAnswer]}
diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index 822e49faff..43ba9b8fe6 100644
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -4,16 +4,16 @@
 
 {capture assign='headContent'}
 	{if $pageNo < $pages}
-		<link rel="next" href="{link controller='CategoryArticleList' object=$category}pageNo={@$pageNo+1}{/link}" />
+		<link rel="next" href="{link controller='CategoryArticleList' object=$category}pageNo={@$pageNo+1}{/link}">
 	{/if}
 	{if $pageNo > 1}
-		<link rel="prev" href="{link controller='CategoryArticleList' object=$category}{if $pageNo > 2}pageNo={@$pageNo-1}{/if}{/link}" />
+		<link rel="prev" href="{link controller='CategoryArticleList' object=$category}{if $pageNo > 2}pageNo={@$pageNo-1}{/if}{/link}">
 	{/if}
 	
 	{if $__wcf->getUser()->userID}
-		<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' id=$categoryID appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}" />
+		<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' id=$categoryID appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">
 	{else}
-		<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' id=$categoryID appendSession=false}{/link}" />
+		<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' id=$categoryID appendSession=false}{/link}">
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/checkboxesOptionType.tpl b/com.woltlab.wcf/templates/checkboxesOptionType.tpl
index 62f6c3f37c..ade4955da1 100644
--- a/com.woltlab.wcf/templates/checkboxesOptionType.tpl
+++ b/com.woltlab.wcf/templates/checkboxesOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
diff --git a/com.woltlab.wcf/templates/checkboxesSearchableOptionType.tpl b/com.woltlab.wcf/templates/checkboxesSearchableOptionType.tpl
index 3c88d945b9..59735a04ca 100644
--- a/com.woltlab.wcf/templates/checkboxesSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/checkboxesSearchableOptionType.tpl
@@ -1,6 +1,6 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if}{if !$searchOption} disabled="disabled"{/if} /> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if}{if !$searchOption} disabled="disabled"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
 
 <script data-relocate="true">
diff --git a/com.woltlab.wcf/templates/commentAddGuestDialog.tpl b/com.woltlab.wcf/templates/commentAddGuestDialog.tpl
index 0631d1174d..b817f97df3 100644
--- a/com.woltlab.wcf/templates/commentAddGuestDialog.tpl
+++ b/com.woltlab.wcf/templates/commentAddGuestDialog.tpl
@@ -3,7 +3,7 @@
 		<dl{if $errorType[username]|isset} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" required="required" class="long" autofocus="true" />
+				<input type="text" id="username" name="username" value="{$username}" required="required" class="long" autofocus="true">
 				{if $errorType[username]|isset}
 					<small class="innerError">
 						{if $errorType[username] == 'empty'}
@@ -21,5 +21,5 @@
 </div>
 
 <div class="formSubmit">
-	<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+	<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 </div>
diff --git a/com.woltlab.wcf/templates/disclaimer.tpl b/com.woltlab.wcf/templates/disclaimer.tpl
index 431668686c..10153bcea1 100644
--- a/com.woltlab.wcf/templates/disclaimer.tpl
+++ b/com.woltlab.wcf/templates/disclaimer.tpl
@@ -11,7 +11,7 @@
 	
 	{if !$__wcf->user->userID}
 		<div class="formSubmit">
-			<input type="submit" name="accept" value="{lang}wcf.user.register.disclaimer.accept{/lang}" accesskey="s" />
+			<input type="submit" name="accept" value="{lang}wcf.user.register.disclaimer.accept{/lang}" accesskey="s">
 			<a class="button" href="{link}{/link}">{lang}wcf.user.register.disclaimer.decline{/lang}</a>
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
diff --git a/com.woltlab.wcf/templates/editHistory.tpl b/com.woltlab.wcf/templates/editHistory.tpl
index 8cc69171d7..200b76a93e 100644
--- a/com.woltlab.wcf/templates/editHistory.tpl
+++ b/com.woltlab.wcf/templates/editHistory.tpl
@@ -44,9 +44,9 @@
 	{/if}
 	<div{if $line[0] === '+'} style="color: green;"{elseif $line[0] === '-'} style="color: red;"{/if}>
 {/if}
-{if $line[0] === ' '}{$line[1]}<br />{/if}
-{if $line[0] === '-'}{$line[1]}<br />{/if}
-{if $line[0] === '+'}{$line[1]}<br />{/if}
+{if $line[0] === ' '}{$line[1]}<br>{/if}
+{if $line[0] === '-'}{$line[1]}<br>{/if}
+{if $line[0] === '+'}{$line[1]}<br>{/if}
 {assign var='prevType' value=$line[0]}
 {/foreach}
 </div></div>
@@ -76,7 +76,7 @@
 				<tr>
 					<td class="columnIcon">
 						<span class="icon icon16 fa-undo disabled"></span>
-						<input type="radio" name="oldID" value="current"{if $oldID === 'current'} checked="checked"{/if} /> <input type="radio" name="newID" value="current"{if $newID === 'current'} checked="checked"{/if} />
+						<input type="radio" name="oldID" value="current"{if $oldID === 'current'} checked="checked"{/if}> <input type="radio" name="newID" value="current"{if $newID === 'current'} checked="checked"{/if}>
 						{event name='rowButtons'}
 					</td>
 					<td class="columnID"><strong>{lang}wcf.edit.currentVersion{/lang}</strong></td>
@@ -90,7 +90,7 @@
 					<tr class="jsEditRow">
 						<td class="columnIcon">
 							<span class="icon icon16 fa-undo pointer jsRevertButton jsTooltip" title="{lang}wcf.edit.revert{/lang}" data-object-id="{@$edit->entryID}" data-confirm-message="{lang __encode=true}wcf.edit.revert.sure{/lang}"></span>
-							<input type="radio" name="oldID" value="{@$edit->entryID}"{if $oldID == $edit->entryID} checked="checked"{/if} /> <input type="radio" name="newID" value="{@$edit->entryID}"{if $newID == $edit->entryID} checked="checked"{/if} />
+							<input type="radio" name="oldID" value="{@$edit->entryID}"{if $oldID == $edit->entryID} checked="checked"{/if}> <input type="radio" name="newID" value="{@$edit->entryID}"{if $newID == $edit->entryID} checked="checked"{/if}>
 							{event name='rowButtons'}
 						</td>
 						<td class="columnID">{#($tpl[foreach][edit][total] - $tpl[foreach][edit][iteration] + 1)}</td>
@@ -114,8 +114,8 @@
 	
 	<div class="formSubmit">
 		{@SID_INPUT_TAG}
-		<input type="hidden" name="objectID" value="{$objectID}" />
-		<input type="hidden" name="objectType" value="{$objectType->objectType}" />
+		<input type="hidden" name="objectID" value="{$objectID}">
+		<input type="hidden" name="objectType" value="{$objectType->objectType}">
 		<button class="button buttonPrimary" data-type="submit">{lang}wcf.edit.button.compare{/lang}</button>
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/emailActivation.tpl b/com.woltlab.wcf/templates/emailActivation.tpl
index aba48404f5..2cec5fe803 100644
--- a/com.woltlab.wcf/templates/emailActivation.tpl
+++ b/com.woltlab.wcf/templates/emailActivation.tpl
@@ -7,7 +7,7 @@
 		<dl{if $errorField == 'u'} class="formError"{/if}>
 			<dt><label for="userID">{lang}wcf.user.userID{/lang}</label></dt>
 			<dd>
-				<input type="text" id="userID" name="u" value="{@$u}" required="required" class="medium" />
+				<input type="text" id="userID" name="u" value="{@$u}" required="required" class="medium">
 				{if $errorField == 'u'}
 					<small class="innerError">
 						{if $errorType == 'notValid'}{lang}wcf.user.userID.error.invalid{/lang}{/if}
@@ -19,7 +19,7 @@
 		<dl{if $errorField == 'a'} class="formError"{/if}>
 			<dt><label for="activationCode">{lang}wcf.user.activationCode{/lang}</label></dt>
 			<dd>
-				<input type="text" id="activationCode" maxlength="9" name="a" value="{@$a}" required="required" class="medium" />
+				<input type="text" id="activationCode" maxlength="9" name="a" value="{@$a}" required="required" class="medium">
 				{if $errorField == 'a'}
 					<small class="innerError">
 						{if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if}
@@ -35,7 +35,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/emailNewActivationCode.tpl b/com.woltlab.wcf/templates/emailNewActivationCode.tpl
index fa8dae3257..f55bae05ae 100644
--- a/com.woltlab.wcf/templates/emailNewActivationCode.tpl
+++ b/com.woltlab.wcf/templates/emailNewActivationCode.tpl
@@ -7,7 +7,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
+				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'password'} class="formError"{/if}>
 			<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
 			<dd>
-				<input type="password" id="password" name="password" value="{$password}" required="required" class="medium" />
+				<input type="password" id="password" name="password" value="{$password}" required="required" class="medium">
 				{if $errorField == 'password'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -44,7 +44,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/flexibleCategoryList.tpl b/com.woltlab.wcf/templates/flexibleCategoryList.tpl
index be593f72d8..57a944de9b 100644
--- a/com.woltlab.wcf/templates/flexibleCategoryList.tpl
+++ b/com.woltlab.wcf/templates/flexibleCategoryList.tpl
@@ -6,20 +6,20 @@
 	{foreach from=$flexibleCategoryList item=categoryItem}
 		<li>
 			<div class="containerHeadline">
-				<h3><label{if $categoryItem->getDescription()} class="jsTooltip" title="{$categoryItem->getDescription()}"{/if}><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$categoryItem->categoryID}" class="jsCategory"{if $categoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs}checked="checked" {/if}/> {$categoryItem->getTitle()}</label></h3>
+				<h3><label{if $categoryItem->getDescription()} class="jsTooltip" title="{$categoryItem->getDescription()}"{/if}><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$categoryItem->categoryID}" class="jsCategory"{if $categoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs} checked="checked"{/if}> {$categoryItem->getTitle()}</label></h3>
 			</div>
 			
 			{if $categoryItem->hasChildren()}
 				<ol>
 					{foreach from=$categoryItem item=subCategoryItem}
 						<li>
-							<label{if $subCategoryItem->getDescription()} class="jsTooltip" title="{$subCategoryItem->getDescription()}"{/if} style="font-size: 1rem;"><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$subCategoryItem->categoryID}" class="jsChildCategory"{if $subCategoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs}checked="checked" {/if}/> {$subCategoryItem->getTitle()}</label>
+							<label{if $subCategoryItem->getDescription()} class="jsTooltip" title="{$subCategoryItem->getDescription()}"{/if} style="font-size: 1rem;"><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$subCategoryItem->categoryID}" class="jsChildCategory"{if $subCategoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs} checked="checked"{/if}> {$subCategoryItem->getTitle()}</label>
 							
 							{if $subCategoryItem->hasChildren()}
 								<ol>
 									{foreach from=$subCategoryItem item=subSubCategoryItem}
 										<li>
-											<label{if $subSubCategoryItem->getDescription()} class="jsTooltip" title="{$subSubCategoryItem->getDescription()}"{/if}><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$subSubCategoryItem->categoryID}" class="jsSubChildCategory"{if $subSubCategoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs}checked="checked" {/if}/> {$subSubCategoryItem->getTitle()}</label>
+											<label{if $subSubCategoryItem->getDescription()} class="jsTooltip" title="{$subSubCategoryItem->getDescription()}"{/if}><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$subSubCategoryItem->categoryID}" class="jsSubChildCategory"{if $subSubCategoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs} checked="checked"{/if}> {$subSubCategoryItem->getTitle()}</label>
 										</li>
 									{/foreach}
 								</ol>
diff --git a/com.woltlab.wcf/templates/integerOptionType.tpl b/com.woltlab.wcf/templates/integerOptionType.tpl
index 466d77b569..8fe3659e33 100644
--- a/com.woltlab.wcf/templates/integerOptionType.tpl
+++ b/com.woltlab.wcf/templates/integerOptionType.tpl
@@ -1 +1 @@
-<input type="number" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minvalue !== null} min="{$option->minvalue}"{/if}{if $option->maxvalue !== null} max="{$option->maxvalue}"{/if}{if $inputClass} class="{@$inputClass}"{/if} />
\ No newline at end of file
+<input type="number" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minvalue !== null} min="{$option->minvalue}"{/if}{if $option->maxvalue !== null} max="{$option->maxvalue}"{/if}{if $inputClass} class="{@$inputClass}"{/if}>
\ No newline at end of file
diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl
index 8f2bdffb0e..a518b58475 100644
--- a/com.woltlab.wcf/templates/login.tpl
+++ b/com.woltlab.wcf/templates/login.tpl
@@ -14,7 +14,7 @@
 			<dl{if $errorField == 'username'} class="formError"{/if}>
 				<dt><label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label></dt>
 				<dd>
-					<input type="text" id="username" name="username" value="{$username}" required="required" class="long" />
+					<input type="text" id="username" name="username" value="{$username}" required="required" class="long">
 					{if $errorField == 'username'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -30,7 +30,7 @@
 			<dl{if $errorField == 'password'} class="formError"{/if}>
 				<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
 				<dd>
-					<input type="password" id="password" name="password" value="{$password}" class="long" />
+					<input type="password" id="password" name="password" value="{$password}" class="long">
 					{if $errorField == 'password'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
diff --git a/com.woltlab.wcf/templates/lostPassword.tpl b/com.woltlab.wcf/templates/lostPassword.tpl
index b46e4d9651..5b1f34a33f 100644
--- a/com.woltlab.wcf/templates/lostPassword.tpl
+++ b/com.woltlab.wcf/templates/lostPassword.tpl
@@ -11,7 +11,7 @@
 				<label for="usernameInput">{lang}wcf.user.username{/lang}</label>
 			</dt>
 			<dd>
-				<input type="text" id="usernameInput" name="username" value="{$username}" class="medium" />
+				<input type="text" id="usernameInput" name="username" value="{$username}" class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -27,7 +27,7 @@
 				<label for="emailInput">{lang}wcf.user.email{/lang}</label>
 			</dt>
 			<dd>
-				<input type="email" id="emailInput" name="email" value="{$email}" class="medium" />
+				<input type="email" id="emailInput" name="email" value="{$email}" class="medium">
 				{if $errorField == 'email'}
 					<small class="innerError">
 						{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -45,7 +45,7 @@
 	{include file='captcha'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/mail.tpl b/com.woltlab.wcf/templates/mail.tpl
index 35eb937c97..f0fe90c22d 100644
--- a/com.woltlab.wcf/templates/mail.tpl
+++ b/com.woltlab.wcf/templates/mail.tpl
@@ -9,7 +9,7 @@
 		<dl{if $errorField == 'subject'} class="formError"{/if}>
 			<dt><label for="subject">{lang}wcf.user.mail.subject{/lang}</label></dt>
 			<dd>
-				<input type="text" id="subject" name="subject" value="{$subject}" required="required" class="long" />
+				<input type="text" id="subject" name="subject" value="{$subject}" required="required" class="long">
 				{if $errorField == 'subject'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -25,13 +25,13 @@
 		{if $__wcf->user->userID}
 			<dl>
 				<dt></dt>
-				<dd><label><input type="checkbox" name="showAddress" value="1" {if $showAddress == 1} checked="checked"{/if}/> {lang}wcf.user.mail.showAddress{/lang}</label></dd>
+				<dd><label><input type="checkbox" name="showAddress" value="1"{if $showAddress == 1} checked="checked"{/if}> {lang}wcf.user.mail.showAddress{/lang}</label></dd>
 			</dl>
 		{else}
 			<dl{if $errorField == 'email'} class="formError"{/if}>
 				<dt><label for="email">{lang}wcf.user.mail.senderEmail{/lang}</label></dt>
 				<dd>
-					<input type="email" id="email" name="email" value="{$email}" required="required" class="medium" />
+					<input type="email" id="email" name="email" value="{$email}" required="required" class="medium">
 					{if $errorField == 'email'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -76,7 +76,7 @@
 	{include file='captcha'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/manageSubscription.tpl b/com.woltlab.wcf/templates/manageSubscription.tpl
index 34aae66d52..10c3d8b3a5 100644
--- a/com.woltlab.wcf/templates/manageSubscription.tpl
+++ b/com.woltlab.wcf/templates/manageSubscription.tpl
@@ -1,14 +1,14 @@
 <div class="section">
 	<dl class="wide">
 		<dd>
-			<label><input type="radio" name="subscribe" value="1"{if $userObjectWatch} checked="checked"{/if} /> {lang}wcf.user.objectWatch.subscribe.{@$objectType->objectType}{/lang}</label>
+			<label><input type="radio" name="subscribe" value="1"{if $userObjectWatch} checked="checked"{/if}> {lang}wcf.user.objectWatch.subscribe.{@$objectType->objectType}{/lang}</label>
 			
-			<small><label><input type="checkbox" name="enableNotification" value="1"{if $userObjectWatch && $userObjectWatch->notification} checked="checked"{/if} /> {lang}wcf.user.objectWatch.enableNotification.{@$objectType->objectType}{/lang}</label></small>
+			<small><label><input type="checkbox" name="enableNotification" value="1"{if $userObjectWatch && $userObjectWatch->notification} checked="checked"{/if}> {lang}wcf.user.objectWatch.enableNotification.{@$objectType->objectType}{/lang}</label></small>
 		</dd>
 	</dl>
 	<dl class="wide">
 		<dd>
-			<label><input type="radio" name="subscribe" value="0"{if !$userObjectWatch} checked="checked"{/if} /> {lang}wcf.user.objectWatch.unsubscribe.{@$objectType->objectType}{/lang}</label>
+			<label><input type="radio" name="subscribe" value="0"{if !$userObjectWatch} checked="checked"{/if}> {lang}wcf.user.objectWatch.unsubscribe.{@$objectType->objectType}{/lang}</label>
 		</dd>
 	</dl>
 	
diff --git a/com.woltlab.wcf/templates/mediaEditor.tpl b/com.woltlab.wcf/templates/mediaEditor.tpl
index 76adbad860..2e9b939932 100644
--- a/com.woltlab.wcf/templates/mediaEditor.tpl
+++ b/com.woltlab.wcf/templates/mediaEditor.tpl
@@ -25,7 +25,7 @@
 		<dt></dt>
 		<dd>
 			<label>
-				<input type="checkbox" id="isMultilingual" name="isMultilingual" value="1" />
+				<input type="checkbox" id="isMultilingual" name="isMultilingual" value="1">
 				<span>{lang}wcf.media.isMultilingual{/lang}</span>
 			</label>
 		</dd>
@@ -36,7 +36,7 @@
 	<dl>
 		<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
 		<dd>
-			<input type="text" id="title" name="title" class="long" />
+			<input type="text" id="title" name="title" class="long">
 		</dd>
 	</dl>
 	{include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=true}
@@ -52,7 +52,7 @@
 	<dl>
 		<dt><label for="altText">{lang}wcf.media.altText{/lang}</label></dt>
 		<dd>
-			<input type="text" id="altText" name="altText" class="long" />
+			<input type="text" id="altText" name="altText" class="long">
 		</dd>
 	</dl>
 	{include file='multipleLanguageInputJavascript' elementIdentifier='altText' forceSelection=true}
diff --git a/com.woltlab.wcf/templates/mediaListItems.tpl b/com.woltlab.wcf/templates/mediaListItems.tpl
index 45007323dd..e87f2937eb 100644
--- a/com.woltlab.wcf/templates/mediaListItems.tpl
+++ b/com.woltlab.wcf/templates/mediaListItems.tpl
@@ -11,7 +11,7 @@
 		<nav class="buttonGroupNavigation">
 			<ul class="smallButtons buttonGroup">
 				<li>
-					<input type="checkbox" class="jsClipboardItem jsMediaCheckbox" data-object-id="{@$media->mediaID}" />
+					<input type="checkbox" class="jsClipboardItem jsMediaCheckbox" data-object-id="{@$media->mediaID}">
 				</li>
 				{if $__wcf->session->getPermission('admin.content.cms.canManageMedia')}
 					<li>
diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index 8380bedae1..568b7a8e4e 100644
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -6,12 +6,12 @@
 
 {capture assign='headContent'}
 	{if $pageNo < $pages}
-		<link rel="next" href="{link controller='MembersList'}pageNo={@$pageNo+1}&{@$canonicalURLParameters}{/link}" />
+		<link rel="next" href="{link controller='MembersList'}pageNo={@$pageNo+1}&{@$canonicalURLParameters}{/link}">
 	{/if}
 	{if $pageNo > 1}
-		<link rel="prev" href="{link controller='MembersList'}{if $pageNo > 2}pageNo={@$pageNo-1}&{/if}{@$canonicalURLParameters}{/link}" />
+		<link rel="prev" href="{link controller='MembersList'}{if $pageNo > 2}pageNo={@$pageNo-1}&{/if}{@$canonicalURLParameters}{/link}">
 	{/if}
-	<link rel="canonical" href="{link controller='MembersList'}{if $pageNo > 1}pageNo={@$pageNo}&{/if}{@$canonicalURLParameters}{/link}" />
+	<link rel="canonical" href="{link controller='MembersList'}{if $pageNo > 1}pageNo={@$pageNo}&{/if}{@$canonicalURLParameters}{/link}">
 {/capture}
 
 {capture assign='sidebarRight'}
@@ -24,7 +24,7 @@
 				<dl>
 					<dt></dt>
 					<dd>
-						<input type="text" id="searchUsername" name="username" class="long" placeholder="{lang}wcf.user.username{/lang}" />
+						<input type="text" id="searchUsername" name="username" class="long" placeholder="{lang}wcf.user.username{/lang}">
 						{@SECURITY_TOKEN_INPUT_TAG}
 					</dd>
 				</dl>
@@ -69,8 +69,8 @@
 				</dl>
 				
 				<div class="formSubmit">
-					<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-					<input type="hidden" name="letter" value="{$letter}" />
+					<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+					<input type="hidden" name="letter" value="{$letter}">
 					{@SID_INPUT_TAG}
 				</div>
 			</div>
diff --git a/com.woltlab.wcf/templates/messageFormAttachments.tpl b/com.woltlab.wcf/templates/messageFormAttachments.tpl
index dac4ff6735..0cd0fde974 100644
--- a/com.woltlab.wcf/templates/messageFormAttachments.tpl
+++ b/com.woltlab.wcf/templates/messageFormAttachments.tpl
@@ -3,7 +3,7 @@
 		{foreach from=$attachmentHandler->getAttachmentList() item=$attachment}
 			<li class="box64" data-object-id="{@$attachment->attachmentID}" data-height="{@$attachment->height}" data-width="{@$attachment->width}">
 				{if $attachment->tinyThumbnailType}
-					<img src="{link controller='Attachment' object=$attachment}tiny=1{/link}" alt="" class="attachmentTinyThumbnail" />
+					<img src="{link controller='Attachment' object=$attachment}tiny=1{/link}" alt="" class="attachmentTinyThumbnail">
 				{else}
 					<span class="icon icon48 fa-paperclip"></span>
 				{/if}
@@ -70,4 +70,4 @@
 	//]]>
 </script>
 
-<input type="hidden" name="tmpHash" value="{$tmpHash}" />
\ No newline at end of file
+<input type="hidden" name="tmpHash" value="{$tmpHash}">
\ No newline at end of file
diff --git a/com.woltlab.wcf/templates/messageQuoteList.tpl b/com.woltlab.wcf/templates/messageQuoteList.tpl
index 8ba78e106b..79f46e3ed9 100644
--- a/com.woltlab.wcf/templates/messageQuoteList.tpl
+++ b/com.woltlab.wcf/templates/messageQuoteList.tpl
@@ -7,7 +7,7 @@
 					{if $userProfiles[$message->getUserID()]|isset}
 						<a href="{link controller='User' object=$userProfiles[$message->getUserID()]}{/link}">{@$userProfiles[$message->getUserID()]->getAvatar()->getImageTag(32)}</a>
 					{else}
-						<span><img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage" style="width: 32px; height: 32px" /></span>
+						<span><img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage" style="width: 32px; height: 32px"></span>
 					{/if}
 					
 					<div class="messageHeaderBox">
@@ -35,7 +35,7 @@
 						{foreach from=$message key=quoteID item=quote}
 							<li data-quote-id="{@$quoteID}">
 								<span>
-									<input type="checkbox" value="1" id="quote_{@$quoteID}" class="jsCheckbox" />
+									<input type="checkbox" value="1" id="quote_{@$quoteID}" class="jsCheckbox">
 									{if $supportPaste}<span class="icon icon16 fa-plus jsTooltip jsInsertQuote" title="{lang}wcf.message.quote.insertQuote{/lang}"></span>{/if}
 								</span>
 								
diff --git a/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl b/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl
index 73625a8002..2f23e0d6a4 100644
--- a/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl
+++ b/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl
@@ -4,13 +4,13 @@
 		<dd>
 			<ul>
 				{if $assignedUser && $assignedUser->userID != $__wcf->getUser()->userID}
-					<li><label><input type="radio" name="assignedUserID" value="{@$assignedUser->userID}" checked="checked" /> {$assignedUser->username}</label></li>
+					<li><label><input type="radio" name="assignedUserID" value="{@$assignedUser->userID}" checked="checked"> {$assignedUser->username}</label></li>
 				{/if}
-				<li><label><input type="radio" name="assignedUserID" value="{@$__wcf->getUser()->userID}"{if $assignedUser && $assignedUser->userID == $__wcf->getUser()->userID} checked="checked"{/if} /> {$__wcf->getUser()->username}</label></li>
-				<li><label><input type="radio" name="assignedUserID" value="0"{if !$assignedUser} checked="checked"{/if} /> {lang}wcf.moderation.assignedUser.nobody{/lang}</label></li>
+				<li><label><input type="radio" name="assignedUserID" value="{@$__wcf->getUser()->userID}"{if $assignedUser && $assignedUser->userID == $__wcf->getUser()->userID} checked="checked"{/if}> {$__wcf->getUser()->username}</label></li>
+				<li><label><input type="radio" name="assignedUserID" value="0"{if !$assignedUser} checked="checked"{/if}> {lang}wcf.moderation.assignedUser.nobody{/lang}</label></li>
 				<li>
-					<input type="radio" name="assignedUserID" value="-1"{if !$assignedUser} checked="checked"{/if} />
-					<input type="text" id="assignedUsername" name="assignedUsername" value="{if $assignedUser}{$assignedUser->username}{/if}" />
+					<input type="radio" name="assignedUserID" value="-1"{if !$assignedUser} checked="checked"{/if}>
+					<input type="text" id="assignedUsername" name="assignedUsername" value="{if $assignedUser}{$assignedUser->username}{/if}">
 					{*if $errorField == 'assignedUsername'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
diff --git a/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl b/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
index 67531cfdb2..84bb0cfb60 100644
--- a/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
@@ -1,4 +1,4 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 <select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if !$searchOption} disabled="disabled"{/if}>
 	{foreach from=$selectOptions key=key item=selectOption}
 		<option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
diff --git a/com.woltlab.wcf/templates/newPassword.tpl b/com.woltlab.wcf/templates/newPassword.tpl
index 770d83ddea..57a8a25395 100644
--- a/com.woltlab.wcf/templates/newPassword.tpl
+++ b/com.woltlab.wcf/templates/newPassword.tpl
@@ -9,7 +9,7 @@
 				<label for="userID">{lang}wcf.user.userID{/lang}</label>
 			</dt>
 			<dd>
-				<input type="text" id="userID" name="u" value="{@$userID}" required="required" class="medium" />
+				<input type="text" id="userID" name="u" value="{@$userID}" required="required" class="medium">
 				{if $errorField == 'userID'}
 					<small class="innerError">
 						{lang}wcf.user.userID.error.{$errorType}{/lang}
@@ -23,7 +23,7 @@
 				<label for="lostPasswordKey">{lang}wcf.user.lostPasswordKey{/lang}</label>
 			</dt>
 			<dd>
-				<input type="text" id="lostPasswordKey" name="k" value="{$lostPasswordKey}" required="required" class="medium" />
+				<input type="text" id="lostPasswordKey" name="k" value="{$lostPasswordKey}" required="required" class="medium">
 				{if $errorField == 'lostPasswordKey'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -42,7 +42,7 @@
 	{event name='sections'}
 		
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index 666f018c2b..1919a43951 100644
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -18,7 +18,7 @@
 {/capture}
 
 {capture assign='headContent'}
-	<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='NotificationFeed' appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}" />
+	<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='NotificationFeed' appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">
 {/capture}
 
 {capture assign='headerNavigation'}
diff --git a/com.woltlab.wcf/templates/notificationSettings.tpl b/com.woltlab.wcf/templates/notificationSettings.tpl
index 566d6a8b81..f41d31d42f 100644
--- a/com.woltlab.wcf/templates/notificationSettings.tpl
+++ b/com.woltlab.wcf/templates/notificationSettings.tpl
@@ -60,7 +60,7 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/paidSubscriptionList.tpl b/com.woltlab.wcf/templates/paidSubscriptionList.tpl
index 962d1b9f90..dae7fa836d 100644
--- a/com.woltlab.wcf/templates/paidSubscriptionList.tpl
+++ b/com.woltlab.wcf/templates/paidSubscriptionList.tpl
@@ -33,7 +33,7 @@
 		<header class="sectionHeader">
 			<h2 class="sectionTitle">{lang}wcf.paidSubscription.availableSubscriptions{/lang}</h2>
 			{if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
-				<div class="sectionDescription"><label><input type="checkbox" id="tosConfirmed" name="tosConfirmed" value="1" /> {lang}wcf.paidSubscription.confirmTOS{/lang}</label></div>
+				<div class="sectionDescription"><label><input type="checkbox" id="tosConfirmed" name="tosConfirmed" value="1"> {lang}wcf.paidSubscription.confirmTOS{/lang}</label></div>
 			{/if}
 		</header>
 	
diff --git a/com.woltlab.wcf/templates/pollVote.tpl b/com.woltlab.wcf/templates/pollVote.tpl
index b7b25b6a9f..876a8d03ef 100644
--- a/com.woltlab.wcf/templates/pollVote.tpl
+++ b/com.woltlab.wcf/templates/pollVote.tpl
@@ -3,7 +3,7 @@
 		<dt></dt>
 		<dd>
 			<label>
-				{if $poll->canVote()}<input type="{if $poll->maxVotes > 1}checkbox{else}radio{/if}" name="pollOptions{@$poll->pollID}[]" value="{$option->optionValue}" data-option-id="{@$option->optionID}"{if $option->voted} checked="checked"{/if} />{/if}
+				{if $poll->canVote()}<input type="{if $poll->maxVotes > 1}checkbox{else}radio{/if}" name="pollOptions{@$poll->pollID}[]" value="{$option->optionValue}" data-option-id="{@$option->optionID}"{if $option->voted} checked="checked"{/if}>{/if}
 				{$option->optionValue}
 			</label>
 		</dd>
diff --git a/com.woltlab.wcf/templates/radioButtonOptionType.tpl b/com.woltlab.wcf/templates/radioButtonOptionType.tpl
index 763c9db93f..b868e71460 100644
--- a/com.woltlab.wcf/templates/radioButtonOptionType.tpl
+++ b/com.woltlab.wcf/templates/radioButtonOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach name=radioButtons from=$selectOptions key=key item=selectOption}
-	<label><input {if $tpl.foreach.radioButtons.first}id="{$option->optionName}" {/if}type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+	<label><input {if $tpl.foreach.radioButtons.first}id="{$option->optionName}" {/if}type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
diff --git a/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl b/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl
index b52bcd6d84..4391f287cd 100644
--- a/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl
@@ -1,6 +1,6 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
 
 <script data-relocate="true">
diff --git a/com.woltlab.wcf/templates/recaptcha.tpl b/com.woltlab.wcf/templates/recaptcha.tpl
index 456b94dca9..fbc9084461 100644
--- a/com.woltlab.wcf/templates/recaptcha.tpl
+++ b/com.woltlab.wcf/templates/recaptcha.tpl
@@ -25,7 +25,7 @@
 			</dt>
 			<dd class="jsOnly">
 				<div id="recaptcha_image"></div>
-				<input type="text" id="recaptcha_response_field" name="recaptcha_response_field" class="medium" />
+				<input type="text" id="recaptcha_response_field" name="recaptcha_response_field" class="medium">
 				{if (($errorType|isset && $errorType|is_array && $errorType[recaptchaString]|isset) || ($errorField|isset && $errorField == 'recaptchaString'))}
 					{if $errorType|is_array && $errorType[recaptchaString]|isset}
 						{assign var='__errorType' value=$errorType[recaptchaString]}
@@ -58,9 +58,9 @@
 				<script data-relocate="true" src="//www.google.com/recaptcha/api/challenge?k={$recaptchaPublicKey}"></script>
 				<noscript>
 					<dd>
-						<iframe src="//www.google.com/recaptcha/api/noscript?k={$recaptchaPublicKey}" height="300" width="500" seamless="seamless"></iframe><br />
+						<iframe src="//www.google.com/recaptcha/api/noscript?k={$recaptchaPublicKey}" height="300" width="500" seamless="seamless"></iframe><br>
 						<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-						<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
+						<input type="hidden" name="recaptcha_response_field" value="manual_challenge">
 					</dd>
 					{if (($errorType|isset && $errorType|is_array && $errorType[recaptchaString]|isset) || ($errorField|isset && $errorField == 'recaptchaString'))}
 						{if $errorType|is_array && $errorType[recaptchaString]|isset}
diff --git a/com.woltlab.wcf/templates/recentActivityList.tpl b/com.woltlab.wcf/templates/recentActivityList.tpl
index 82d1f52094..71d41cca7a 100644
--- a/com.woltlab.wcf/templates/recentActivityList.tpl
+++ b/com.woltlab.wcf/templates/recentActivityList.tpl
@@ -1,5 +1,5 @@
 {capture assign='headContent'}
-	<link rel="canonical" href="{link controller='RecentActivityList'}{/link}" />
+	<link rel="canonical" href="{link controller='RecentActivityList'}{/link}">
 {/capture}
 
 {include file='header'}
diff --git a/com.woltlab.wcf/templates/redirect.tpl b/com.woltlab.wcf/templates/redirect.tpl
index 6c1de338fb..d9b034a939 100644
--- a/com.woltlab.wcf/templates/redirect.tpl
+++ b/com.woltlab.wcf/templates/redirect.tpl
@@ -1,7 +1,7 @@
 {capture assign='pageTitle'}{lang}wcf.global.redirect.title{/lang}{/capture}
 
 {capture assign='headContent'}
-	<meta http-equiv="refresh" content="{if $wait|isset}{@$wait}{else}10{/if};URL={$url}" />
+	<meta http-equiv="refresh" content="{if $wait|isset}{@$wait}{else}10{/if};URL={$url}">
 {/capture}
 
 {include file='header' __disableAds=true}
diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index bb3cb46e8b..4e64711598 100644
--- a/com.woltlab.wcf/templates/register.tpl
+++ b/com.woltlab.wcf/templates/register.tpl
@@ -21,7 +21,7 @@
 				<label for="{@$randomFieldNames[username]}">{lang}wcf.user.username{/lang}</label>
 			</dt>
 			<dd>
-				<input type="text" id="{@$randomFieldNames[username]}" name="{@$randomFieldNames[username]}" value="{$username}" required="required" class="medium" />
+				<input type="text" id="{@$randomFieldNames[username]}" name="{@$randomFieldNames[username]}" value="{$username}" required="required" class="medium">
 				{if $errorType.username|isset}
 					<small class="innerError">
 						{if $errorType.username == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -47,7 +47,7 @@
 				<label for="username">{lang}wcf.user.username{/lang}</label>
 			</dt>
 			<dd>
-				<input type="text" id="username" name="username" value="" autocomplete="off" class="medium" tabindex="998" />
+				<input type="text" id="username" name="username" value="" autocomplete="off" class="medium" tabindex="998">
 			</dd>
 		</dl>
 		
@@ -56,7 +56,7 @@
 				<label for="email">{lang}wcf.user.email{/lang}</label>
 			</dt>
 			<dd>
-				<input type="email" id="email" name="email" value="" autocomplete="off" class="medium" tabindex="999" />
+				<input type="email" id="email" name="email" value="" autocomplete="off" class="medium" tabindex="999">
 			</dd>
 		</dl>
 		
@@ -71,7 +71,7 @@
 				<label for="{@$randomFieldNames[email]}">{lang}wcf.user.email{/lang}</label>
 			</dt>
 			<dd>
-				<input type="email" id="{@$randomFieldNames[email]}" name="{@$randomFieldNames[email]}" value="{$email}" required="required" class="medium" />
+				<input type="email" id="{@$randomFieldNames[email]}" name="{@$randomFieldNames[email]}" value="{$email}" required="required" class="medium">
 				{if $errorType.email|isset}
 					<small class="innerError">
 						{if $errorType.email == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -87,7 +87,7 @@
 				<label for="{@$randomFieldNames[confirmEmail]}">{lang}wcf.user.confirmEmail{/lang}</label>
 			</dt>
 			<dd>
-				<input type="email" id="{@$randomFieldNames[confirmEmail]}" name="{@$randomFieldNames[confirmEmail]}" value="{$confirmEmail}" required="required" class="medium" />
+				<input type="email" id="{@$randomFieldNames[confirmEmail]}" name="{@$randomFieldNames[confirmEmail]}" value="{$confirmEmail}" required="required" class="medium">
 				{if $errorType.confirmEmail|isset}
 					<small class="innerError">
 						{if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if}
@@ -108,7 +108,7 @@
 					<label for="{@$randomFieldNames[password]}">{lang}wcf.user.password{/lang}</label>
 				</dt>
 				<dd>
-					<input type="password" id="{@$randomFieldNames[password]}" name="{@$randomFieldNames[password]}" value="{$password}" required="required" class="medium" />
+					<input type="password" id="{@$randomFieldNames[password]}" name="{@$randomFieldNames[password]}" value="{$password}" required="required" class="medium">
 					{if $errorType.password|isset}
 						<small class="innerError">
 							{if $errorType.password == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -124,7 +124,7 @@
 					<label for="{@$randomFieldNames[confirmPassword]}">{lang}wcf.user.confirmPassword{/lang}</label>
 				</dt>
 				<dd>
-					<input type="password" id="{@$randomFieldNames[confirmPassword]}" name="{@$randomFieldNames[confirmPassword]}" value="{$confirmPassword}" required="required" class="medium" />
+					<input type="password" id="{@$randomFieldNames[confirmPassword]}" name="{@$randomFieldNames[confirmPassword]}" value="{$confirmPassword}" required="required" class="medium">
 					{if $errorType.confirmPassword|isset}
 						<small class="innerError">
 							{if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if}
@@ -159,7 +159,7 @@
 					<dd class="floated">
 					{content}
 						{foreach from=$availableContentLanguages item=language}
-							<label><input name="visibleLanguages[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$visibleLanguages} checked="checked"{/if} /> {$language}</label>
+							<label><input name="visibleLanguages[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$visibleLanguages} checked="checked"{/if}> {$language}</label>
 						{/foreach}
 					{/content}
 					<small>{lang}wcf.user.visibleLanguages.description{/lang}</small></dd>
@@ -183,7 +183,7 @@
 	{include file='captcha'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/registerActivation.tpl b/com.woltlab.wcf/templates/registerActivation.tpl
index 4f268c51f8..6d477448db 100644
--- a/com.woltlab.wcf/templates/registerActivation.tpl
+++ b/com.woltlab.wcf/templates/registerActivation.tpl
@@ -9,7 +9,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
+				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if}
@@ -21,7 +21,7 @@
 		<dl{if $errorField == 'activationCode'} class="formError"{/if}>
 			<dt><label for="activationCode">{lang}wcf.user.activationCode{/lang}</label></dt>
 			<dd>
-				<input type="text" id="activationCode" maxlength="9" name="activationCode" value="{@$activationCode}" required="required" class="medium" />
+				<input type="text" id="activationCode" maxlength="9" name="activationCode" value="{@$activationCode}" required="required" class="medium">
 				{if $errorField == 'activationCode'}
 					<small class="innerError">
 						{if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if}
@@ -37,7 +37,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/registerNewActivationCode.tpl b/com.woltlab.wcf/templates/registerNewActivationCode.tpl
index ee0e239f1c..bf936901c6 100644
--- a/com.woltlab.wcf/templates/registerNewActivationCode.tpl
+++ b/com.woltlab.wcf/templates/registerNewActivationCode.tpl
@@ -7,7 +7,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
+				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'password'} class="formError"{/if}>
 			<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
 			<dd>
-				<input type="password" id="password" name="password" value="{$password}" required="required" class="medium" />
+				<input type="password" id="password" name="password" value="{$password}" required="required" class="medium">
 				{if $errorField == 'password'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -41,7 +41,7 @@
 		<dl{if $errorField == 'email'} class="formError"{/if}>
 			<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
 			<dd>
-				<input type="email" id="email" name="email" value="{$email}" class="medium" />
+				<input type="email" id="email" name="email" value="{$email}" class="medium">
 				{if $errorField == 'email'}
 					<small class="innerError">
 						{lang}wcf.user.email.error.{@$errorType}{/lang}
@@ -57,7 +57,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl
index 2a28ff89f0..01c1e8ede8 100644
--- a/com.woltlab.wcf/templates/search.tpl
+++ b/com.woltlab.wcf/templates/search.tpl
@@ -11,7 +11,7 @@
 		<dl{if $errorField == 'q'} class="formError"{/if}>
 			<dt><label for="searchTerm">{lang}wcf.search.query{/lang}</label></dt>
 			<dd>
-				<input type="text" id="searchTerm" name="q" value="{$query}" class="long" maxlength="255" autofocus="autofocus" />
+				<input type="text" id="searchTerm" name="q" value="{$query}" class="long" maxlength="255" autofocus="autofocus">
 				{if $errorField == 'q'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -21,7 +21,7 @@
 						{/if}
 					</small>
 				{/if}
-				<label><input type="checkbox" name="subjectOnly" value="1"{if $subjectOnly == 1} checked="checked"{/if} /> {lang}wcf.search.subjectOnly{/lang}</label>
+				<label><input type="checkbox" name="subjectOnly" value="1"{if $subjectOnly == 1} checked="checked"{/if}> {lang}wcf.search.subjectOnly{/lang}</label>
 				{event name='queryOptions'}
 				
 				<small>{lang}wcf.search.query.description{/lang}</small>
@@ -31,8 +31,8 @@
 		<dl>
 			<dt><label for="searchAuthor">{lang}wcf.search.author{/lang}</label></dt>
 			<dd>
-				<input type="text" id="searchAuthor" name="username" value="{$username}" class="long" maxlength="255" autocomplete="off" />
-				<label><input type="checkbox" name="nameExactly" value="1"{if $nameExactly == 1} checked="checked"{/if} /> {lang}wcf.search.matchExactly{/lang}</label>
+				<input type="text" id="searchAuthor" name="username" value="{$username}" class="long" maxlength="255" autocomplete="off">
+				<label><input type="checkbox" name="nameExactly" value="1"{if $nameExactly == 1} checked="checked"{/if}> {lang}wcf.search.matchExactly{/lang}</label>
 				{event name='authorOptions'}
 			</dd>
 		</dl>
@@ -40,8 +40,8 @@
 		<dl>
 			<dt><label for="startDate">{lang}wcf.search.period{/lang}</label></dt>
 			<dd>
-				<input type="date" id="startDate" name="startDate" value="{$startDate}" data-placeholder="{lang}wcf.date.period.start{/lang}" />
-				<input type="date" id="endDate" name="endDate" value="{$endDate}" data-placeholder="{lang}wcf.date.period.end{/lang}" />
+				<input type="date" id="startDate" name="startDate" value="{$startDate}" data-placeholder="{lang}wcf.date.period.start{/lang}">
+				<input type="date" id="endDate" name="endDate" value="{$endDate}" data-placeholder="{lang}wcf.date.period.end{/lang}">
 				{event name='periodOptions'}
 			</dd>
 		</dl>
@@ -75,7 +75,7 @@
 			<dd class="floated">
 				{foreach from=$objectTypes key=objectTypeName item=objectType}
 					{if $objectType->isAccessible()}
-						<label><input id="{@'.'|str_replace:'_':$objectTypeName}" type="checkbox" name="types[]" value="{@$objectTypeName}"{if $objectTypeName|in_array:$selectedObjectTypes} checked="checked"{/if} /> {lang}wcf.search.type.{@$objectTypeName}{/lang}</label>
+						<label><input id="{@'.'|str_replace:'_':$objectTypeName}" type="checkbox" name="types[]" value="{@$objectTypeName}"{if $objectTypeName|in_array:$selectedObjectTypes} checked="checked"{/if}> {lang}wcf.search.type.{@$objectTypeName}{/lang}</label>
 					{/if}
 				{/foreach}
 			</dd>
@@ -110,7 +110,7 @@
 	{/foreach}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/searchArticle.tpl b/com.woltlab.wcf/templates/searchArticle.tpl
index 59557743c7..bf559210b1 100644
--- a/com.woltlab.wcf/templates/searchArticle.tpl
+++ b/com.woltlab.wcf/templates/searchArticle.tpl
@@ -4,7 +4,7 @@
 		<ul class="scrollableCheckboxList">
 			{foreach from=$articleCategoryList item=category}
 				<li{if $category->getDepth() > 1} style="padding-left: {$category->getDepth()*20-20}px"{/if}>
-					<label><input type="checkbox" name="articleCategoryIDs[]" value="{@$category->categoryID}"{if $category->categoryID|in_array:$articleCategoryIDs} checked="checked"{/if} /> {$category->getTitle()}</label>
+					<label><input type="checkbox" name="articleCategoryIDs[]" value="{@$category->categoryID}"{if $category->categoryID|in_array:$articleCategoryIDs} checked="checked"{/if}> {$category->getTitle()}</label>
 				</li>
 			{/foreach}
 		</ul>
diff --git a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
index ce95ace340..07a0a5560f 100644
--- a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
@@ -1,4 +1,4 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 <label class="selectDropdown">
 	<select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if}>
 		{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
diff --git a/com.woltlab.wcf/templates/settings.tpl b/com.woltlab.wcf/templates/settings.tpl
index 62244f06bc..4e53a81ad3 100644
--- a/com.woltlab.wcf/templates/settings.tpl
+++ b/com.woltlab.wcf/templates/settings.tpl
@@ -53,7 +53,7 @@
 						<dd class="floated">
 						{content}
 							{foreach from=$availableContentLanguages item=language}
-								<label><input name="contentLanguageIDs[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$contentLanguageIDs} checked="checked"{/if} /> {$language}</label>
+								<label><input name="contentLanguageIDs[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$contentLanguageIDs} checked="checked"{/if}> {$language}</label>
 							{/foreach}
 						{/content}
 						<small>{lang}wcf.user.visibleLanguages.description{/lang}</small></dd>
@@ -99,8 +99,8 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		{if $category != 'general'}<input type="hidden" name="category" value="{$category}" />{/if}
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+		{if $category != 'general'}<input type="hidden" name="category" value="{$category}">{/if}
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl b/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl
index e1d7d0a824..b14fc22b11 100644
--- a/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl
+++ b/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl
@@ -1,12 +1,12 @@
 <small style="display: inline-block; max-width: 500px;">{lang}wcf.message.share.privacy.description{/lang}</small>
 
 <ul>
-	<li><label><input type="checkbox" name="facebook" value="1"{if $settings[facebook]} checked="checked"{/if} /> {lang}wcf.message.share.facebook{/lang}</label></li>
-	<li><label><input type="checkbox" name="twitter" value="1"{if $settings[twitter]} checked="checked"{/if} /> {lang}wcf.message.share.twitter{/lang}</label></li>
-	<li><label><input type="checkbox" name="google" value="1"{if $settings[google]} checked="checked"{/if} /> {lang}wcf.message.share.google{/lang}</label></li>
-	<li><label><input type="checkbox" name="reddit" value="1"{if $settings[reddit]} checked="checked"{/if} /> {lang}wcf.message.share.reddit{/lang}</label></li>
+	<li><label><input type="checkbox" name="facebook" value="1"{if $settings[facebook]} checked="checked"{/if}> {lang}wcf.message.share.facebook{/lang}</label></li>
+	<li><label><input type="checkbox" name="twitter" value="1"{if $settings[twitter]} checked="checked"{/if}> {lang}wcf.message.share.twitter{/lang}</label></li>
+	<li><label><input type="checkbox" name="google" value="1"{if $settings[google]} checked="checked"{/if}> {lang}wcf.message.share.google{/lang}</label></li>
+	<li><label><input type="checkbox" name="reddit" value="1"{if $settings[reddit]} checked="checked"{/if}> {lang}wcf.message.share.reddit{/lang}</label></li>
 </ul>
 
 <div class="formSubmit">
-	<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+	<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 </div>
diff --git a/com.woltlab.wcf/templates/signatureEdit.tpl b/com.woltlab.wcf/templates/signatureEdit.tpl
index 032bb9a64d..1ab271a330 100644
--- a/com.woltlab.wcf/templates/signatureEdit.tpl
+++ b/com.woltlab.wcf/templates/signatureEdit.tpl
@@ -57,7 +57,7 @@
 	
 	{if !$__wcf->user->disableSignature}
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			<button id="previewButton" class="jsOnly" accesskey="p">{lang}wcf.global.button.preview{/lang}</button>
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
diff --git a/com.woltlab.wcf/templates/styleChooser.tpl b/com.woltlab.wcf/templates/styleChooser.tpl
index f5876d9739..1d415b3ee8 100644
--- a/com.woltlab.wcf/templates/styleChooser.tpl
+++ b/com.woltlab.wcf/templates/styleChooser.tpl
@@ -3,7 +3,7 @@
 		<li data-style-id="{@$style->styleID}">
 			<div class="box64">
 				<span>
-					<img src="{@$style->getPreviewImage()}" alt="" />
+					<img src="{@$style->getPreviewImage()}" alt="">
 				</span>
 				<div class="details">
 					<div class="containerHeadline">
diff --git a/com.woltlab.wcf/templates/tagInput.tpl b/com.woltlab.wcf/templates/tagInput.tpl
index 5efb00b858..23daa44c04 100644
--- a/com.woltlab.wcf/templates/tagInput.tpl
+++ b/com.woltlab.wcf/templates/tagInput.tpl
@@ -2,7 +2,7 @@
 	<dl class="jsOnly">
 		<dt><label for="tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}">{lang}wcf.tagging.tags{/lang}</label></dt>
 		<dd>
-			<input id="tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}" type="text" value="" class="long" />
+			<input id="tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}" type="text" value="" class="long">
 			<small>{lang}wcf.tagging.tags.description{/lang}</small>
 		</dd>
 	</dl>
diff --git a/com.woltlab.wcf/templates/tagged.tpl b/com.woltlab.wcf/templates/tagged.tpl
index adfff67bce..4a8b72f9c8 100644
--- a/com.woltlab.wcf/templates/tagged.tpl
+++ b/com.woltlab.wcf/templates/tagged.tpl
@@ -4,12 +4,12 @@
 
 {capture assign='headContent'}
 	{if $pageNo < $pages}
-		<link rel="next" href="{link controller='Tagged' object=$tag}objectType={@$objectType}&pageNo={@$pageNo+1}{/link}" />
+		<link rel="next" href="{link controller='Tagged' object=$tag}objectType={@$objectType}&pageNo={@$pageNo+1}{/link}">
 	{/if}
 	{if $pageNo > 1}
-		<link rel="prev" href="{link controller='Tagged' object=$tag}objectType={@$objectType}{if $pageNo > 2}&pageNo={@$pageNo-1}{/if}{/link}" />
+		<link rel="prev" href="{link controller='Tagged' object=$tag}objectType={@$objectType}{if $pageNo > 2}&pageNo={@$pageNo-1}{/if}{/link}">
 	{/if}
-	<link rel="canonical" href="{link controller='Tagged' object=$tag}objectType={@$objectType}{if $pageNo > 1}&pageNo={@$pageNo}{/if}{/link}" />
+	<link rel="canonical" href="{link controller='Tagged' object=$tag}objectType={@$objectType}{if $pageNo > 1}&pageNo={@$pageNo}{/if}{/link}">
 {/capture}
 
 {capture assign='sidebarLeft'}
diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl
index c90e74caa2..3ebeb973df 100644
--- a/com.woltlab.wcf/templates/team.tpl
+++ b/com.woltlab.wcf/templates/team.tpl
@@ -1,5 +1,5 @@
 {capture assign='headContent'}
-	<link rel="canonical" href="{link controller='Team'}{/link}" />
+	<link rel="canonical" href="{link controller='Team'}{/link}">
 {/capture}
 
 {include file='header'}
diff --git a/com.woltlab.wcf/templates/textI18nOptionType.tpl b/com.woltlab.wcf/templates/textI18nOptionType.tpl
index 750ad80a83..95606c98c9 100644
--- a/com.woltlab.wcf/templates/textI18nOptionType.tpl
+++ b/com.woltlab.wcf/templates/textI18nOptionType.tpl
@@ -1,2 +1,2 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="{$option->optionName}" value="{$i18nPlainValues[$option->optionName]}" class="long" />
+<input type="{@$inputType}" id="{$option->optionName}" name="{$option->optionName}" value="{$i18nPlainValues[$option->optionName]}" class="long">
 {include file='multipleLanguageInputJavascript' elementIdentifier=$option->optionName forceSelection=false}
\ No newline at end of file
diff --git a/com.woltlab.wcf/templates/textOptionType.tpl b/com.woltlab.wcf/templates/textOptionType.tpl
index 3477f93a84..a7b643097b 100644
--- a/com.woltlab.wcf/templates/textOptionType.tpl
+++ b/com.woltlab.wcf/templates/textOptionType.tpl
@@ -1 +1 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minlength > 0} required="required"{/if}{if $option->maxlength} maxlength="{$option->maxlength}"{/if}{if $inputClass} class="{@$inputClass}"{/if} />
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minlength > 0} required="required"{/if}{if $option->maxlength} maxlength="{$option->maxlength}"{/if}{if $inputClass} class="{@$inputClass}"{/if}>
diff --git a/com.woltlab.wcf/templates/textSearchableOptionType.tpl b/com.woltlab.wcf/templates/textSearchableOptionType.tpl
index 945e8366e7..b16f8c98d4 100644
--- a/com.woltlab.wcf/templates/textSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/textSearchableOptionType.tpl
@@ -1,5 +1,5 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchTextOption{/lang}</label>
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled="disabled"{/if} />
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled="disabled"{/if}>
 
 <script data-relocate="true">
 //<![CDATA[
diff --git a/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl b/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl
index 7d22daa2d6..33d4a793e2 100644
--- a/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl
@@ -1,4 +1,4 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchTextOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
 <textarea id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if} cols="40" rows="10">{$value}</textarea>
 
 <script data-relocate="true">
diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 451deb62c5..016050893d 100644
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -3,7 +3,7 @@
 {assign var='contentHeader' value=' '}{* necessary to hide default content header in heade.tpl *}
 
 {capture assign='headContent'}
-	<link rel="canonical" href="{link controller='User' object=$user}{/link}" />
+	<link rel="canonical" href="{link controller='User' object=$user}{/link}">
 	
 	{event name='javascriptInclude'}
 	<script data-relocate="true">
diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl
index 2f437fb389..f8bb4d4987 100644
--- a/com.woltlab.wcf/templates/userException.tpl
+++ b/com.woltlab.wcf/templates/userException.tpl
@@ -8,7 +8,7 @@
 <script data-relocate="true">
 	//<![CDATA[
 	if (document.referrer) {
-		$('#errorMessage').append('<br /><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 
+		$('#errorMessage').append('<br><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 
 	}
 	//]]>
 </script>
diff --git a/com.woltlab.wcf/templates/userProfileAboutEditable.tpl b/com.woltlab.wcf/templates/userProfileAboutEditable.tpl
index 261f57b952..aa3c5280ea 100644
--- a/com.woltlab.wcf/templates/userProfileAboutEditable.tpl
+++ b/com.woltlab.wcf/templates/userProfileAboutEditable.tpl
@@ -7,7 +7,7 @@
 				<dl>
 					<dt><label for="__userTitle">{lang}wcf.user.userTitle{/lang}</label></dt>
 					<dd>
-						<input type="text" id="__userTitle" name="values[__userTitle]" value="{$__userTitle}" class="long" maxlength="{@USER_TITLE_MAX_LENGTH}" />
+						<input type="text" id="__userTitle" name="values[__userTitle]" value="{$__userTitle}" class="long" maxlength="{@USER_TITLE_MAX_LENGTH}">
 						{if $errorType[__userTitle]|isset}
 							<small class="innerError">
 								{lang}wcf.user.userTitle.error.{@$errorType[__userTitle]}{/lang}
diff --git a/com.woltlab.wcf/templates/userSearch.tpl b/com.woltlab.wcf/templates/userSearch.tpl
index aa98a61098..bf8207ffde 100644
--- a/com.woltlab.wcf/templates/userSearch.tpl
+++ b/com.woltlab.wcf/templates/userSearch.tpl
@@ -11,7 +11,7 @@
 		<dl>
 			<dt><label for="searchUsername">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="searchUsername" name="username" value="{$username}" class="medium" />
+				<input type="text" id="searchUsername" name="username" value="{$username}" class="medium">
 			</dd>
 		</dl>
 		
@@ -33,7 +33,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index 7433466544..0cc97028ba 100644
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -1,10 +1,10 @@
 {capture assign='pageTitle'}{$__wcf->getActivePage()->getTitle()}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture}
 
 {capture assign='headContent'}
-	<link rel="canonical" href="{link controller='UsersOnlineList'}{/link}" />
+	<link rel="canonical" href="{link controller='UsersOnlineList'}{/link}">
 	
 	{if USERS_ONLINE_PAGE_REFRESH > 0}
-		<meta http-equiv="refresh" content="{@USERS_ONLINE_PAGE_REFRESH}; url={link controller='UsersOnlineList'}{if $pageNo > 1}pageNo={@$pageNo}&{/if}sortField={@$sortField}&sortOrder={@$sortOrder}{/link}" />
+		<meta http-equiv="refresh" content="{@USERS_ONLINE_PAGE_REFRESH}; url={link controller='UsersOnlineList'}{if $pageNo > 1}pageNo={@$pageNo}&{/if}sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">
 	{/if}
 {/capture}
 
@@ -35,7 +35,7 @@
 				</dl>
 			
 				<div class="formSubmit">
-					<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+					<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 					{@SID_INPUT_TAG}
 				</div>
 			</div>
@@ -141,7 +141,7 @@
 		{capture append=robotsOnlineList}
 			<li>
 				<div class="box48">
-					<div><img src="{$__wcf->getPath()}images/avatars/avatar-spider-default.svg" alt="" class="userAvatarImage icon48" /></div>
+					<div><img src="{$__wcf->getPath()}images/avatars/avatar-spider-default.svg" alt="" class="userAvatarImage icon48"></div>
 					
 					<div class="details userInformation">
 						<div class="containerHeadline">
@@ -161,7 +161,7 @@
 		{capture append=guestsOnlineList}
 			<li>
 				<div class="box48">
-					<div><img src="{$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage icon48" /></div>
+					<div><img src="{$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage icon48"></div>
 					
 					<div class="details userInformation">
 						<div class="containerHeadline">
diff --git a/wcfsetup/install.php b/wcfsetup/install.php
index f36ad6a225..47867e6854 100644
--- a/wcfsetup/install.php
+++ b/wcfsetup/install.php
@@ -133,15 +133,15 @@ class SystemException extends \Exception implements IPrintableException {
 			
 			<h2>Information:</h2>
 			<p>
-				<b>error message:</b> <?php echo htmlspecialchars($this->getMessage()); ?><br />
-				<b>error code:</b> <?php echo intval($this->getCode()); ?><br />
+				<b>error message:</b> <?php echo htmlspecialchars($this->getMessage()); ?><br>
+				<b>error code:</b> <?php echo intval($this->getCode()); ?><br>
 				<?php echo $this->information; ?>
-				<b>file:</b> <?php echo htmlspecialchars($this->getFile()); ?> (<?php echo $this->getLine(); ?>)<br />
-				<b>php version:</b> <?php echo htmlspecialchars(phpversion()); ?><br />
-				<b>wcf version:</b> <?php if (defined('WCF_VERSION')) echo WCF_VERSION; ?><br />
-				<b>date:</b> <?php echo gmdate('r'); ?><br />
-				<b>request:</b> <?php if (isset($_SERVER['REQUEST_URI'])) echo htmlspecialchars($_SERVER['REQUEST_URI']); ?><br />
-				<b>referer:</b> <?php if (isset($_SERVER['HTTP_REFERER'])) echo htmlspecialchars($_SERVER['HTTP_REFERER']); ?><br />
+				<b>file:</b> <?php echo htmlspecialchars($this->getFile()); ?> (<?php echo $this->getLine(); ?>)<br>
+				<b>php version:</b> <?php echo htmlspecialchars(phpversion()); ?><br>
+				<b>wcf version:</b> <?php if (defined('WCF_VERSION')) echo WCF_VERSION; ?><br>
+				<b>date:</b> <?php echo gmdate('r'); ?><br>
+				<b>request:</b> <?php if (isset($_SERVER['REQUEST_URI'])) echo htmlspecialchars($_SERVER['REQUEST_URI']); ?><br>
+				<b>referer:</b> <?php if (isset($_SERVER['HTTP_REFERER'])) echo htmlspecialchars($_SERVER['HTTP_REFERER']); ?><br>
 			</p>
 			
 			<h2>Stacktrace:</h2>
diff --git a/wcfsetup/install/files/acp/dereferrer.php b/wcfsetup/install/files/acp/dereferrer.php
index 025038b8e2..9094a3942e 100644
--- a/wcfsetup/install/files/acp/dereferrer.php
+++ b/wcfsetup/install/files/acp/dereferrer.php
@@ -21,7 +21,7 @@ if (strpos($testURL, 'script:') !== false || !preg_match('~^https?://~', $testUR
 <html dir="ltr" lang="en">
 <head>
 	<title>Dereferer</title>
-	<meta http-equiv="refresh" content="0;URL=<?php echo $url; ?>" />
+	<meta http-equiv="refresh" content="0;URL=<?php echo $url; ?>">
 </head>
 <body>
 	<p><a href="<?php echo $url; ?>"><?php echo $url; ?></a></p>
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
index 4db8cbed80..11758b2fa1 100644
--- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
@@ -42,7 +42,7 @@
 					<tr>
 						<td class="columnID columnSessionLogID">{@$sessionLog->sessionLogID}</td>
 						<td class="columnTitle columnUsername"><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->username}</a></td>
-						<td class="columnSmallText columnIpAddress"><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->getIpAddress()}</a>{if $sessionLog->hostname != $sessionLog->ipAddress}<br /><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->hostname}</a>{/if}</td>
+						<td class="columnSmallText columnIpAddress"><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->getIpAddress()}</a>{if $sessionLog->hostname != $sessionLog->ipAddress}<br><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->hostname}</a>{/if}</td>
 						<td class="columnSmallText columnUserAgent" title="{$sessionLog->userAgent}"><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->userAgent|truncate:75|tableWordwrap}</a></td>
 						<td class="columnDate columnTime">{@$sessionLog->time|time}</td>
 						<td class="columnDate columnLastActivityTime">{@$sessionLog->lastActivityTime|time}</td>
diff --git a/wcfsetup/install/files/acp/templates/adAdd.tpl b/wcfsetup/install/files/acp/templates/adAdd.tpl
index dfe55c0d47..ffba830938 100644
--- a/wcfsetup/install/files/acp/templates/adAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/adAdd.tpl
@@ -35,7 +35,7 @@
 		<dl{if $errorField == 'adName'} class="formError"{/if}>
 			<dt><label for="adName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="adName" name="adName" value="{$adName}" required="required" autofocus="autofocus" class="long" />
+				<input type="text" id="adName" name="adName" value="{$adName}" required="required" autofocus="autofocus" class="long">
 				{if $errorField == 'adName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -68,7 +68,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.ad.isDisabled{/lang}</label>
+				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.ad.isDisabled{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -102,7 +102,7 @@
 		<dl>
 			<dt><label for="showOrder">{lang}wcf.acp.ad.showOrder{/lang}</label></dt>
 			<dd>
-				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0" />
+				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0">
 				<small>{lang}wcf.acp.ad.showOrder.description{/lang}</small>
 			</dd>
 		</dl>
@@ -153,7 +153,7 @@
 	</section>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/applicationEdit.tpl b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
index 5f56f6a64f..1383e92bd6 100644
--- a/wcfsetup/install/files/acp/templates/applicationEdit.tpl
+++ b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
@@ -27,7 +27,7 @@
 		<dl{if $errorField == 'domainName'} class="formError"{/if}>
 			<dt><label for="domainName">{lang}wcf.acp.application.domainName{/lang}</label></dt>
 			<dd>
-				<input type="text" name="domainName" id="domainName" value="{$domainName}" class="long" />
+				<input type="text" name="domainName" id="domainName" value="{$domainName}" class="long">
 				{if $errorField == 'domainName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -44,7 +44,7 @@
 		<dl{if $errorField == 'domainPath'} class="formError"{/if}>
 			<dt><label for="domainPath">{lang}wcf.acp.application.domainPath{/lang}</label></dt>
 			<dd>
-				<input type="text" name="domainPath" id="domainPath" value="{$domainPath}" class="long" />
+				<input type="text" name="domainPath" id="domainPath" value="{$domainPath}" class="long">
 				<small>{lang}wcf.acp.application.domainPath.description{/lang}</small>
 				{if $errorField == 'domainPath'}
 					<small class="innerError">
@@ -70,7 +70,7 @@
 		<dl{if $errorField == 'cookieDomain'} class="formError{/if}">
 			<dt><label for="cookieDomain">{lang}wcf.acp.application.cookieDomain{/lang}</label></dt>
 			<dd>
-				<input type="text" name="cookieDomain" id="cookieDomain" value="{$cookieDomain}" class="long" />
+				<input type="text" name="cookieDomain" id="cookieDomain" value="{$cookieDomain}" class="long">
 				{if $errorField == 'cookieDomain'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -89,7 +89,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index 6ceb45fb24..3118afc53c 100644
--- a/wcfsetup/install/files/acp/templates/articleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -87,7 +87,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.acp.article.author{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" class="medium" />
+				<input type="text" id="username" name="username" value="{$username}" class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -103,7 +103,7 @@
 		<dl{if $errorField == 'time'} class="formError"{/if}>
 			<dt><label for="time">{lang}wcf.article.time{/lang}</label></dt>
 			<dd>
-				<input type="datetime" id="time" name="time" value="{$time}" class="medium" />
+				<input type="datetime" id="time" name="time" value="{$time}" class="medium">
 				{if $errorField == 'time'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -119,16 +119,16 @@
 		<dl>
 			<dt><label for="categoryID">{lang}wcf.acp.article.publicationStatus{/lang}</label></dt>
 			<dd>
-				<label><input type="radio" name="publicationStatus" value="0" {if $publicationStatus == 0}checked="checked" {/if}/> {lang}wcf.acp.article.publicationStatus.unpublished{/lang}</label>
-				<label><input type="radio" name="publicationStatus" value="1" {if $publicationStatus == 1}checked="checked" {/if}/> {lang}wcf.acp.article.publicationStatus.published{/lang}</label>
-				<label><input type="radio" name="publicationStatus" value="2" {if $publicationStatus == 2}checked="checked" {/if}/> {lang}wcf.acp.article.publicationStatus.delayed{/lang}</label>
+				<label><input type="radio" name="publicationStatus" value="0"{if $publicationStatus == 0} checked="checked"{/if}> {lang}wcf.acp.article.publicationStatus.unpublished{/lang}</label>
+				<label><input type="radio" name="publicationStatus" value="1"{if $publicationStatus == 1} checked="checked"{/if}> {lang}wcf.acp.article.publicationStatus.published{/lang}</label>
+				<label><input type="radio" name="publicationStatus" value="2"{if $publicationStatus == 2} checked="checked"{/if}> {lang}wcf.acp.article.publicationStatus.delayed{/lang}</label>
 			</dd>
 		</dl>
 		
 		<dl id="publicationDateDl"{if $errorField == 'publicationDate'} class="formError"{/if}{if $publicationStatus != 2} style="display: none"{/if}>
 			<dt><label for="publicationDate">{lang}wcf.acp.article.publicationDate{/lang}</label></dt>
 			<dd>
-				<input type="datetime" id="publicationDate" name="publicationDate" value="{$publicationDate}" class="medium" />
+				<input type="datetime" id="publicationDate" name="publicationDate" value="{$publicationDate}" class="medium">
 				{if $errorField == 'publicationDate'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -144,7 +144,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input name="enableComments" type="checkbox" value="1"{if $enableComments} checked="checked"{/if} /> {lang}wcf.acp.article.enableComments{/lang}</label>
+				<label><input name="enableComments" type="checkbox" value="1"{if $enableComments} checked="checked"{/if}> {lang}wcf.acp.article.enableComments{/lang}</label>
 			</dd>
 		</dl>
 	</div>
@@ -161,7 +161,7 @@
 							{/if}
 						</div>
 						<p class="button jsMediaSelectButton" data-store="imageID0" data-display="imageDisplay">{lang}wcf.acp.article.image.button.chooseImage{/lang}</p>
-						<input type="hidden" name="imageID[0]" id="imageID0"{if $imageID[0]|isset} value="{@$imageID[0]}"{/if} />
+						<input type="hidden" name="imageID[0]" id="imageID0"{if $imageID[0]|isset} value="{@$imageID[0]}"{/if}>
 						{if $errorField == 'image'}
 							<small class="innerError">{lang}wcf.acp.article.image.error.{@$errorType}{/lang}</small>
 						{/if}
@@ -179,7 +179,7 @@
 			<dl{if $errorField == 'title'} class="formError"{/if}>
 				<dt><label for="title0">{lang}wcf.acp.article.title{/lang}</label></dt>
 				<dd>
-					<input type="text" id="title0" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long" />
+					<input type="text" id="title0" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long">
 					{if $errorField == 'title'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -196,7 +196,7 @@
 				<dl class="jsOnly">
 					<dt><label for="tagSearchInput">{lang}wcf.tagging.tags{/lang}</label></dt>
 					<dd>
-						<input id="tagSearchInput" type="text" value="" class="long" />
+						<input id="tagSearchInput" type="text" value="" class="long">
 						<small>{lang}wcf.tagging.tags.description{/lang}</small>
 					</dd>
 				</dl>
@@ -275,7 +275,7 @@
 										{/if}
 									</div>
 									<p class="button jsMediaSelectButton" data-store="imageID{@$availableLanguage->languageID}" data-display="imageDisplay{@$availableLanguage->languageID}">{lang}wcf.acp.article.image.button.chooseImage{/lang}</p>
-									<input type="hidden" name="imageID[{@$availableLanguage->languageID}]" id="imageID{@$availableLanguage->languageID}"{if $imageID[$availableLanguage->languageID]|isset} value="{@$imageID[$availableLanguage->languageID]}"{/if} />
+									<input type="hidden" name="imageID[{@$availableLanguage->languageID}]" id="imageID{@$availableLanguage->languageID}"{if $imageID[$availableLanguage->languageID]|isset} value="{@$imageID[$availableLanguage->languageID]}"{/if}>
 									{if $errorField == 'image'|concat:$availableLanguage->languageID}
 										<small class="innerError">{lang}wcf.acp.article.image.error.{@$errorType}{/lang}</small>
 									{/if}
@@ -293,7 +293,7 @@
 						<dl{if $errorField == 'title'|concat:$availableLanguage->languageID} class="formError"{/if}>
 							<dt><label for="title{@$availableLanguage->languageID}">{lang}wcf.acp.article.title{/lang}</label></dt>
 							<dd>
-								<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long" />
+								<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long">
 								{if $errorField == 'title'|concat:$availableLanguage->languageID}
 									<small class="innerError">
 										{if $errorType == 'empty'}
@@ -310,7 +310,7 @@
 							<dl class="jsOnly">
 								<dt><label for="tagSearchInput{@$availableLanguage->languageID}">{lang}wcf.tagging.tags{/lang}</label></dt>
 								<dd>
-									<input id="tagSearchInput{@$availableLanguage->languageID}" type="text" value="" class="long" />
+									<input id="tagSearchInput{@$availableLanguage->languageID}" type="text" value="" class="long">
 									<small>{lang}wcf.tagging.tags.description{/lang}</small>
 								</dd>
 							</dl>
diff --git a/wcfsetup/install/files/acp/templates/articleList.tpl b/wcfsetup/install/files/acp/templates/articleList.tpl
index 9daf33c477..152817bfc8 100644
--- a/wcfsetup/install/files/acp/templates/articleList.tpl
+++ b/wcfsetup/install/files/acp/templates/articleList.tpl
@@ -50,21 +50,21 @@
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="pageTitle" name="title" value="{$title}" placeholder="{lang}wcf.acp.article.title{/lang}" class="long" />
+					<input type="text" id="pageTitle" name="title" value="{$title}" placeholder="{lang}wcf.acp.article.title{/lang}" class="long">
 				</dd>
 			</dl>
 			
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="pageContent" name="content" value="{$content}" placeholder="{lang}wcf.acp.article.content{/lang}" class="long" />
+					<input type="text" id="pageContent" name="content" value="{$content}" placeholder="{lang}wcf.acp.article.content{/lang}" class="long">
 				</dd>
 			</dl>
 			
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.acp.article.author{/lang}" class="long" />
+					<input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.acp.article.author{/lang}" class="long">
 				</dd>
 			</dl>
 			
@@ -72,7 +72,7 @@
 		</div>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</section>
@@ -129,7 +129,7 @@
 									{if $article->getImage()}
 										{@$article->getImage()->getElementTag(48)}
 									{else}
-										<img src="{@$__wcf->getPath()}images/placeholderTiny.png" style="width: 48px; height: 48px" alt="" />
+										<img src="{@$__wcf->getPath()}images/placeholderTiny.png" style="width: 48px; height: 48px" alt="">
 									{/if}
 								</span>
 								
diff --git a/wcfsetup/install/files/acp/templates/attachmentList.tpl b/wcfsetup/install/files/acp/templates/attachmentList.tpl
index 0e03c09125..471c89c963 100644
--- a/wcfsetup/install/files/acp/templates/attachmentList.tpl
+++ b/wcfsetup/install/files/acp/templates/attachmentList.tpl
@@ -36,14 +36,14 @@
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.user.username{/lang}" class="long" />
+					<input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.user.username{/lang}" class="long">
 				</dd>
 			</dl>
 			
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="filename" name="filename" value="{$filename}" placeholder="{lang}wcf.attachment.filename{/lang}" class="long" />
+					<input type="text" id="filename" name="filename" value="{$filename}" placeholder="{lang}wcf.attachment.filename{/lang}" class="long">
 				</dd>
 			</dl>
 			
@@ -63,7 +63,7 @@
 		</div>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</section>
@@ -111,7 +111,7 @@
 							<div class="box48">
 								<a href="{link controller='Attachment' id=$attachment->attachmentID}{/link}"{if $attachment->isImage} class="jsImageViewer" title="{$attachment->filename}"{/if}>
 									{if $attachment->tinyThumbnailType}
-										<img src="{link controller='Attachment' id=$attachment->attachmentID}tiny=1{/link}" class="attachmentTinyThumbnail" alt="" />
+										<img src="{link controller='Attachment' id=$attachment->attachmentID}tiny=1{/link}" class="attachmentTinyThumbnail" alt="">
 									{else}
 										<span class="icon icon48 fa-paperclip"></span>
 									{/if}
diff --git a/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl b/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl
index 73c9395640..42a30590a5 100644
--- a/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach from=$bbCodes item='bbCode'}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$bbCode}" {if $bbCode|in_array:$selectedBBCodes}checked="checked" {/if} /> {$bbCode}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$bbCode}" {if $bbCode|in_array:$selectedBBCodes}checked="checked" {/if}> {$bbCode}</label>
 {/foreach}
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
index 661e19c1e3..3458bf2159 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
@@ -7,28 +7,28 @@
 		<dl>
 			<dt><label for="attributes[{ldelim}@$attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
 			<dd>
-				<input type="text" id="attributes[{ldelim}@$attributeNo}][attributeHtml]" name="attributes[{ldelim}@$attributeNo}][attributeHtml]" value="" class="long" />
+				<input type="text" id="attributes[{ldelim}@$attributeNo}][attributeHtml]" name="attributes[{ldelim}@$attributeNo}][attributeHtml]" value="" class="long">
 			</dd>
 		</dl>
 		
 		<dl>
 			<dt><label for="attributes[{ldelim}@$attributeNo}][validationPattern]">{lang}wcf.acp.bbcode.attribute.validationPattern{/lang}</label></dt>
 			<dd>
-				<input type="text" id="attributes[{ldelim}@$attributeNo}][validationPattern]" name="attributes[{ldelim}@$attributeNo}][validationPattern]" value="" class="long" />
+				<input type="text" id="attributes[{ldelim}@$attributeNo}][validationPattern]" name="attributes[{ldelim}@$attributeNo}][validationPattern]" value="" class="long">
 			</dd>
 		</dl>
 		
 		<dl>
 			<dt></dt>
 			<dd>
-				<label for="attributes[{ldelim}@$attributeNo}][required]"><input type="checkbox" id="attributes[{ldelim}@$attributeNo}][required]" name="attributes[{ldelim}@$attributeNo}][required]" value="1" /> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
+				<label for="attributes[{ldelim}@$attributeNo}][required]"><input type="checkbox" id="attributes[{ldelim}@$attributeNo}][required]" name="attributes[{ldelim}@$attributeNo}][required]" value="1"> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
 			</dd>
 		</dl>
 		
 		<dl>
 			<dt></dt>
 			<dd>
-				<label for="attributes[{ldelim}@$attributeNo}][useText]"><input type="checkbox" id="attributes[{ldelim}@$attributeNo}][useText]" name="attributes[{ldelim}@$attributeNo}][useText]" value="1" /> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
+				<label for="attributes[{ldelim}@$attributeNo}][useText]"><input type="checkbox" id="attributes[{ldelim}@$attributeNo}][useText]" name="attributes[{ldelim}@$attributeNo}][useText]" value="1"> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
 				<small>{lang}wcf.acp.bbcode.attribute.useText.description{/lang}</small>
 			</dd>
 		</dl>
@@ -101,7 +101,7 @@
 		<dl{if $errorField == 'bbcodeTag'} class="formError"{/if}>
 			<dt><label for="bbcodeTag">{lang}wcf.acp.bbcode.bbcodeTag{/lang}</label></dt>
 			<dd>
-				<input type="text" id="bbcodeTag" name="bbcodeTag" value="{$bbcodeTag}" required="required" autofocus="autofocus" pattern="^[a-zA-Z0-9]+$" class="medium" />
+				<input type="text" id="bbcodeTag" name="bbcodeTag" value="{$bbcodeTag}" required="required" autofocus="autofocus" pattern="^[a-zA-Z0-9]+$" class="medium">
 				{if $errorField == 'bbcodeTag'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -117,7 +117,7 @@
 		<dl{if $errorField == 'htmlOpen'} class="formError"{/if}>
 			<dt><label for="htmlOpen">{lang}wcf.acp.bbcode.htmlOpen{/lang}</label></dt>
 			<dd>
-				<input type="text" id="htmlOpen" name="htmlOpen" value="{$htmlOpen}" class="long" />
+				<input type="text" id="htmlOpen" name="htmlOpen" value="{$htmlOpen}" class="long">
 				{if $errorField == 'htmlOpen'}
 					<small class="innerError">{lang}wcf.acp.bbcode.htmlOpen.error.{$errorType}{/lang}</small>
 				{/if}
@@ -127,7 +127,7 @@
 		<dl{if $errorField == 'htmlClose'} class="formError"{/if}>
 			<dt><label for="htmlClose">{lang}wcf.acp.bbcode.htmlClose{/lang}</label></dt>
 			<dd>
-				<input type="text" id="htmlClose" name="htmlClose" value="{$htmlClose}" class="long" />
+				<input type="text" id="htmlClose" name="htmlClose" value="{$htmlClose}" class="long">
 				{if $errorField == 'htmlClose'}
 					<small class="innerError">{lang}wcf.acp.bbcode.htmlClose.error.{$errorType}{/lang}</small>
 				{/if}
@@ -145,7 +145,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label for="isSourceCode"><input type="checkbox" id="isSourceCode" name="isSourceCode" value="1"{if $isSourceCode} checked="checked"{/if} /> {lang}wcf.acp.bbcode.isSourceCode{/lang}</label>
+				<label for="isSourceCode"><input type="checkbox" id="isSourceCode" name="isSourceCode" value="1"{if $isSourceCode} checked="checked"{/if}> {lang}wcf.acp.bbcode.isSourceCode{/lang}</label>
 				<small>{lang}wcf.acp.bbcode.isSourceCode.description{/lang}</small>
 			</dd>
 		</dl>
@@ -153,7 +153,7 @@
 		<dl{if $errorField == 'className'} class="formError"{/if}>
 			<dt><label for="className">{lang}wcf.acp.bbcode.className{/lang}</label></dt>
 			<dd>
-				<input type="text" id="className" name="className" value="{$className}" class="long" pattern="^\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\\)*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$" />
+				<input type="text" id="className" name="className" value="{$className}" class="long" pattern="^\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\\)*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$">
 				{if $errorField == 'className'}
 					<small class="innerError">{lang}wcf.acp.bbcode.className.error.{$errorType}{/lang}</small>
 				{/if}
@@ -164,14 +164,14 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" id="showButton" name="showButton" value="1"{if $showButton} checked="checked"{/if} /> {lang}wcf.acp.bbcode.showButton{/lang}</label>
+					<label><input type="checkbox" id="showButton" name="showButton" value="1"{if $showButton} checked="checked"{/if}> {lang}wcf.acp.bbcode.showButton{/lang}</label>
 				</dd>
 			</dl>
 			
 			<dl class="jsButtonSetting{if $errorField == 'buttonLabel'} formError{/if}">
 				<dt><label for="buttonLabel">{lang}wcf.acp.bbcode.buttonLabel{/lang}</label></dt>
 				<dd>
-					<input type="text" id="buttonLabel" name="buttonLabel" value="{$i18nPlainValues['buttonLabel']}" class="long" />
+					<input type="text" id="buttonLabel" name="buttonLabel" value="{$i18nPlainValues['buttonLabel']}" class="long">
 					{if $errorField == 'buttonLabel'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -191,7 +191,7 @@
 			<dl class="jsButtonSetting{if $errorField == 'wysiwygIcon'} formError{/if}">
 				<dt><label for="wysiwygIcon">{lang}wcf.acp.bbcode.wysiwygIcon{/lang}</label></dt>
 				<dd>
-					<input type="text" id="wysiwygIcon" name="wysiwygIcon" value="{$wysiwygIcon}" class="long" />
+					<input type="text" id="wysiwygIcon" name="wysiwygIcon" value="{$wysiwygIcon}" class="long">
 					{if $errorField == 'wysiwygIcon'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -219,14 +219,14 @@
 				<dl{if $errorField == 'attributeHtml'|concat:$attribute->attributeNo} class="formError"{/if}>
 					<dt><label for="attributes[{@$attribute->attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
 					<dd>
-						<input type="text" id="attributes[{@$attribute->attributeNo}][attributeHtml]" name="attributes[{@$attribute->attributeNo}][attributeHtml]" value="{$attribute->attributeHtml}" class="long" />
+						<input type="text" id="attributes[{@$attribute->attributeNo}][attributeHtml]" name="attributes[{@$attribute->attributeNo}][attributeHtml]" value="{$attribute->attributeHtml}" class="long">
 					</dd>
 				</dl>
 				
 				<dl{if $errorField == 'attributeValidationPattern'|concat:$attribute->attributeNo} class="formError"{/if}>
 					<dt><label for="attributes[{@$attribute->attributeNo}][validationPattern]">{lang}wcf.acp.bbcode.attribute.validationPattern{/lang}</label></dt>
 					<dd>
-						<input type="text" id="attributes[{@$attribute->attributeNo}][validationPattern]" name="attributes[{@$attribute->attributeNo}][validationPattern]" value="{$attribute->validationPattern}" class="long" />
+						<input type="text" id="attributes[{@$attribute->attributeNo}][validationPattern]" name="attributes[{@$attribute->attributeNo}][validationPattern]" value="{$attribute->validationPattern}" class="long">
 						{if $errorField == 'attributeValidationPattern'|concat:$attribute->attributeNo}
 							<small class="innerError">
 								{if $errorType == 'notValid'}
@@ -239,13 +239,13 @@
 				
 				<dl{if $errorField == 'attributeRequired'|concat:$attribute->attributeNo} class="formError"{/if}>
 					<dd>
-						<label for="attributes[{@$attribute->attributeNo}][required]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][required]" name="attributes[{@$attribute->attributeNo}][required]" value="1"{if $attribute->required} checked="checked"{/if} /> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
+						<label for="attributes[{@$attribute->attributeNo}][required]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][required]" name="attributes[{@$attribute->attributeNo}][required]" value="1"{if $attribute->required} checked="checked"{/if}> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
 					</dd>
 				</dl>
 				
 				<dl{if $errorField == 'attributeUseText'|concat:$attribute->attributeNo} class="formError"{/if}>
 					<dd>
-						<label for="attributes[{@$attribute->attributeNo}][useText]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][useText]" name="attributes[{@$attribute->attributeNo}][useText]" value="1"{if $attribute->useText} checked="checked"{/if} /> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
+						<label for="attributes[{@$attribute->attributeNo}][useText]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][useText]" name="attributes[{@$attribute->attributeNo}][useText]" value="1"{if $attribute->useText} checked="checked"{/if}> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
 						<small>{lang}wcf.acp.bbcode.attribute.useText.description{/lang}</small>
 					</dd>
 				</dl>
@@ -258,7 +258,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
index 3bf309f34f..05fdde8b2a 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'title'} class="formError"{/if}>
 			<dt><label for="title">{lang}wcf.acp.bbcode.mediaProvider.title{/lang}</label></dt>
 			<dd>
-				<input type="text" id="title" name="title" value="{$title}" required="required" autofocus="autofocus" class="long" />
+				<input type="text" id="title" name="title" value="{$title}" required="required" autofocus="autofocus" class="long">
 				{if $errorField == 'title'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -78,7 +78,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/benchmark.tpl b/wcfsetup/install/files/acp/templates/benchmark.tpl
index d790c9d7ba..b5bb5ddf3b 100644
--- a/wcfsetup/install/files/acp/templates/benchmark.tpl
+++ b/wcfsetup/install/files/acp/templates/benchmark.tpl
@@ -14,7 +14,7 @@
 		<ul id="benchmarkDetails" style="display: none;">
 			{foreach from=$__wcf->getBenchmark()->getItems() key=benchmarkIndex item=item}
 				<li id="benchmarkItem{@$benchmarkIndex}" style="margin-bottom: 8px;"{if $item.use >= 0.01} class="hot"{/if}>
-					<span>{if $item.type == 1}(SQL Query) {/if}{$item.text}</span><br />
+					<span>{if $item.type == 1}(SQL Query) {/if}{$item.text}</span><br>
 					<small style="font-size: .85em">Execution time: {@$item.use}s</small>
 				
 				<pre style="display: none">{foreach from=$item.trace key=traceNo item=traceItem}#{#$traceNo} {if !$traceItem.class|empty}{$traceItem.class}{$traceItem.type}{else}{if !$traceItem.file|empty}{$traceItem.file}: {/if}{/if}{$traceItem.function}() {if !$traceItem.line|empty}(line {#$traceItem.line}){/if} 
diff --git a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
index b8420e86fd..2636ab8752 100644
--- a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
@@ -1,5 +1,5 @@
-<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" />
+<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 data-relocate="true">
 //<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index cdb201fe04..3e5f8fb7eb 100644
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -71,7 +71,7 @@
 				<dl{if $errorField == 'name'} class="formError"{/if}>
 					<dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
 					<dd>
-						<input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long" />
+						<input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long">
 						{if $errorField == 'name'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -150,14 +150,14 @@
 				<dl>
 					<dt><label for="showOrder">{lang}wcf.acp.box.showOrder{/lang}</label></dt>
 					<dd>
-						<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="tiny" min="0" />
+						<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="tiny" min="0">
 					</dd>
 				</dl>
 				
 				<dl{if $errorField == 'cssClassName'} class="formError"{/if}>
 					<dt><label for="cssClassName">{lang}wcf.acp.box.cssClassName{/lang}</label></dt>
 					<dd>
-						<input type="text" id="cssClassName" name="cssClassName" value="{$cssClassName}" class="long" />
+						<input type="text" id="cssClassName" name="cssClassName" value="{$cssClassName}" class="long">
 						{if $errorField == 'cssClassName'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -173,7 +173,7 @@
 				<dl>
 					<dt></dt>
 					<dd>
-						<label><input type="checkbox" id="showHeader" name="showHeader" value="1" {if $showHeader}checked="checked" {/if}/> {lang}wcf.acp.box.showHeader{/lang}</label>
+						<label><input type="checkbox" id="showHeader" name="showHeader" value="1"{if $showHeader} checked="checked"{/if}> {lang}wcf.acp.box.showHeader{/lang}</label>
 					</dd>
 				</dl>
 			</div>
@@ -184,9 +184,9 @@
 				<dl>
 					<dt></dt>
 					<dd class="floated">
-						<label><input type="radio" name="linkType" value="none"{if $linkType == 'none'} checked="checked"{/if} /> {lang}wcf.acp.box.linkType.none{/lang}</label>
-						<label><input type="radio" name="linkType" value="internal"{if $linkType == 'internal'} checked="checked"{/if} /> {lang}wcf.acp.box.linkType.internal{/lang}</label>
-						<label><input type="radio" name="linkType" value="external"{if $linkType == 'external'} checked="checked"{/if} /> {lang}wcf.acp.box.linkType.external{/lang}</label>
+						<label><input type="radio" name="linkType" value="none"{if $linkType == 'none'} checked="checked"{/if}> {lang}wcf.acp.box.linkType.none{/lang}</label>
+						<label><input type="radio" name="linkType" value="internal"{if $linkType == 'internal'} checked="checked"{/if}> {lang}wcf.acp.box.linkType.internal{/lang}</label>
+						<label><input type="radio" name="linkType" value="external"{if $linkType == 'external'} checked="checked"{/if}> {lang}wcf.acp.box.linkType.external{/lang}</label>
 					</dd>
 				</dl>
 				
@@ -234,7 +234,7 @@
 				<dl id="externalURLContainer"{if $errorField == 'externalURL'} class="formError"{/if}{if $linkType != 'external'} style="display: none;"{/if}>
 					<dt><label for="externalURL">{lang}wcf.acp.box.link.externalURL{/lang}</label></dt>
 					<dd>
-						<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long" />
+						<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long">
 						{if $errorField == 'externalURL'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -270,7 +270,7 @@
 									{/if}
 								</div>
 								<p class="button jsMediaSelectButton" data-store="imageID0" data-display="imageDisplay">{lang}wcf.acp.box.image.button.chooseImage{/lang}</p>
-								<input type="hidden" name="imageID[0]" id="imageID0"{if $imageID[0]|isset} value="{@$imageID[0]}"{/if} />
+								<input type="hidden" name="imageID[0]" id="imageID0"{if $imageID[0]|isset} value="{@$imageID[0]}"{/if}>
 								{if $errorField == 'image'}
 									<small class="innerError">{lang}wcf.acp.box.image.error.{@$errorType}{/lang}</small>
 								{/if}
@@ -288,7 +288,7 @@
 					<dl{if $errorField == 'title'} class="formError"{/if}>
 						<dt><label for="title0">{lang}wcf.acp.box.title{/lang}</label></dt>
 						<dd>
-							<input type="text" id="title0" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long" />
+							<input type="text" id="title0" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long">
 							{if $errorField == 'title'}
 								<small class="innerError">
 									{if $errorType == 'empty'}
@@ -342,7 +342,7 @@
 													{/if}
 												</div>
 												<p class="button jsMediaSelectButton" data-store="imageID{@$availableLanguage->languageID}" data-display="imageDisplay{@$availableLanguage->languageID}">{lang}wcf.acp.box.image.button.chooseImage{/lang}</p>
-												<input type="hidden" name="imageID[{@$availableLanguage->languageID}]" id="imageID{@$availableLanguage->languageID}"{if $imageID[$availableLanguage->languageID]|isset} value="{@$imageID[$availableLanguage->languageID]}"{/if} />
+												<input type="hidden" name="imageID[{@$availableLanguage->languageID}]" id="imageID{@$availableLanguage->languageID}"{if $imageID[$availableLanguage->languageID]|isset} value="{@$imageID[$availableLanguage->languageID]}"{/if}>
 												{if $errorField == 'image'|concat:$availableLanguage->languageID}
 													<small class="innerError">{lang}wcf.acp.box.image.error.{@$errorType}{/lang}</small>
 												{/if}
@@ -361,7 +361,7 @@
 								<dl{if $errorField == 'title'|concat:$availableLanguage->languageID} class="formError"{/if}>
 									<dt><label for="title{@$availableLanguage->languageID}">{lang}wcf.acp.box.title{/lang}</label></dt>
 									<dd>
-										<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long" />
+										<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long">
 										{if $errorField == 'title'|concat:$availableLanguage->languageID}
 											<small class="innerError">
 												{if $errorType == 'empty'}
@@ -403,7 +403,7 @@
 				<dl>
 					<dt></dt>
 					<dd>
-						<label><input type="checkbox" id="visibleEverywhere" name="visibleEverywhere" value="1" {if $visibleEverywhere}checked="checked" {/if}/> {lang}wcf.acp.box.visibleEverywhere{/lang}</label>
+						<label><input type="checkbox" id="visibleEverywhere" name="visibleEverywhere" value="1"{if $visibleEverywhere} checked="checked"{/if}> {lang}wcf.acp.box.visibleEverywhere{/lang}</label>
 					</dd>
 				</dl>
 				
@@ -413,7 +413,7 @@
 						<ul class="scrollableCheckboxList">
 							{foreach from=$pageNodeList item=pageNode}
 								<li{if $pageNode->getDepth() > 1} style="padding-left: {$pageNode->getDepth()*20-20}px"{/if}>
-									<label><input type="checkbox" name="pageIDs[]" value="{@$pageNode->pageID}"{if $pageNode->pageID|in_array:$pageIDs} checked="checked"{/if} /> {$pageNode->name}</label>
+									<label><input type="checkbox" name="pageIDs[]" value="{@$pageNode->pageID}"{if $pageNode->pageID|in_array:$pageIDs} checked="checked"{/if}> {$pageNode->name}</label>
 								</li>
 							{/foreach}
 						</ul>
@@ -424,8 +424,8 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		<input type="hidden" name="isMultilingual" value="{@$isMultilingual}" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+		<input type="hidden" name="isMultilingual" value="{@$isMultilingual}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/boxConditions.tpl b/wcfsetup/install/files/acp/templates/boxConditions.tpl
index 94547f9408..451b9cfc0d 100644
--- a/wcfsetup/install/files/acp/templates/boxConditions.tpl
+++ b/wcfsetup/install/files/acp/templates/boxConditions.tpl
@@ -7,7 +7,7 @@
 		<dl{if $errorField === 'limit'} class="formError"{/if}>
 			<dt>{lang}wcf.acp.box.settings.limit{/lang}</dt>
 			<dd>
-				<input type="number" name="limit" id="limit" value="{$limit}" min="{$minimumLimit}"{if $maximumLimit !== null} max="{$maximumLimit}"{/if} class="tiny" />
+				<input type="number" name="limit" id="limit" value="{$limit}" min="{$minimumLimit}"{if $maximumLimit !== null} max="{$maximumLimit}"{/if} class="tiny">
 				{if $errorField === 'limit'}
 					<small class="innerError">
 						{if $errorType === 'lessThan'}
diff --git a/wcfsetup/install/files/acp/templates/boxList.tpl b/wcfsetup/install/files/acp/templates/boxList.tpl
index 10acae3af4..1bf291f0fe 100644
--- a/wcfsetup/install/files/acp/templates/boxList.tpl
+++ b/wcfsetup/install/files/acp/templates/boxList.tpl
@@ -30,21 +30,21 @@
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="name" name="name" value="{$name}" placeholder="{lang}wcf.global.name{/lang}" class="long" />
+					<input type="text" id="name" name="name" value="{$name}" placeholder="{lang}wcf.global.name{/lang}" class="long">
 				</dd>
 			</dl>
 			
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="boxTitle" name="title" value="{$title}" placeholder="{lang}wcf.acp.box.title{/lang}" class="long" />
+					<input type="text" id="boxTitle" name="title" value="{$title}" placeholder="{lang}wcf.acp.box.title{/lang}" class="long">
 				</dd>
 			</dl>
 			
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="boxContent" name="content" value="{$content}" placeholder="{lang}wcf.acp.box.content{/lang}" class="long" />
+					<input type="text" id="boxContent" name="content" value="{$content}" placeholder="{lang}wcf.acp.box.content{/lang}" class="long">
 				</dd>
 			</dl>
 			
@@ -79,7 +79,7 @@
 		</div>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</section>
diff --git a/wcfsetup/install/files/acp/templates/bulkProcessing.tpl b/wcfsetup/install/files/acp/templates/bulkProcessing.tpl
index 7778ee03e5..f4db6d457b 100644
--- a/wcfsetup/install/files/acp/templates/bulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/bulkProcessing.tpl
@@ -46,7 +46,7 @@
 			<dt></dt>
 			<dd>
 				{foreach from=$actions item=actionObjectType}
-					<label><input type="radio" name="action" value="{@$actionObjectType->action}" {if $actionObjectType->action == $action}checked="checked" {/if}/> {lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{@$actionObjectType->action}{/lang}</label>
+					<label><input type="radio" name="action" value="{@$actionObjectType->action}"{if $actionObjectType->action == $action} checked="checked"{/if}> {lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{@$actionObjectType->action}{/lang}</label>
 				{/foreach}
 				
 				{if $errorField == 'action'}
@@ -78,7 +78,7 @@
 	</section>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/captchaQuestion.tpl b/wcfsetup/install/files/acp/templates/captchaQuestion.tpl
index 7754c5d5a8..a682bf4e33 100644
--- a/wcfsetup/install/files/acp/templates/captchaQuestion.tpl
+++ b/wcfsetup/install/files/acp/templates/captchaQuestion.tpl
@@ -1,4 +1,4 @@
-<input type="hidden" name="captchaQuestion" value="{$captchaQuestion}" />
+<input type="hidden" name="captchaQuestion" value="{$captchaQuestion}">
 
 {if !$captchaQuestionAnswered}
 	<section class="section">
@@ -10,7 +10,7 @@
 		<dl{if (($errorType|isset && $errorType|is_array && $errorType[captchaAnswer]|isset) || ($errorField|isset && $errorField == 'captchaAnswer'))} class="formError"{/if}>
 			<dt><label for="captchaAnswer">{lang}{$captchaQuestionObject->question}{/lang}</label></dt>
 			<dd>
-				<input type="text" id="captchaAnswer" name="captchaAnswer" class="medium" />
+				<input type="text" id="captchaAnswer" name="captchaAnswer" class="medium">
 				{if (($errorType|isset && $errorType|is_array && $errorType[captchaAnswer]|isset) || ($errorField|isset && $errorField == 'captchaAnswer'))}
 					{if $errorType|is_array && $errorType[captchaAnswer]|isset}
 						{assign var='__errorType' value=$errorType[captchaAnswer]}
diff --git a/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl b/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
index fb9b119d7e..22969743be 100644
--- a/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'question'} class="formError"{/if}>
 			<dt><label for="question">{lang}wcf.acp.captcha.question.question{/lang}</label></dt>
 			<dd>
-				<input type="text" id="question" name="question" value="{$i18nPlainValues[question]}" required="required" autofocus="autofocus" class="long" />
+				<input type="text" id="question" name="question" value="{$i18nPlainValues[question]}" required="required" autofocus="autofocus" class="long">
 				{if $errorField == 'question'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -64,7 +64,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.captcha.question.isDisabled{/lang}</label>
+				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.captcha.question.isDisabled{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -74,7 +74,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
index c041e1f64c..4ce1d4d12a 100644
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@ -61,7 +61,7 @@
 		<dl{if $errorField == 'title'} class="formError"{/if}>
 			<dt><label for="title">{@$objectType->getProcessor()->getLanguageVariable('title')}</label></dt>
 			<dd>
-				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" class="long" />
+				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" class="long">
 				{if $errorField == 'title'}
 					<small class="innerError">
 						{if $errorType == 'empty' || $errorType == 'multilingual'}
@@ -99,7 +99,7 @@
 		<dl{if $errorField == 'isDisabled'} class="formError"{/if}>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if} /> {@$objectType->getProcessor()->getLanguageVariable('isDisabled')}</label>
+				<label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if}> {@$objectType->getProcessor()->getLanguageVariable('isDisabled')}</label>
 				{hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('isDisabled.description', true)}{/content}</small>{/hascontent}
 			</dd>
 		</dl>
@@ -132,7 +132,7 @@
 		<dl{if $errorField == 'showOrder'} class="formError"{/if}>
 			<dt><label for="showOrder">{@$objectType->getProcessor()->getLanguageVariable('showOrder')}</label></dt>
 			<dd>
-				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" min="0" class="short" />
+				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" min="0" class="short">
 				{if $errorField == 'showOrder'}
 					<small class="innerError">
 						{assign var=__languageVariable value='showOrder.error.'|concat:$errorType}
@@ -162,7 +162,7 @@
 	{event name='afterSections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/checkboxesOptionType.tpl b/wcfsetup/install/files/acp/templates/checkboxesOptionType.tpl
index 62f6c3f37c..ade4955da1 100644
--- a/wcfsetup/install/files/acp/templates/checkboxesOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/checkboxesOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
diff --git a/wcfsetup/install/files/acp/templates/checkboxesSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/checkboxesSearchableOptionType.tpl
index 3c88d945b9..59735a04ca 100644
--- a/wcfsetup/install/files/acp/templates/checkboxesSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/checkboxesSearchableOptionType.tpl
@@ -1,6 +1,6 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if}{if !$searchOption} disabled="disabled"{/if} /> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if}{if !$searchOption} disabled="disabled"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
 
 <script data-relocate="true">
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index 2b9b923e84..565372afb8 100644
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -27,7 +27,7 @@
 		<dl{if $errorField == 'className'} class="formError"{/if}>
 			<dt><label for="className">{lang}wcf.acp.cronjob.className{/lang}</label></dt>
 			<dd>
-				<input type="text" id="className" name="className" value="{$className}" required="required" autofocus="autofocus" pattern="^\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\\)*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$" class="long" />
+				<input type="text" id="className" name="className" value="{$className}" required="required" autofocus="autofocus" pattern="^\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\\)*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$" class="long">
 				{if $errorField == 'className'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -43,7 +43,7 @@
 		<dl{if $errorField == 'description'} class="formError"{/if}>
 			<dt><label for="description">{lang}wcf.acp.cronjob.description{/lang}</label></dt>
 			<dd>
-				<input type="text" id="description" name="description" value="{$i18nPlainValues['description']}" class="long" />
+				<input type="text" id="description" name="description" value="{$i18nPlainValues['description']}" class="long">
 				{if $errorField == 'description'}
 					<small class="innerError">
 						{if $errorType == 'empty' || $errorType == 'multilingual'}
@@ -66,7 +66,7 @@
 		<dl{if $errorField == 'startMinute'} class="formError"{/if}>
 			<dt><label for="startMinute">{lang}wcf.acp.cronjob.startMinute{/lang}</label></dt>
 			<dd>
-				<input type="text" id="startMinute" name="startMinute" value="{$startMinute}" class="short" />
+				<input type="text" id="startMinute" name="startMinute" value="{$startMinute}" class="short">
 				{if $errorField == 'startMinute'}
 					<small class="innerError">
 						{lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
@@ -79,7 +79,7 @@
 		<dl{if $errorField == 'startHour'} class="formError"{/if}>
 			<dt><label for="startHour">{lang}wcf.acp.cronjob.startHour{/lang}</label></dt>
 			<dd>
-				<input type="text" id="startHour" name="startHour" value="{$startHour}" class="short" />
+				<input type="text" id="startHour" name="startHour" value="{$startHour}" class="short">
 				{if $errorField == 'startHour'}
 					<small class="innerError">
 						{lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
@@ -92,7 +92,7 @@
 		<dl{if $errorField == 'startDom'} class="formError"{/if}>
 			<dt><label for="startDom">{lang}wcf.acp.cronjob.startDom{/lang}</label></dt>
 			<dd>
-				<input type="text" id="startDom" name="startDom" value="{$startDom}" class="short" />
+				<input type="text" id="startDom" name="startDom" value="{$startDom}" class="short">
 				{if $errorField == 'startDom'}
 					<small class="innerError">
 						{lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
@@ -105,7 +105,7 @@
 		<dl{if $errorField == 'startMonth'} class="formError"{/if}>
 			<dt><label for="startMonth">{lang}wcf.acp.cronjob.startMonth{/lang}</label></dt>
 			<dd>
-				<input type="text" id="startMonth" name="startMonth" value="{$startMonth}" class="short" />
+				<input type="text" id="startMonth" name="startMonth" value="{$startMonth}" class="short">
 				{if $errorField == 'startMonth'}
 					<small class="innerError">
 						{lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
@@ -118,7 +118,7 @@
 		<dl{if $errorField == 'startDow'} class="formError"{/if}>
 			<dt><label for="startDow">{lang}wcf.acp.cronjob.startDow{/lang}</label></dt>
 			<dd>
-				<input type="text" id="startDow" name="startDow" value="{$startDow}" class="short" />
+				<input type="text" id="startDow" name="startDow" value="{$startDow}" class="short">
 				{if $errorField == 'startDow'}
 					<small class="innerError">
 						{lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
@@ -134,7 +134,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/dataImport.tpl b/wcfsetup/install/files/acp/templates/dataImport.tpl
index 4135e9d4a3..5b191df3e1 100644
--- a/wcfsetup/install/files/acp/templates/dataImport.tpl
+++ b/wcfsetup/install/files/acp/templates/dataImport.tpl
@@ -117,8 +117,8 @@
 			</section>
 			
 			<div class="formSubmit">
-				<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-				<input type="hidden" name="sourceSelection" value="1" />
+				<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+				<input type="hidden" name="sourceSelection" value="1">
 				{@SECURITY_TOKEN_INPUT_TAG}
 			</div>
 		</form>
@@ -135,10 +135,10 @@
 				<dl class="wide">
 					<dt></dt>
 					<dd class="jsImportCollection">
-						<label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportSection"{if $objectTypeName|in_array:$selectedData} checked="checked"{/if} /> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
+						<label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportSection"{if $objectTypeName|in_array:$selectedData} checked="checked"{/if}> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
 						<p>
 							{foreach from=$objectTypes item=objectTypeName}
-								<label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportItem"{if $objectTypeName|in_array:$selectedData} checked="checked"{/if} /> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
+								<label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportItem"{if $objectTypeName|in_array:$selectedData} checked="checked"{/if}> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
 							{/foreach}
 						</p>
 					</dd>
@@ -154,8 +154,8 @@
 			<dl>
 				<dt><label for="userMergeMode">{lang}wcf.acp.dataImport.configure.settings.userMergeMode{/lang}</label></dt>
 				<dd>
-					<label><input type="radio" id="userMergeMode" name="userMergeMode" value="4" {if $userMergeMode == 4}checked="checked" {/if}/> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.4{/lang}</label>
-					<label><input type="radio" name="userMergeMode" value="5" {if $userMergeMode == 5}checked="checked" {/if}/> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.5{/lang}</label>
+					<label><input type="radio" id="userMergeMode" name="userMergeMode" value="4"{if $userMergeMode == 4} checked="checked"{/if}> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.4{/lang}</label>
+					<label><input type="radio" name="userMergeMode" value="5"{if $userMergeMode == 5} checked="checked"{/if}> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.5{/lang}</label>
 				</dd>
 			</dl>
 			
@@ -168,35 +168,35 @@
 			<dl>
 				<dt><label for="dbHost">{lang}wcf.acp.dataImport.configure.database.host{/lang}</label></dt>
 				<dd>
-					<input type="text" id="dbHost" name="dbHost" value="{$dbHost}" class="long" />
+					<input type="text" id="dbHost" name="dbHost" value="{$dbHost}" class="long">
 				</dd>
 			</dl>
 			
 			<dl>
 				<dt><label for="dbUser">{lang}wcf.acp.dataImport.configure.database.user{/lang}</label></dt>
 				<dd>
-					<input type="text" id="dbUser" name="dbUser" value="{$dbUser}" class="medium" />
+					<input type="text" id="dbUser" name="dbUser" value="{$dbUser}" class="medium">
 				</dd>
 			</dl>
 			
 			<dl>
 				<dt><label for="dbPassword">{lang}wcf.acp.dataImport.configure.database.password{/lang}</label></dt>
 				<dd>
-					<input type="password" id="dbPassword" name="dbPassword" value="{$dbPassword}" class="medium" autocomplete="off" />
+					<input type="password" id="dbPassword" name="dbPassword" value="{$dbPassword}" class="medium" autocomplete="off">
 				</dd>
 			</dl>
 			
 			<dl>
 				<dt><label for="dbName">{lang}wcf.acp.dataImport.configure.database.name{/lang}</label></dt>
 				<dd>
-					<input type="text" id="dbName" name="dbName" value="{$dbName}" class="medium" />
+					<input type="text" id="dbName" name="dbName" value="{$dbName}" class="medium">
 				</dd>
 			</dl>
 			
 			<dl>
 				<dt><label for="dbPrefix">{lang}wcf.acp.dataImport.configure.database.prefix{/lang}</label></dt>
 				<dd>
-					<input type="text" id="dbPrefix" name="dbPrefix" value="{$dbPrefix}" class="short" />
+					<input type="text" id="dbPrefix" name="dbPrefix" value="{$dbPrefix}" class="short">
 					{if $errorField == 'database'}
 						<small class="innerError">{lang}wcf.acp.dataImport.configure.database.error{/lang}</small>
 					{/if}
@@ -212,7 +212,7 @@
 			<dl{if $errorField == 'fileSystemPath'} class="formError"{/if}>
 				<dt><label for="fileSystemPath">{lang}wcf.acp.dataImport.configure.fileSystem.path{/lang}</label></dt>
 				<dd>
-					<input type="text" id="fileSystemPath" name="fileSystemPath" value="{$fileSystemPath}" class="long" />
+					<input type="text" id="fileSystemPath" name="fileSystemPath" value="{$fileSystemPath}" class="long">
 					{if $errorField == 'fileSystemPath'}
 						<small class="innerError">{lang}wcf.acp.dataImport.configure.fileSystem.path.error{/lang}</small>
 					{/if}
@@ -226,8 +226,8 @@
 		{event name='sections'}
 		
 		<div class="formSubmit">
-			<input type="hidden" name="exporterName" value="{$exporterName}" />
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="hidden" name="exporterName" value="{$exporterName}">
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</form>
diff --git a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
index 036a2e261f..d46b1400e4 100644
--- a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
+++ b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
@@ -45,7 +45,7 @@
 				<dl class="col-xs-12 col-md-4">
 					<dt></dt>
 					<dd>
-						<input type="text" id="exceptionID" name="exceptionID" value="{$exceptionID}" placeholder="{lang}wcf.acp.exceptionLog.search.exceptionID{/lang}" autofocus="autofocus" class="long" />
+						<input type="text" id="exceptionID" name="exceptionID" value="{$exceptionID}" placeholder="{lang}wcf.acp.exceptionLog.search.exceptionID{/lang}" autofocus="autofocus" class="long">
 					</dd>
 				</dl>
 				
@@ -62,7 +62,7 @@
 		</section>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		</div>
 	</form>
 {/if}
diff --git a/wcfsetup/install/files/acp/templates/exportMailAddressUserBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/exportMailAddressUserBulkProcessing.tpl
index 7f6a311ea2..427d022647 100644
--- a/wcfsetup/install/files/acp/templates/exportMailAddressUserBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/exportMailAddressUserBulkProcessing.tpl
@@ -1,22 +1,22 @@
 <dl>
 	<dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
 	<dd>
-		<label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
-		<label><input type="radio" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
+		<label><input type="radio" name="fileType" value="csv"{if $fileType == 'csv'} checked="checked"{/if}> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
+		<label><input type="radio" name="fileType" value="xml"{if $fileType == 'xml'} checked="checked"{/if}> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
 	</dd>
 </dl>
 
 <dl id="separatorDiv"{if $fileType == 'xml'} style="display: none;"{/if}>
 	<dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
 	<dd>
-		<input type="text" id="separator" name="separator" value="{$separator}" class="medium" />
+		<input type="text" id="separator" name="separator" value="{$separator}" class="medium">
 	</dd>
 </dl>
 
 <dl id="textSeparatorDiv"{if $fileType == 'xml'} style="display: none;"{/if}>
 	<dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
 	<dd>
-		<input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
+		<input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium">
 	</dd>
 </dl>
 
diff --git a/wcfsetup/install/files/acp/templates/fileOptionType.tpl b/wcfsetup/install/files/acp/templates/fileOptionType.tpl
index 85c035d03a..9517f72a04 100644
--- a/wcfsetup/install/files/acp/templates/fileOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/fileOptionType.tpl
@@ -1,4 +1,4 @@
-<input type="file" id="{$option->optionName}" name="{$option->optionName}" value="" />
+<input type="file" id="{$option->optionName}" name="{$option->optionName}" value="">
 {if $value}
-	<label><input type="checkbox" id="{$option->optionName}_remove_file" name="values[{$option->optionName}]" /> {lang}wcf.acp.option.{$option->optionName}.removeFile{/lang}</label>
+	<label><input type="checkbox" id="{$option->optionName}_remove_file" name="values[{$option->optionName}]"> {lang}wcf.acp.option.{$option->optionName}.removeFile{/lang}</label>
 {/if}
diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index e63e36e5a6..a4444a0e6c 100644
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -64,7 +64,7 @@
 			<dl{if $errorField == 'label'} class="formError"{/if}>
 				<dt><label for="label">{lang}wcf.acp.label.label{/lang}</label></dt>
 				<dd>
-					<input type="text" id="label" name="label" value="{$i18nPlainValues['label']}" autofocus="autofocus" class="long" />
+					<input type="text" id="label" name="label" value="{$i18nPlainValues['label']}" autofocus="autofocus" class="long">
 					{if $errorField == 'label'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -83,7 +83,7 @@
 			<dl>
 				<dt><label for="showOrder">{lang}wcf.acp.label.showOrder{/lang}</label></dt>
 				<dd>
-					<input type="number" min="0" id="showOrder" name="showOrder" class="tiny" value="{if $showOrder}{@$showOrder}{/if}" />
+					<input type="number" min="0" id="showOrder" name="showOrder" class="tiny" value="{if $showOrder}{@$showOrder}{/if}">
 					<small>{lang}wcf.acp.label.showOrder.description{/lang}</small>
 				</dd>
 			</dl>
@@ -94,9 +94,9 @@
 					<ul id="labelList" class="inlineList">
 						{foreach from=$availableCssClassNames item=className}
 							{if $className == 'custom'}
-								<li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if} /> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long" /></span></li>
+								<li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if}> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long"></span></li>
 							{else}
-								<li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if} /> <span class="badge label{if $className != 'none'} {$className}{/if}">Label</span></label></li>
+								<li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if}> <span class="badge label{if $className != 'none'} {$className}{/if}">Label</span></label></li>
 							{/if}
 						{/foreach}
 					</ul>
@@ -119,7 +119,7 @@
 		{event name='sections'}
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</form>
diff --git a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
index 6fadd116c3..1ecaf04420 100644
--- a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
@@ -54,7 +54,7 @@
 				<dl{if $errorField == 'groupName'} class="formError"{/if}>
 					<dt><label for="groupName">{lang}wcf.global.title{/lang}</label></dt>
 					<dd>
-						<input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" autofocus="autofocus" class="long" />
+						<input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" autofocus="autofocus" class="long">
 						{if $errorField == 'groupName'}
 							<small class="innerError">
 								{if $errorType == 'empty' || $errorType == 'multilingual'}
@@ -72,7 +72,7 @@
 				<dl>
 					<dt><label for="groupDescription">{lang}wcf.global.description{/lang}</label></dt>
 					<dd>
-						<input type="text" id="groupDescription" name="groupDescription" class="long" value="{$groupDescription}" maxlength="255" />
+						<input type="text" id="groupDescription" name="groupDescription" class="long" value="{$groupDescription}" maxlength="255">
 						<small>{lang}wcf.acp.label.group.groupDescription.description{/lang}</small>
 					</dd>
 				</dl>
@@ -80,13 +80,13 @@
 				<dl>
 					<dt><label for="showOrder">{lang}wcf.acp.label.group.showOrder{/lang}</label></dt>
 					<dd>
-						<input type="number" min="0" id="showOrder" name="showOrder" class="tiny" value="{if $showOrder}{@$showOrder}{/if}" />
+						<input type="number" min="0" id="showOrder" name="showOrder" class="tiny" value="{if $showOrder}{@$showOrder}{/if}">
 					</dd>
 				</dl>
 				
 				<dl>
 					<dt></dt>
-					<dd><label><input type="checkbox" name="forceSelection" id="forceSelection" value="1"{if $labelForceSelection} checked="checked"{/if} /> {lang}wcf.acp.label.group.forceSelection{/lang}</label></dd>
+					<dd><label><input type="checkbox" name="forceSelection" id="forceSelection" value="1"{if $labelForceSelection} checked="checked"{/if}> {lang}wcf.acp.label.group.forceSelection{/lang}</label></dd>
 				</dl>
 				
 				<dl id="groupPermissions">
@@ -113,7 +113,7 @@
 									{foreach from=$container item=objectType}
 										<li class="{if $objectType->isCategory()} category{/if}"{if $objectType->getDepth()} style="padding-left: {21 * $objectType->getDepth()}px"{/if} data-depth="{@$objectType->getDepth()}">
 											<span>{$objectType->getLabel()}</span>
-											<label><input id="checkbox_{@$container->getObjectTypeID()}_{@$objectType->getObjectID()}" type="checkbox" name="objectTypes[{@$container->getObjectTypeID()}][]" value="{@$objectType->getObjectID()}"{if $objectType->getOptionValue()} checked="checked"{/if} /></label>
+											<label><input id="checkbox_{@$container->getObjectTypeID()}_{@$objectType->getObjectID()}" type="checkbox" name="objectTypes[{@$container->getObjectTypeID()}][]" value="{@$objectType->getObjectID()}"{if $objectType->getOptionValue()} checked="checked"{/if}></label>
 										</li>
 									{/foreach}
 								</ul>
@@ -128,7 +128,7 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/labelList.tpl b/wcfsetup/install/files/acp/templates/labelList.tpl
index 83e74622b1..b7bfacf283 100644
--- a/wcfsetup/install/files/acp/templates/labelList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelList.tpl
@@ -52,7 +52,7 @@
 				<dl class="col-xs-12 col-md-4">
 					<dt><label for="label">{lang}wcf.acp.label.label{/lang}</label></dt>
 					<dd>
-						<input type="text" id="label" name="label" value="{$labelSearch}" class="long" />
+						<input type="text" id="label" name="label" value="{$labelSearch}" class="long">
 					</dd>
 				</dl>
 				
@@ -71,14 +71,14 @@
 				<dl class="col-xs-12 col-md-4">
 					<dt><label for="cssClassName">{lang}wcf.acp.label.cssClassName{/lang}</label></dt>
 					<dd>
-						<input type="text" id="cssClassName" name="cssClassName" value="{$cssClassName}" class="long" />
+						<input type="text" id="cssClassName" name="cssClassName" value="{$cssClassName}" class="long">
 					</dd>
 				</dl>
 			</div>
 		</section>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</form>
diff --git a/wcfsetup/install/files/acp/templates/languageAdd.tpl b/wcfsetup/install/files/acp/templates/languageAdd.tpl
index 64042b30c5..6642e53835 100644
--- a/wcfsetup/install/files/acp/templates/languageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageAdd.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'languageName'} class="formError"{/if}>
 			<dt><label for="languageName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="languageName" name="languageName" value="{$languageName}" class="long" required="required" />
+				<input type="text" id="languageName" name="languageName" value="{$languageName}" class="long" required="required">
 				{if $errorField == 'languageName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -42,7 +42,7 @@
 		<dl{if $errorField == 'languageCode'} class="formError"{/if}>
 			<dt><label for="languageCode">{lang}wcf.acp.language.code{/lang}</label></dt>
 			<dd>
-				<input type="text" id="languageCode" name="languageCode" value="{$languageCode}" class="medium" required="required" />
+				<input type="text" id="languageCode" name="languageCode" value="{$languageCode}" class="medium" required="required">
 				{if $errorField == 'languageCode'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -59,7 +59,7 @@
 		<dl{if $errorField == 'countryCode'} class="formError"{/if}>
 			<dt><label for="countryCode">{lang}wcf.acp.language.countryCode{/lang}</label></dt>
 			<dd>
-				<input type="text" id="countryCode" name="countryCode" value="{$countryCode}" class="medium" required="required" />
+				<input type="text" id="countryCode" name="countryCode" value="{$countryCode}" class="medium" required="required">
 				{if $errorField == 'countryCode'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -102,7 +102,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/languageExport.tpl b/wcfsetup/install/files/acp/templates/languageExport.tpl
index d94bcf9d70..5800a6b60c 100644
--- a/wcfsetup/install/files/acp/templates/languageExport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageExport.tpl
@@ -51,7 +51,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label for="exportCustomValues"><input type="checkbox" name="exportCustomValues" id="exportCustomValues" value="1" /> {lang}wcf.acp.language.export.customValues{/lang}</label>
+				<label for="exportCustomValues"><input type="checkbox" name="exportCustomValues" id="exportCustomValues" value="1"> {lang}wcf.acp.language.export.customValues{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -61,7 +61,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
+		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/languageImport.tpl b/wcfsetup/install/files/acp/templates/languageImport.tpl
index d1c3c8cee7..f54a3fd7c6 100644
--- a/wcfsetup/install/files/acp/templates/languageImport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageImport.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'languageUpload'} class="formError"{/if}>
 			<dt><label for="languageUpload">{lang}wcf.acp.language.import.source.upload{/lang}</label></dt>
 			<dd>
-				<input type="file" id="languageUpload" name="languageUpload" />
+				<input type="file" id="languageUpload" name="languageUpload">
 				{if $errorField == 'languageUpload'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -65,7 +65,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl b/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl
index 5505ea992b..a4d46ba06e 100644
--- a/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl
@@ -22,12 +22,12 @@
 		
 		<dl class="wide">
 			<dt></dt>
-			<dd><label><input type="checkbox" name="languageUseCustomValue" id="overlayLanguageUseCustomValue" value="1" {if $item->languageUseCustomValue}checked="checked" {/if}/> {lang}wcf.acp.language.item.useCustomValue{/lang}</label></dd>
+			<dd><label><input type="checkbox" name="languageUseCustomValue" id="overlayLanguageUseCustomValue" value="1"{if $item->languageUseCustomValue} checked="checked"{/if}> {lang}wcf.acp.language.item.useCustomValue{/lang}</label></dd>
 		</dl>
 	</section>
 {/if}
 
-<input type="hidden" name="languageItemID" id="overlayLanguageItemID" value="{@$item->languageItemID}" />
+<input type="hidden" name="languageItemID" id="overlayLanguageItemID" value="{@$item->languageItemID}">
 
 <div class="formSubmit">
 	<button class="jsSubmitLanguageItem buttonPrimary" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
diff --git a/wcfsetup/install/files/acp/templates/languageItemList.tpl b/wcfsetup/install/files/acp/templates/languageItemList.tpl
index e1c8169255..e43488a297 100644
--- a/wcfsetup/install/files/acp/templates/languageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemList.tpl
@@ -57,15 +57,15 @@
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="languageItem" name="languageItem" value="{$languageItem}" placeholder="{lang}wcf.global.name{/lang}" class="long" />
+					<input type="text" id="languageItem" name="languageItem" value="{$languageItem}" placeholder="{lang}wcf.global.name{/lang}" class="long">
 				</dd>
 			</dl>
 			
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="languageItemValue" name="languageItemValue" value="{$languageItemValue}" placeholder="{lang}wcf.acp.language.item.value{/lang}" class="long" />
-					<label><input type="checkbox" name="hasCustomValue" value="1" {if $hasCustomValue == 1}checked="checked" {/if}/> {lang}wcf.acp.language.item.customValues{/lang}</label>
+					<input type="text" id="languageItemValue" name="languageItemValue" value="{$languageItemValue}" placeholder="{lang}wcf.acp.language.item.value{/lang}" class="long">
+					<label><input type="checkbox" name="hasCustomValue" value="1"{if $hasCustomValue == 1} checked="checked"{/if}> {lang}wcf.acp.language.item.customValues{/lang}</label>
 				</dd>
 			</dl>
 			
@@ -73,7 +73,7 @@
 		</div>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</section>
diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
index 50be6abd83..2c2ec70acd 100644
--- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
+++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
@@ -32,7 +32,7 @@
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageMultilingualism'}{/link}">
 	<section class="section">
 		<header class="sectionHeader">
-			<h2 class="sectionTitle"><label><input type="checkbox" id="enable" name="enable" value="1" {if $enable}checked="checked" {/if}/> {lang}wcf.acp.language.multilingualism.enable{/lang}</label></h2>
+			<h2 class="sectionTitle"><label><input type="checkbox" id="enable" name="enable" value="1"{if $enable} checked="checked"{/if}> {lang}wcf.acp.language.multilingualism.enable{/lang}</label></h2>
 			<small class="sectionDescription">{lang}wcf.acp.language.multilingualism.enable.description{/lang}</small>
 		</header>
 		
@@ -40,7 +40,7 @@
 			<dt><label for="languageIDs">{lang}wcf.acp.language.multilingualism.languages{/lang}</label></dt>
 			<dd class="floated">
 				{foreach from=$languages item='language'}
-					<label><input type="checkbox" name="languageIDs[]" value="{@$language->languageID}"{if $language->languageID == $defaultLanguageID} checked="checked" disabled="disabled"{elseif $language->languageID|in_array:$languageIDs} checked="checked"{/if} /> {$language}</label>
+					<label><input type="checkbox" name="languageIDs[]" value="{@$language->languageID}"{if $language->languageID == $defaultLanguageID} checked="checked" disabled="disabled"{elseif $language->languageID|in_array:$languageIDs} checked="checked"{/if}> {$language}</label>
 				{/foreach}
 				
 				{if $errorField == 'languageIDs'}
@@ -57,7 +57,7 @@
 	{event name='sections'}
 		
 	<div class="formSubmit">
-		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
+		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
index 08aeac7e58..aad80bf13c 100644
--- a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
@@ -27,7 +27,7 @@
 		<dl{if $errorField == 'server'} class="formError"{/if}>
 			<dt><label for="server">{lang}wcf.acp.languageServer.server{/lang}</label></dt>
 			<dd>
-				<input type="text" name="server" id="server" value="{$server}" autofocus="autofocus" class="long" />
+				<input type="text" name="server" id="server" value="{$server}" autofocus="autofocus" class="long">
 				{if $errorField == 'server'}
 					<small class="innerError">
 						{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -44,7 +44,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index 229deb3759..fbbba4ecaa 100644
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -10,7 +10,7 @@
 		
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
-			<dd><input type="text" id="username" name="username" value="{$username}" class="long" />
+			<dd><input type="text" id="username" name="username" value="{$username}" class="long">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -25,7 +25,7 @@
 		
 		<dl{if $errorField == 'password'} class="formError"{/if}>
 			<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
-			<dd><input type="password" id="password" name="password" value="" class="long" />
+			<dd><input type="password" id="password" name="password" value="" class="long">
 				{if $errorField == 'password'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -41,8 +41,8 @@
 		{include file='captcha'}
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-			<input type="hidden" name="url" value="{$url}" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+			<input type="hidden" name="url" value="{$url}">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</form>
diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index dd7340cd1b..819d9a9b82 100644
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -19,7 +19,7 @@
 		<dl{if $errorField == 'masterPassword'} class="formError"{/if}>
 			<dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
 			<dd>
-				<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
+				<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium">
 				{if $errorField == 'masterPassword'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -39,8 +39,8 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		<input type="hidden" name="url" value="{$url}" />
+		<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+		<input type="hidden" name="url" value="{$url}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index 2b1b4bcd0c..4940728fd5 100644
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -23,7 +23,7 @@
 		<dl{if $errorField == 'masterPassword'} class="formError"{/if}>
 			<dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
 			<dd>
-				<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
+				<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium">
 				{if $errorField == 'masterPassword'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -40,7 +40,7 @@
 		<dl{if $errorField == 'confirmMasterPassword'} class="formError"{/if}>
 			<dt><label for="confirmMasterPassword">{lang}wcf.acp.masterPassword.confirm{/lang}</label></dt>
 			<dd>
-				<input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="medium" />
+				<input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="medium">
 				{if $errorField == 'confirmMasterPassword'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -57,7 +57,7 @@
 			<dt><label for="exampleMasterPassword">{lang}wcf.acp.masterPassword.example{/lang}</label></dt>
 			<dd>
 				<p><a class="jsTooltip" id="setPassword" title="{lang}wcf.acp.masterPassword.example.set{/lang}">{@$exampleMasterPassword}</a></p>
-				<input type="hidden" id="exampleMasterPassword" name="exampleMasterPassword" value="{@$exampleMasterPassword}" />
+				<input type="hidden" id="exampleMasterPassword" name="exampleMasterPassword" value="{@$exampleMasterPassword}">
 			</dd>
 		</dl>
 		
@@ -67,8 +67,8 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		<input type="hidden" name="url" value="{$url}" />
+		<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+		<input type="hidden" name="url" value="{$url}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/mediaAdd.tpl b/wcfsetup/install/files/acp/templates/mediaAdd.tpl
index 1a71b42995..a9e35652a7 100644
--- a/wcfsetup/install/files/acp/templates/mediaAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaAdd.tpl
@@ -69,7 +69,7 @@
 				<dt></dt>
 				<dd>
 					<label>
-						<input type="checkbox" id="isMultilingual" name="isMultilingual" value="1"{if $isMultilingual} checked="checked"{/if} />
+						<input type="checkbox" id="isMultilingual" name="isMultilingual" value="1"{if $isMultilingual} checked="checked"{/if}>
 						<span>{lang}wcf.media.isMultilingual{/lang}</span>
 					</label>
 				</dd>
@@ -80,7 +80,7 @@
 			<dl{if $errorField == 'title'} class="formError"{/if}>
 				<dt>{lang}wcf.global.title{/lang}</dt>
 				<dd>
-					<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" class="long" />
+					<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" class="long">
 					{if $errorField == 'title'}
 						<small class="innerError">
 							{if $errorType == 'title' || $errorType == 'multilingual'}
@@ -114,7 +114,7 @@
 			<dl{if $errorField == 'altText'} class="formError"{/if}>
 				<dt>{lang}wcf.media.altText{/lang}</dt>
 				<dd>
-					<input type="text" id="altText" name="altText" value="{$i18nPlainValues['altText']}" class="long" />
+					<input type="text" id="altText" name="altText" value="{$i18nPlainValues['altText']}" class="long">
 					{if $errorField == 'altText'}
 						<small class="innerError">
 							{if $errorType == 'title' || $errorType == 'multilingual'}
@@ -134,7 +134,7 @@
 		{event name='sections'}
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</form>
diff --git a/wcfsetup/install/files/acp/templates/mediaEditor.tpl b/wcfsetup/install/files/acp/templates/mediaEditor.tpl
index 76adbad860..2e9b939932 100644
--- a/wcfsetup/install/files/acp/templates/mediaEditor.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaEditor.tpl
@@ -25,7 +25,7 @@
 		<dt></dt>
 		<dd>
 			<label>
-				<input type="checkbox" id="isMultilingual" name="isMultilingual" value="1" />
+				<input type="checkbox" id="isMultilingual" name="isMultilingual" value="1">
 				<span>{lang}wcf.media.isMultilingual{/lang}</span>
 			</label>
 		</dd>
@@ -36,7 +36,7 @@
 	<dl>
 		<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
 		<dd>
-			<input type="text" id="title" name="title" class="long" />
+			<input type="text" id="title" name="title" class="long">
 		</dd>
 	</dl>
 	{include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=true}
@@ -52,7 +52,7 @@
 	<dl>
 		<dt><label for="altText">{lang}wcf.media.altText{/lang}</label></dt>
 		<dd>
-			<input type="text" id="altText" name="altText" class="long" />
+			<input type="text" id="altText" name="altText" class="long">
 		</dd>
 	</dl>
 	{include file='multipleLanguageInputJavascript' elementIdentifier='altText' forceSelection=true}
diff --git a/wcfsetup/install/files/acp/templates/mediaList.tpl b/wcfsetup/install/files/acp/templates/mediaList.tpl
index 8f0b5dad98..54e1388d89 100644
--- a/wcfsetup/install/files/acp/templates/mediaList.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaList.tpl
@@ -81,7 +81,7 @@
 							<li class="dropdownDivider"></li>
 							<li data-file-type="all"><span>{lang}wcf.media.search.filetype.all{/lang}</span></li>
 						</ul>
-						<input type="text" id="filename" name="filename" value="{$filename}" placeholder="{lang}wcf.media.filename{/lang}" class="long" />
+						<input type="text" id="filename" name="filename" value="{$filename}" placeholder="{lang}wcf.media.filename{/lang}" class="long">
 					</div>
 				</dd>
 			</dl>
@@ -89,7 +89,7 @@
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.user.username{/lang}" class="long" />
+					<input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.user.username{/lang}" class="long">
 				</dd>
 			</dl>
 		
@@ -97,7 +97,7 @@
 		</div>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</section>
@@ -121,7 +121,7 @@
 		<table class="table jsClipboardContainer" data-type="com.woltlab.wcf.media">
 			<thead>
 				<tr>
-					<th class="columnMark"><label><input type="checkbox" class="jsClipboardMarkAll" /></label></th>
+					<th class="columnMark"><label><input type="checkbox" class="jsClipboardMarkAll"></label></th>
 					<th class="columnID columnMediaID{if $sortField == 'mediaID'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='MediaList'}pageNo={@$pageNo}&sortField=mediaID&sortOrder={if $sortField == 'mediaID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
 					<th class="columnTitle columnFilename{if $sortField == 'filename'} active {@$sortOrder}{/if}"><a href="{link controller='MediaList'}pageNo={@$pageNo}&sortField=filename&sortOrder={if $sortField == 'filename' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.media.filename{/lang}</a></th>
 					<th class="columnDate columnUploadTime{if $sortField == 'uploadTime'} active {@$sortOrder}{/if}"><a href="{link controller='MediaList'}pageNo={@$pageNo}&sortField=uploadTime&sortOrder={if $sortField == 'uploadTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.media.uploadTime{/lang}</a></th>
@@ -134,7 +134,7 @@
 			<tbody>
 				{foreach from=$objects item=media}
 					<tr class="jsMediaRow jsClipboardObject">
-						<td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$media->mediaID}" /></td>
+						<td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$media->mediaID}"></td>
 						<td class="columnIcon">
 							<a href="{link controller='MediaEdit' object=$media}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
 							<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$media->mediaID}" data-confirm-message="{lang}wcf.media.delete.confirmMessage{/lang}"></span>
diff --git a/wcfsetup/install/files/acp/templates/mediaListItems.tpl b/wcfsetup/install/files/acp/templates/mediaListItems.tpl
index 746b73061b..48ffdb73d9 100644
--- a/wcfsetup/install/files/acp/templates/mediaListItems.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaListItems.tpl
@@ -11,7 +11,7 @@
 		<nav class="buttonGroupNavigation">
 			<ul class="smallButtons buttonGroup">
 				<li>
-					<input type="checkbox" class="jsClipboardItem jsMediaCheckbox" data-object-id="{@$media->mediaID}" />
+					<input type="checkbox" class="jsClipboardItem jsMediaCheckbox" data-object-id="{@$media->mediaID}">
 				</li>
 				{if $__wcf->session->getPermission('admin.content.cms.canManageMedia')}
 					<li>
diff --git a/wcfsetup/install/files/acp/templates/menuAdd.tpl b/wcfsetup/install/files/acp/templates/menuAdd.tpl
index 023520371f..66c5fe6541 100644
--- a/wcfsetup/install/files/acp/templates/menuAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuAdd.tpl
@@ -28,7 +28,7 @@
 		<dl{if $errorField == 'title'} class="formError"{/if}>
 			<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
 			<dd>
-				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus="autofocus" class="long" />
+				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus="autofocus" class="long">
 				{if $errorField == 'title'}
 					<small class="innerError">
 						{if $errorType == 'title' || $errorType == 'multilingual'}
@@ -68,14 +68,14 @@
 			<dl>
 				<dt><label for="showOrder">{lang}wcf.acp.box.showOrder{/lang}</label></dt>
 				<dd>
-					<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="tiny" min="0" />
+					<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="tiny" min="0">
 				</dd>
 			</dl>
 			
 			<dl{if $errorField == 'cssClassName'} class="formError"{/if}>
 				<dt><label for="cssClassName">{lang}wcf.acp.box.cssClassName{/lang}</label></dt>
 				<dd>
-					<input type="text" id="cssClassName" name="cssClassName" value="{$cssClassName}" class="long" />
+					<input type="text" id="cssClassName" name="cssClassName" value="{$cssClassName}" class="long">
 					{if $errorField == 'cssClassName'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -91,14 +91,14 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" id="showHeader" name="showHeader" value="1" {if $showHeader}checked="checked" {/if}/> {lang}wcf.acp.box.showHeader{/lang}</label>
+					<label><input type="checkbox" id="showHeader" name="showHeader" value="1"{if $showHeader} checked="checked"{/if}> {lang}wcf.acp.box.showHeader{/lang}</label>
 				</dd>
 			</dl>
 			
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" id="visibleEverywhere" name="visibleEverywhere" value="1" {if $visibleEverywhere}checked="checked" {/if}/> {lang}wcf.acp.box.visibleEverywhere{/lang}</label>
+					<label><input type="checkbox" id="visibleEverywhere" name="visibleEverywhere" value="1"{if $visibleEverywhere} checked="checked"{/if}> {lang}wcf.acp.box.visibleEverywhere{/lang}</label>
 				</dd>
 			</dl>
 			
@@ -120,7 +120,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
index 820182bafe..4f26fd2cc3 100644
--- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
@@ -66,7 +66,7 @@
 		<dl{if $errorField == 'title'} class="formError"{/if}>
 			<dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" name="title" id="title" value="{$title}" class="long" required="required" />
+				<input type="text" name="title" id="title" value="{$title}" class="long" required="required">
 				{if $errorField == 'title'}
 					<small class="innerError">
 						{if $errorType == 'multilingual'}
@@ -90,8 +90,8 @@
 		<dl>
 			<dt></dt>
 			<dd class="floated">
-				<label><input type="radio" name="isInternalLink" value="1"{if $isInternalLink} checked="checked"{/if} /> {lang}wcf.acp.menu.item.link.internal{/lang}</label>
-				<label><input type="radio" name="isInternalLink" value="0"{if !$isInternalLink} checked="checked"{/if} /> {lang}wcf.acp.menu.item.link.external{/lang}</label>
+				<label><input type="radio" name="isInternalLink" value="1"{if $isInternalLink} checked="checked"{/if}> {lang}wcf.acp.menu.item.link.internal{/lang}</label>
+				<label><input type="radio" name="isInternalLink" value="0"{if !$isInternalLink} checked="checked"{/if}> {lang}wcf.acp.menu.item.link.external{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -139,7 +139,7 @@
 		<dl id="externalURLContainer"{if $errorField == 'externalURL'} class="formError"{/if}{if $isInternalLink} style="display: none;"{/if}>
 			<dt><label for="externalURL">{lang}wcf.acp.menu.item.externalURL{/lang}</label></dt>
 			<dd>
-				<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long" />
+				<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long">
 				{if $errorField == 'externalURL'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -163,7 +163,7 @@
 		<dl>
 			<dt><label for="showOrder">{lang}wcf.acp.menu.item.showOrder{/lang}</label></dt>
 			<dd>
-				<input type="number" name="showOrder" id="showOrder" value="{@$showOrder}" class="tiny" min="0" />
+				<input type="number" name="showOrder" id="showOrder" value="{@$showOrder}" class="tiny" min="0">
 			</dd>
 		</dl>
 		
@@ -171,7 +171,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> <span>{lang}wcf.acp.menu.item.isDisabled{/lang}</span></label>
+					<label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> <span>{lang}wcf.acp.menu.item.isDisabled{/lang}</span></label>
 				</dd>
 			</dl>
 		{/if}
@@ -182,8 +182,8 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" />
-		{if $action == 'add'}<input type="hidden" name="menuID" value="{@$menuID}" />{/if}
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}">
+		{if $action == 'add'}<input type="hidden" name="menuID" value="{@$menuID}">{/if}
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl
index 67531cfdb2..84bb0cfb60 100644
--- a/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl
@@ -1,4 +1,4 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 <select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if !$searchOption} disabled="disabled"{/if}>
 	{foreach from=$selectOptions key=key item=selectOption}
 		<option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
diff --git a/wcfsetup/install/files/acp/templates/noticeAdd.tpl b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
index 44b426e65d..4b1635e6e4 100644
--- a/wcfsetup/install/files/acp/templates/noticeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
@@ -47,7 +47,7 @@
 		<dl{if $errorField == 'noticeName'} class="formError"{/if}>
 			<dt><label for="noticeName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="noticeName" name="noticeName" value="{$noticeName}" required="required" autofocus="autofocus" class="long" />
+				<input type="text" id="noticeName" name="noticeName" value="{$noticeName}" required="required" autofocus="autofocus" class="long">
 				{if $errorField == 'noticeName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -82,14 +82,14 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" id="noticeUseHtml" name="noticeUseHtml" value="1"{if $noticeUseHtml} checked="checked"{/if} /> {lang}wcf.acp.notice.noticeUseHtml{/lang}</label>
+				<label><input type="checkbox" id="noticeUseHtml" name="noticeUseHtml" value="1"{if $noticeUseHtml} checked="checked"{/if}> {lang}wcf.acp.notice.noticeUseHtml{/lang}</label>
 			</dd>
 		</dl>
 		
 		<dl>
 			<dt><label for="showOrder">{lang}wcf.acp.notice.showOrder{/lang}</label></dt>
 			<dd>
-				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0" />
+				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0">
 				<small>{lang}wcf.acp.notice.showOrder.description{/lang}</small>
 			</dd>
 		</dl>
@@ -105,9 +105,9 @@
 			<dd>
 				{foreach from=$availableCssClassNames item=className}
 					{if $className == 'custom'}
-						<label><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if} /> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="medium" /></span></label>
+						<label><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if}> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="medium"></span></label>
 					{else}
-						<label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if} /> <span>{lang}wcf.acp.notice.cssClassName.{$className}{/lang}</span></label>
+						<label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if}> <span>{lang}wcf.acp.notice.cssClassName.{$className}{/lang}</span></label>
 					{/if}
 				{/foreach}
 				{if $errorField == 'cssClassName'}
@@ -128,14 +128,14 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.notice.isDisabled{/lang}</label>
+				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.notice.isDisabled{/lang}</label>
 			</dd>
 		</dl>
 		
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isDismissible" value="1"{if $isDismissible} checked="checked"{/if} /> {lang}wcf.acp.notice.isDismissible{/lang}</label>
+				<label><input type="checkbox" name="isDismissible" value="1"{if $isDismissible} checked="checked"{/if}> {lang}wcf.acp.notice.isDismissible{/lang}</label>
 				<small>{lang}wcf.acp.notice.isDismissible.description{/lang}</small>
 			</dd>
 		</dl>
@@ -144,7 +144,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" name="resetIsDismissed" value="1"{if $resetIsDismissed} checked="checked"{/if} /> {lang}wcf.acp.notice.resetIsDismissed{/lang}</label>
+					<label><input type="checkbox" name="resetIsDismissed" value="1"{if $resetIsDismissed} checked="checked"{/if}> {lang}wcf.acp.notice.resetIsDismissed{/lang}</label>
 					<small>{lang}wcf.acp.notice.resetIsDismissed.description{/lang}</small>
 				</dd>
 			</dl>
@@ -198,7 +198,7 @@
 	{event name='conditionContainers'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
index ed5f5d8d12..1944ca91da 100644
--- a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
+++ b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
@@ -39,7 +39,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" name="applyChangesToExistingUsers" value="1" {if $applyChangesToExistingUsers}checked="checked" {/if}/> {lang}wcf.acp.user.notificationPresetSettings.applyChangesToExistingUsers{/lang}</label>
+					<label><input type="checkbox" name="applyChangesToExistingUsers" value="1"{if $applyChangesToExistingUsers} checked="checked"{/if}> {lang}wcf.acp.user.notificationPresetSettings.applyChangesToExistingUsers{/lang}</label>
 					<small>{lang}wcf.acp.user.notificationPresetSettings.applyChangesToExistingUsers.description{/lang}</small>	
 				</dd>
 			</dl>
@@ -89,7 +89,7 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl
index a4bbab0d41..c745ad1f1c 100644
--- a/wcfsetup/install/files/acp/templates/option.tpl
+++ b/wcfsetup/install/files/acp/templates/option.tpl
@@ -87,7 +87,7 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" name="__submit" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" name="__submit" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index e72c7d1265..677377b798 100644
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -101,9 +101,9 @@
 {/if}
 
 <div class="formSubmit">
-	<input type="button" id="backButton" value="{lang}wcf.global.button.back{/lang}" accesskey="c" />
+	<input type="button" id="backButton" value="{lang}wcf.global.button.back{/lang}" accesskey="c">
 	{if $validationPassed}
-		<input type="button" class="buttonPrimary" id="submitButton" value="{lang}wcf.global.button.next{/lang}" class="default" accesskey="s" />
+		<input type="button" class="buttonPrimary" id="submitButton" value="{lang}wcf.global.button.next{/lang}" class="default" accesskey="s">
 	{/if}
 </div>
 
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index c3e0758012..ab51fafb2d 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -52,16 +52,16 @@
 		<div class="section">
 			<dl>
 				<dt><label for="packageName">{lang}wcf.acp.package.search.packageName{/lang}</label></dt>
-				<dd><input type="text" id="packageName" value="" class="long" data-search-name="packageName" /></dd>
+				<dd><input type="text" id="packageName" value="" class="long" data-search-name="packageName"></dd>
 			</dl>
 			<dl>
 				<dt><label for="packageDescription">{lang}wcf.acp.package.search.packageDescription{/lang}</label></dt>
-				<dd><input type="text" id="packageDescription" value="" class="long" data-search-name="packageDescription" /></dd>
+				<dd><input type="text" id="packageDescription" value="" class="long" data-search-name="packageDescription"></dd>
 			</dl>
 			<dl>
 				<dt><label for="package">{lang}wcf.acp.package.search.package{/lang}</label></dt>
 				<dd>
-					<input type="text" id="package" value="" class="medium" data-search-name="package" />
+					<input type="text" id="package" value="" class="medium" data-search-name="package">
 					<small>{lang}wcf.acp.package.search.package.description{/lang}</small>
 				</dd>
 			</dl>
@@ -84,7 +84,7 @@
 				<dl{if $errorField == 'uploadPackage'} class="formError"{/if}>
 					<dt><label for="uploadPackage">{lang}wcf.acp.package.source.upload{/lang}</label></dt>
 					<dd>
-						<input type="file" id="uploadPackage" name="uploadPackage" value="" />
+						<input type="file" id="uploadPackage" name="uploadPackage" value="">
 						{if $errorField == 'uploadPackage'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -103,8 +103,8 @@
 			</div>
 			
 			<div class="formSubmit">
-				<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-				<input type="hidden" name="action" value="{$action}" />
+				<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+				<input type="hidden" name="action" value="{$action}">
 				{@SECURITY_TOKEN_INPUT_TAG}
 			</div>
 		</form>
diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index 91b4da762b..8cb3bd62b4 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -22,7 +22,7 @@
 	<section class="section" class="jsPackageUpdate" data-package="{$update[package]}">
 		<header class="sectionHeader">
 			<h2 class="sectionTitle"><label>
-				<input type="checkbox" value="1" checked="checked" />
+				<input type="checkbox" value="1" checked="checked">
 				{$update[packageName]|language}
 			</label></h2>
 			{if $update[packageDescription]}<small class="sectionDescription">{$update[packageDescription]|language}</small>{/if}
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
index 47e50f7bce..1220aa6a62 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
@@ -17,7 +17,7 @@
 {include file='formError'}
 
 {if $packageUpdateServer|isset && $packageUpdateServer->errorMessage}
-	<p class="warning">{lang}wcf.acp.updateServer.lastErrorMessage{/lang}<br />{$packageUpdateServer->errorMessage}</p>
+	<p class="warning">{lang}wcf.acp.updateServer.lastErrorMessage{/lang}<br>{$packageUpdateServer->errorMessage}</p>
 {/if}
 
 {if $success|isset}
@@ -29,7 +29,7 @@
 		<dl{if $errorField == 'serverURL'} class="formError"{/if}>
 			<dt><label for="serverURL">{lang}wcf.acp.updateServer.serverURL{/lang}</label></dt>
 			<dd>
-				<input type="url" id="serverURL" name="serverURL" value="{$serverURL}" required="required" autofocus="autofocus" class="long" />
+				<input type="url" id="serverURL" name="serverURL" value="{$serverURL}" required="required" autofocus="autofocus" class="long">
 				{if $errorField == 'serverURL'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -45,7 +45,7 @@
 		<dl>
 			<dt><label for="loginUsername">{lang}wcf.acp.updateServer.loginUsername{/lang}</label></dt>
 			<dd>
-				<input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="medium" />
+				<input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="medium">
 				<small>{lang}wcf.acp.updateServer.loginUsername.description{/lang}</small>
 			</dd>
 		</dl>
@@ -53,7 +53,7 @@
 		<dl>
 			<dt><label for="loginPassword">{lang}wcf.acp.updateServer.loginPassword{/lang}</label></dt>
 			<dd>
-				<input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="medium" autocomplete="off" />
+				<input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="medium" autocomplete="off">
 				<small>{lang}wcf.acp.updateServer.loginPassword.description{/lang}</small>
 			</dd>
 		</dl>
@@ -64,7 +64,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateUnauthorized.tpl b/wcfsetup/install/files/acp/templates/packageUpdateUnauthorized.tpl
index ee237ab899..2a023f2345 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateUnauthorized.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateUnauthorized.tpl
@@ -30,17 +30,17 @@
 	
 	<dl>
 		<dt><label for="packageUpdateServerUsername">{lang}wcf.acp.package.update.{if $updateServer->requiresLicense()}licenseNo{else}username{/if}{/lang}</label></dt>
-		<dd><input type="text" id="packageUpdateServerUsername" value="{if $serverAuthData[username]|isset}{$serverAuthData[username]}{/if}" class="long" /></dd>
+		<dd><input type="text" id="packageUpdateServerUsername" value="{if $serverAuthData[username]|isset}{$serverAuthData[username]}{/if}" class="long"></dd>
 	</dl>
 	
 	<dl>
 		<dt><label for="packageUpdateServerPassword">{lang}wcf.acp.package.update.{if $updateServer->requiresLicense()}serialNo{else}password{/if}{/lang}</label></dt>
-		<dd><input type="{if $updateServer->requiresLicense()}text{else}password{/if}" id="packageUpdateServerPassword" value="{if $serverAuthData[password]|isset}{$serverAuthData[password]}{/if}" class="long" /></dd>
+		<dd><input type="{if $updateServer->requiresLicense()}text{else}password{/if}" id="packageUpdateServerPassword" value="{if $serverAuthData[password]|isset}{$serverAuthData[password]}{/if}" class="long"></dd>
 	</dl>
 	
 	<dl>
 		<dt></dt>
-		<dd><label><input type="checkbox" id="packageUpdateServerSaveCredentials" value="1" /> {lang}wcf.acp.package.update.saveCredentials{/lang}</label></dd>
+		<dd><label><input type="checkbox" id="packageUpdateServerSaveCredentials" value="1"> {lang}wcf.acp.package.update.saveCredentials{/lang}</label></dd>
 	</dl>
 </section>
 
diff --git a/wcfsetup/install/files/acp/templates/pageAdd.tpl b/wcfsetup/install/files/acp/templates/pageAdd.tpl
index ce614511bb..ab2bec8c3a 100644
--- a/wcfsetup/install/files/acp/templates/pageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageAdd.tpl
@@ -67,7 +67,7 @@
 				<dl{if $errorField == 'name'} class="formError"{/if}>
 					<dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
 					<dd>
-						<input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long" />
+						<input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long">
 						{if $errorField == 'name'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -126,7 +126,7 @@
 					<dl{if $errorField == 'customURL_0'} class="formError"{/if}>
 						<dt><label for="customURL">{lang}wcf.acp.page.customURL{/lang}</label></dt>
 						<dd>
-							<input type="text" id="customURL" name="customURL[0]" value="{if !$customURL[0]|empty}{$customURL[0]}{/if}" class="long" />
+							<input type="text" id="customURL" name="customURL[0]" value="{if !$customURL[0]|empty}{$customURL[0]}{/if}" class="long">
 							{if $errorField == 'customURL_0'}
 								<small class="innerError">
 									{if $errorType == 'empty'}
@@ -144,7 +144,7 @@
 						<dl{if $errorField == $__errorFieldName} class="formError"{/if}>
 							<dt><label for="customURL{@$availableLanguage->languageID}">{lang}wcf.acp.page.customURL{/lang} ({$availableLanguage->languageName})</label></dt>
 							<dd>
-								<input type="text" id="customURL{@$availableLanguage->languageID}" name="customURL[{@$availableLanguage->languageID}]" value="{if !$customURL[$availableLanguage->languageID]|empty}{$customURL[$availableLanguage->languageID]}{/if}" class="long" />
+								<input type="text" id="customURL{@$availableLanguage->languageID}" name="customURL[{@$availableLanguage->languageID}]" value="{if !$customURL[$availableLanguage->languageID]|empty}{$customURL[$availableLanguage->languageID]}{/if}" class="long">
 								{if $errorField == $__errorFieldName}
 									<small class="innerError">
 										{if $errorType == 'empty'}
@@ -163,7 +163,7 @@
 					<dl>
 						<dt></dt>
 						<dd>
-							<label><input type="checkbox" id="isLandingPage" name="isLandingPage" value="1" {if $isLandingPage}checked="checked" {/if}{if $action == 'edit' && $page->isLandingPage}disabled="disabled" {/if}/> {lang}wcf.acp.page.isLandingPage{/lang}</label>
+							<label><input type="checkbox" id="isLandingPage" name="isLandingPage" value="1"{if $isLandingPage} checked="checked"{/if}{if $action == 'edit' && $page->isLandingPage} disabled="disabled"{/if}> {lang}wcf.acp.page.isLandingPage{/lang}</label>
 						</dd>
 					</dl>
 				{/if}
@@ -172,7 +172,7 @@
 					<dl>
 						<dt></dt>
 						<dd>
-							<label><input type="checkbox" id="isDisabled" name="isDisabled" value="1" {if $isDisabled}checked="checked" {/if}/> {lang}wcf.acp.page.isDisabled{/lang}</label>
+							<label><input type="checkbox" id="isDisabled" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.page.isDisabled{/lang}</label>
 						</dd>
 					</dl>
 				{/if}
@@ -187,7 +187,7 @@
 					<dl{if $errorField == 'title'} class="formError"{/if}>
 						<dt><label for="title">{lang}wcf.acp.page.title{/lang}</label></dt>
 						<dd>
-							<input type="text" id="title" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long" />
+							<input type="text" id="title" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long">
 							{if $errorField == 'title'}
 								<small class="innerError">
 									{if $errorType == 'empty'}
@@ -266,7 +266,7 @@
 								<dl{if $errorField == 'title'} class="formError"{/if}>
 									<dt><label for="title{@$availableLanguage->languageID}">{lang}wcf.acp.page.title{/lang}</label></dt>
 									<dd>
-										<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long" />
+										<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long">
 										{if $errorField == 'title'}
 											<small class="innerError">
 												{if $errorType == 'empty'}
@@ -344,7 +344,7 @@
 						<ul class="scrollableCheckboxList">
 							{foreach from=$availableBoxes item=availableBox}
 								<li>
-									<label><input type="checkbox" name="boxIDs[]" value="{@$availableBox->boxID}"{if $availableBox->boxID|in_array:$boxIDs} checked="checked"{/if} /> {$availableBox->name}</label>
+									<label><input type="checkbox" name="boxIDs[]" value="{@$availableBox->boxID}"{if $availableBox->boxID|in_array:$boxIDs} checked="checked"{/if}> {$availableBox->name}</label>
 								</li>
 							{/foreach}
 						</ul>
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
index 35f8ffa945..6f966ee806 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
@@ -12,7 +12,7 @@
 			</ul>
 		</div>
 		
-		<input type="search" name="q" id="pageHeaderSearchInput" class="pageHeaderSearchInput" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" required="required" value="" data-toggle="search" />
+		<input type="search" name="q" id="pageHeaderSearchInput" class="pageHeaderSearchInput" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" required="required" value="" data-toggle="search">
 		
 		<button class="pageHeaderSearchInputButton" type="submit">
 			<span class="icon icon16 pointer fa-search" title="{lang}wcf.global.search{/lang}"></span>
diff --git a/wcfsetup/install/files/acp/templates/pageList.tpl b/wcfsetup/install/files/acp/templates/pageList.tpl
index 052231b754..7430f334cb 100644
--- a/wcfsetup/install/files/acp/templates/pageList.tpl
+++ b/wcfsetup/install/files/acp/templates/pageList.tpl
@@ -31,21 +31,21 @@
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="name" name="name" value="{$name}" placeholder="{lang}wcf.global.name{/lang}" class="long" />
+					<input type="text" id="name" name="name" value="{$name}" placeholder="{lang}wcf.global.name{/lang}" class="long">
 				</dd>
 			</dl>
 			
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="pageTitle" name="title" value="{$title}" placeholder="{lang}wcf.acp.page.title{/lang}" class="long" />
+					<input type="text" id="pageTitle" name="title" value="{$title}" placeholder="{lang}wcf.acp.page.title{/lang}" class="long">
 				</dd>
 			</dl>
 			
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="pageContent" name="content" value="{$content}" placeholder="{lang}wcf.acp.page.content{/lang}" class="long" />
+					<input type="text" id="pageContent" name="content" value="{$content}" placeholder="{lang}wcf.acp.page.content{/lang}" class="long">
 				</dd>
 			</dl>
 			
@@ -80,7 +80,7 @@
 		</div>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</section>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
index b6787720dd..97d9eb1b5a 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
@@ -44,7 +44,7 @@
 		<dl{if $errorField == 'title'} class="formError"{/if}>
 			<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
 			<dd>
-				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus="autofocus" class="medium" />
+				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus="autofocus" class="medium">
 				{if $errorField == 'title'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -78,7 +78,7 @@
 		<dl>
 			<dt><label for="showOrder">{lang}wcf.acp.paidSubscription.showOrder{/lang}</label></dt>
 			<dd>
-				<input type="number" id="showOrder" name="showOrder" value="{if $showOrder}{@$showOrder}{/if}" class="tiny" min="0" />
+				<input type="number" id="showOrder" name="showOrder" value="{if $showOrder}{@$showOrder}{/if}" class="tiny" min="0">
 				<small>{lang}wcf.acp.paidSubscription.showOrder.description{/lang}</small>
 			</dd>
 		</dl>
@@ -86,7 +86,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isDisabled" value="1" {if $isDisabled}checked="checked" {/if}/> {lang}wcf.acp.paidSubscription.isDisabled{/lang}</label>
+				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.paidSubscription.isDisabled{/lang}</label>
 				<small>{lang}wcf.acp.paidSubscription.isDisabled.description{/lang}</small>
 			</dd>
 		</dl>
@@ -96,7 +96,7 @@
 				<dt>{lang}wcf.acp.paidSubscription.excludedSubscriptions{/lang}</dt>
 				<dd>
 					{foreach from=$availableSubscriptions item=availableSubscription}
-						<label><input type="checkbox" name="excludedSubscriptionIDs[]" value="{@$availableSubscription->subscriptionID}" {if $availableSubscription->subscriptionID|in_array:$excludedSubscriptionIDs}checked="checked" {/if}/> {$availableSubscription->title|language}</label>
+						<label><input type="checkbox" name="excludedSubscriptionIDs[]" value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID|in_array:$excludedSubscriptionIDs} checked="checked"{/if}> {$availableSubscription->title|language}</label>
 					{/foreach}
 					<small>{lang}wcf.acp.paidSubscription.excludedSubscriptions.description{/lang}</small>
 				</dd>
@@ -112,7 +112,7 @@
 		<dl{if $errorField == 'cost'} class="formError"{/if}>
 			<dt><label for="cost">{lang}wcf.acp.paidSubscription.cost{/lang}</label></dt>
 			<dd>
-				<input type="number" id="cost" name="cost" value="{$cost}" class="tiny" step="0.01" min="0" />
+				<input type="number" id="cost" name="cost" value="{$cost}" class="tiny" step="0.01" min="0">
 				<select name="currency" id="currency">
 					{htmlOptions values=$availableCurrencies output=$availableCurrencies selected=$currency}
 				</select>
@@ -131,14 +131,14 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" id="subscriptionLengthPermanent" name="subscriptionLengthPermanent" value="1" {if !$subscriptionLength}checked="checked" {/if}/> {lang}wcf.acp.paidSubscription.subscriptionLength.permanent{/lang}</label>
+				<label><input type="checkbox" id="subscriptionLengthPermanent" name="subscriptionLengthPermanent" value="1"{if !$subscriptionLength} checked="checked"{/if}> {lang}wcf.acp.paidSubscription.subscriptionLength.permanent{/lang}</label>
 			</dd>
 		</dl>
 		
 		<dl id="subscriptionLengthDL"{if $errorField == 'subscriptionLength'} class="formError"{/if}>
 			<dt><label for="subscriptionLength">{lang}wcf.acp.paidSubscription.subscriptionLength{/lang}</label></dt>
 			<dd>
-				<input type="number" id="subscriptionLength" name="subscriptionLength" value="{@$subscriptionLength}" class="tiny" />
+				<input type="number" id="subscriptionLength" name="subscriptionLength" value="{@$subscriptionLength}" class="tiny">
 				<select name="subscriptionLengthUnit" id="subscriptionLengthUnit">
 					<option value="D"{if $subscriptionLengthUnit == 'D'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.D{/lang}</option>
 					<option value="M"{if $subscriptionLengthUnit == 'M'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.M{/lang}</option>
@@ -159,7 +159,7 @@
 		<dl id="isRecurringDL">
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isRecurring" value="1" {if $isRecurring}checked="checked" {/if}/> {lang}wcf.acp.paidSubscription.isRecurring{/lang}</label>
+				<label><input type="checkbox" name="isRecurring" value="1"{if $isRecurring} checked="checked"{/if}> {lang}wcf.acp.paidSubscription.isRecurring{/lang}</label>
 				<small>{lang}wcf.acp.paidSubscription.isRecurring.description{/lang}</small>
 			</dd>
 		</dl>
@@ -168,7 +168,7 @@
 			<dt><label>{lang}wcf.acp.paidSubscription.userGroups{/lang}</label></dt>
 			<dd>
 				{foreach from=$availableUserGroups item=userGroup}
-					<label><input type="checkbox" name="groupIDs[]" value="{@$userGroup->groupID}" {if $userGroup->groupID|in_array:$groupIDs}checked="checked" {/if}/> {$userGroup->groupName|language}</label>
+					<label><input type="checkbox" name="groupIDs[]" value="{@$userGroup->groupID}"{if $userGroup->groupID|in_array:$groupIDs} checked="checked"{/if}> {$userGroup->groupName|language}</label>
 				{/foreach}
 				{if $errorField == 'groupIDs'}
 					<small class="innerError">
@@ -188,7 +188,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl
index 7cd99769f7..2f471b55af 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl
@@ -31,14 +31,14 @@
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="transactionID" name="transactionID" value="{$transactionID}" placeholder="{lang}wcf.acp.paidSubscription.transactionLog.transactionID{/lang}" class="long" />
+					<input type="text" id="transactionID" name="transactionID" value="{$transactionID}" placeholder="{lang}wcf.acp.paidSubscription.transactionLog.transactionID{/lang}" class="long">
 				</dd>
 			</dl>
 			
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.user.username{/lang}" class="long" />
+					<input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.user.username{/lang}" class="long">
 				</dd>
 			</dl>
 			
@@ -60,7 +60,7 @@
 		</div>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</section>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
index b85f39886b..9b36abab3b 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
@@ -35,7 +35,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" autofocus="autofocus" class="medium" />
+				<input type="text" id="username" name="username" value="{$username}" autofocus="autofocus" class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -52,7 +52,7 @@
 			<dl{if $errorField == 'endDate'} class="formError"{/if}>
 				<dt><label for="endDate">{lang}wcf.acp.paidSubscription.user.endDate{/lang}</label></dt>
 				<dd>
-					<input type="date" id="endDate" name="endDate" value="{$endDate}" class="medium" data-ignore-timezone="true" />
+					<input type="date" id="endDate" name="endDate" value="{$endDate}" class="medium" data-ignore-timezone="true">
 					{if $errorField == 'endDate'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -70,7 +70,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl b/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl
index e972b222e8..5ca2fb661c 100644
--- a/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}"{if $key|in_array:$value} checked="checked"{/if} /> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}"{if $key|in_array:$value} checked="checked"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
diff --git a/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl b/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl
index 9ef6c2b684..96b9ad6a9c 100644
--- a/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl
+++ b/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl
@@ -10,12 +10,12 @@
 	
 	<dl>
 		<dt><label for="pluginStoreUsername">{lang}wcf.acp.pluginStore.authorization.username{/lang}</label></dt>
-		<dd><input type="text" id="pluginStoreUsername" value="" class="long" /></dd>
+		<dd><input type="text" id="pluginStoreUsername" value="" class="long"></dd>
 	</dl>
 	
 	<dl>
 		<dt><label for="pluginStorePassword">{lang}wcf.acp.pluginStore.authorization.password{/lang}</label></dt>
-		<dd><input type="password" id="pluginStorePassword" value="" class="long" autocomplete="off" /></dd>
+		<dd><input type="password" id="pluginStorePassword" value="" class="long" autocomplete="off"></dd>
 	</dl>
 </section>
 
diff --git a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
index c24b6607b7..fbcf5c0cef 100644
--- a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
diff --git a/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl
index b52bcd6d84..4391f287cd 100644
--- a/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl
@@ -1,6 +1,6 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
 
 <script data-relocate="true">
diff --git a/wcfsetup/install/files/acp/templates/recaptcha.tpl b/wcfsetup/install/files/acp/templates/recaptcha.tpl
index 870bffedba..b44a959a58 100644
--- a/wcfsetup/install/files/acp/templates/recaptcha.tpl
+++ b/wcfsetup/install/files/acp/templates/recaptcha.tpl
@@ -25,7 +25,7 @@
 			</dt>
 			<dd class="jsOnly">
 				<div id="recaptcha_image"></div>
-				<input type="text" id="recaptcha_response_field" name="recaptcha_response_field" class="medium" />
+				<input type="text" id="recaptcha_response_field" name="recaptcha_response_field" class="medium">
 				{if (($errorType|isset && $errorType|is_array && $errorType[recaptchaString]|isset) || ($errorField|isset && $errorField == 'recaptchaString'))}
 					{if $errorType|is_array && $errorType[recaptchaString]|isset}
 						{assign var='__errorType' value=$errorType[recaptchaString]}
@@ -58,9 +58,9 @@
 				<script data-relocate="true" src="//www.google.com/recaptcha/api/challenge?k={$recaptchaPublicKey}"></script>
 				<noscript>
 					<dd>
-						<iframe src="//www.google.com/recaptcha/api/noscript?k={$recaptchaPublicKey}" height="300" width="500" seamless="seamless"></iframe><br />
+						<iframe src="//www.google.com/recaptcha/api/noscript?k={$recaptchaPublicKey}" height="300" width="500" seamless="seamless"></iframe><br>
 						<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-						<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
+						<input type="hidden" name="recaptcha_response_field" value="manual_challenge">
 					</dd>
 					{if (($errorType|isset && $errorType|is_array && $errorType[recaptchaString]|isset) || ($errorField|isset && $errorField == 'recaptchaString'))}
 						{if $errorType|is_array && $errorType[recaptchaString]|isset}
diff --git a/wcfsetup/install/files/acp/templates/rescueMode.tpl b/wcfsetup/install/files/acp/templates/rescueMode.tpl
index 3d6535422f..df99155fb9 100644
--- a/wcfsetup/install/files/acp/templates/rescueMode.tpl
+++ b/wcfsetup/install/files/acp/templates/rescueMode.tpl
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html dir="{@$__wcf->getLanguage()->getPageDirection()}" lang="{@$__wcf->getLanguage()->getFixedLanguageCode()}">
 <head>
-	<meta charset="utf-8" />
-	<meta name="robots" content="noindex" />
+	<meta charset="utf-8">
+	<meta name="robots" content="noindex">
 	<title>{lang}wcf.acp.rescueMode{/lang} - {lang}wcf.global.acp{/lang}{if PACKAGE_ID} - {PAGE_TITLE|language}{/if}</title>
 	
 	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600">
@@ -51,7 +51,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" class="long" />
+				<input type="text" id="username" name="username" value="{$username}" class="long">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -69,7 +69,7 @@
 		<dl{if $errorField == 'password'} class="formError"{/if}>
 			<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
 			<dd>
-				<input type="password" id="password" name="password" value="" class="long" />
+				<input type="password" id="password" name="password" value="" class="long">
 				{if $errorField == 'password'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl
index cb54c0476f..c671458872 100644
--- a/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl
@@ -1,4 +1,4 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 <select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if}>
 	{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
 	{foreach from=$selectOptions key=key item=selectOption}
diff --git a/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
index 6d04f9486a..71654fd1b1 100644
--- a/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
@@ -1,7 +1,7 @@
 <dl{if $errorField == 'subject'} class="formError"{/if}>
 	<dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
 	<dd>
-		<input type="text" id="subject" name="subject" value="{$subject}" class="long" />
+		<input type="text" id="subject" name="subject" value="{$subject}" class="long">
 		{if $errorField == 'subject'}
 			<small class="innerError">
 				{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -13,7 +13,7 @@
 <dl{if $errorField == 'from'} class="formError"{/if}>
 	<dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
 	<dd>
-		<input type="text" id="from" name="from" value="{$from}" class="medium" />
+		<input type="text" id="from" name="from" value="{$from}" class="medium">
 		{if $errorField == 'from'}
 			<small class="innerError">
 				{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -39,7 +39,7 @@
 <dl>
 	<dt></dt>
 	<dd>
-		<label for="enableHTML"><input type="checkbox" id="enableHTML" name="enableHTML" value="1"{if $enableHTML == 1} checked="checked"{/if}/> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
+		<label for="enableHTML"><input type="checkbox" id="enableHTML" name="enableHTML" value="1"{if $enableHTML == 1} checked="checked"{/if}> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
 	</dd>
 </dl>
 
diff --git a/wcfsetup/install/files/acp/templates/smileyAdd.tpl b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
index 962f0d7055..ba0b8d5f0d 100644
--- a/wcfsetup/install/files/acp/templates/smileyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'smileyTitle'} class="formError"{/if}>
 			<dt><label for="smileyTitle">{lang}wcf.acp.smiley.title{/lang}</label></dt>
 			<dd>
-				<input type="text" id="smileyTitle" name="smileyTitle" value="{$i18nPlainValues['smileyTitle']}" autofocus="autofocus" class="long" />
+				<input type="text" id="smileyTitle" name="smileyTitle" value="{$i18nPlainValues['smileyTitle']}" autofocus="autofocus" class="long">
 				
 				{if $errorField == 'smileyTitle'}
 					<small class="innerError">
@@ -63,7 +63,7 @@
 		<dl{if $errorField == 'smileyCode'} class="formError"{/if}>
 			<dt><label for="smileyCode">{lang}wcf.acp.smiley.smileyCode{/lang}</label></dt>
 			<dd>
-				<input type="text" id="smileyCode" name="smileyCode" value="{$smileyCode}" required="required" class="medium" />
+				<input type="text" id="smileyCode" name="smileyCode" value="{$smileyCode}" required="required" class="medium">
 				
 				{if $errorField == 'smileyCode'}
 					<small class="innerError">
@@ -93,7 +93,7 @@
 		<dl{if $errorField == 'showOrder'} class="formError"{/if}>
 			<dt><label for="showOrder">{lang}wcf.acp.smiley.showOrder{/lang}</label></dt>
 			<dd>
-				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" min="0" class="short" />
+				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" min="0" class="short">
 				
 				{if $errorField == 'showOrder'}
 					<small class="innerError">
@@ -113,10 +113,10 @@
 			<dt><label for="fileUpload">{lang}wcf.acp.smiley.fileUpload{/lang}</label></dt>
 			<dd>
 				{if $uploadedFilename}
-					<img src="{@$__wcf->getPath()}images/smilies/{$uploadedFilename}" alt="" />
-					<input type="hidden" name="uploadedFilename" value="{$uploadedFilename}" />
+					<img src="{@$__wcf->getPath()}images/smilies/{$uploadedFilename}" alt="">
+					<input type="hidden" name="uploadedFilename" value="{$uploadedFilename}">
 				{/if}
-				<input type="file" id="fileUpload" name="fileUpload" value="" />
+				<input type="file" id="fileUpload" name="fileUpload" value="">
 				
 				{if $errorField == 'fileUpload'}
 					<small class="innerError">
@@ -134,7 +134,7 @@
 		<dl{if $errorField == 'smileyPath'} class="formError"{/if}>
 			<dt><label for="smileyPath">{lang}wcf.acp.smiley.smileyPath{/lang}</label></dt>
 			<dd>
-				<input type="text" id="smileyPath" name="smileyPath" value="{$smileyPath}" class="long" />
+				<input type="text" id="smileyPath" name="smileyPath" value="{$smileyPath}" class="long">
 				
 				{if $errorField == 'smileyPath'}
 					<small class="innerError">
@@ -155,7 +155,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/smileyList.tpl b/wcfsetup/install/files/acp/templates/smileyList.tpl
index f745b77721..62d7ab6c06 100644
--- a/wcfsetup/install/files/acp/templates/smileyList.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyList.tpl
@@ -49,8 +49,8 @@
 								<a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><img src="{$smiley->getURL()}" alt=""/ > {lang}{$smiley->smileyTitle}{/lang}</a> <span class="badge">{$smiley->smileyCode}</span>{foreach from=$smiley->getAliases() item='alias'} <span class="badge">{$alias}</span>{/foreach}
 								
 								<span class="statusDisplay sortableButtonContainer">
-									<a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><span title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon icon16 fa-pencil" /></a>
-									<span title="{lang}wcf.global.button.delete{/lang}" class="jsDeleteButton jsTooltip icon icon16 fa-times" data-object-id="{@$smiley->smileyID}" data-confirm-message-html="{lang __encode=true}wcf.acp.smiley.delete.sure{/lang}" />
+									<a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><span title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon icon16 fa-pencil"></a>
+									<span title="{lang}wcf.global.button.delete{/lang}" class="jsDeleteButton jsTooltip icon icon16 fa-times" data-object-id="{@$smiley->smileyID}" data-confirm-message-html="{lang __encode=true}wcf.acp.smiley.delete.sure{/lang}">
 									
 									{event name='itemButtons'}
 								</span>
diff --git a/wcfsetup/install/files/acp/templates/stat.tpl b/wcfsetup/install/files/acp/templates/stat.tpl
index 84f84fda88..0d7ec92903 100644
--- a/wcfsetup/install/files/acp/templates/stat.tpl
+++ b/wcfsetup/install/files/acp/templates/stat.tpl
@@ -31,27 +31,27 @@
 	<dl>
 		<dt><label for="startDate">{lang}wcf.acp.stat.period{/lang}</label></dt>
 		<dd>
-			<input type="date" id="startDate" name="startDate" value="{$startDate}" data-placeholder="{lang}wcf.date.period.start{/lang}" />
+			<input type="date" id="startDate" name="startDate" value="{$startDate}" data-placeholder="{lang}wcf.date.period.start{/lang}">
 			&ndash;
-			<input type="date" id="endDate" name="endDate" value="{$endDate}" data-placeholder="{lang}wcf.date.period.end{/lang}" />
+			<input type="date" id="endDate" name="endDate" value="{$endDate}" data-placeholder="{lang}wcf.date.period.end{/lang}">
 		</dd>
 	</dl>
 	
 	<dl>
 		<dt><label>{lang}wcf.acp.stat.dateGrouping{/lang}</label></dt>
 		<dd>
-			<label><input type="radio" name="dateGrouping" value="daily" checked="checked" /> {lang}wcf.acp.stat.dateGrouping.daily{/lang}</label>
-			<label><input type="radio" name="dateGrouping" value="weekly" /> {lang}wcf.acp.stat.dateGrouping.weekly{/lang}</label>
-			<label><input type="radio" name="dateGrouping" value="monthly" /> {lang}wcf.acp.stat.dateGrouping.monthly{/lang}</label>
-			<label><input type="radio" name="dateGrouping" value="yearly" /> {lang}wcf.acp.stat.dateGrouping.yearly{/lang}</label>
+			<label><input type="radio" name="dateGrouping" value="daily" checked="checked"> {lang}wcf.acp.stat.dateGrouping.daily{/lang}</label>
+			<label><input type="radio" name="dateGrouping" value="weekly"> {lang}wcf.acp.stat.dateGrouping.weekly{/lang}</label>
+			<label><input type="radio" name="dateGrouping" value="monthly"> {lang}wcf.acp.stat.dateGrouping.monthly{/lang}</label>
+			<label><input type="radio" name="dateGrouping" value="yearly"> {lang}wcf.acp.stat.dateGrouping.yearly{/lang}</label>
 		</dd>
 	</dl>
 	
 	<dl>
 		<dt><label>{lang}wcf.acp.stat.value{/lang}</label></dt>
 		<dd>
-			<label><input type="radio" name="value" value="counter" checked="checked" /> {lang}wcf.acp.stat.value.counter{/lang}</label>
-			<label><input type="radio" name="value" value="total" /> {lang}wcf.acp.stat.value.total{/lang}</label>
+			<label><input type="radio" name="value" value="counter" checked="checked"> {lang}wcf.acp.stat.value.counter{/lang}</label>
+			<label><input type="radio" name="value" value="total"> {lang}wcf.acp.stat.value.total{/lang}</label>
 		</dd>
 	</dl>
 </section>
@@ -64,7 +64,7 @@
 			<dt><label>{lang}wcf.acp.stat.category.{@$categoryName}{/lang}</label></dt>
 			<dd>
 				{foreach from=$objectTypes item=objectType}
-					<label><input type="checkbox" name="objectTypeID" value="{@$objectType->objectTypeID}" {if $objectType->default}checked="checked" {/if}/> {lang}wcf.acp.stat.{@$objectType->objectType}{/lang}</label>
+					<label><input type="checkbox" name="objectTypeID" value="{@$objectType->objectTypeID}"{if $objectType->default} checked="checked"{/if}> {lang}wcf.acp.stat.{@$objectType->objectType}{/lang}</label>
 				{/foreach}
 			</dd>
 		</dl>
diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 8be9f85a11..7511c0b1c6 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -89,7 +89,7 @@
 				<dl{if $errorField == 'styleName'} class="formError"{/if}>
 					<dt><label for="styleName">{lang}wcf.acp.style.styleName{/lang}</label></dt>
 					<dd>
-						<input type="text" name="styleName" id="styleName" value="{$styleName}" class="long" />
+						<input type="text" name="styleName" id="styleName" value="{$styleName}" class="long">
 						{if $errorField == 'styleName'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -104,7 +104,7 @@
 				<dl{if $errorField == 'authorName'} class="formError"{/if}>
 					<dt><label for="authorName">{lang}wcf.acp.style.authorName{/lang}</label></dt>
 					<dd>
-						<input type="text" name="authorName" id="authorName" value="{$authorName}" class="long"{if !$isTainted} readonly{/if} />
+						<input type="text" name="authorName" id="authorName" value="{$authorName}" class="long"{if !$isTainted} readonly{/if}>
 						{if $errorField == 'authorName'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -119,7 +119,7 @@
 				<dl{if $errorField == 'copyright'} class="formError"{/if}>
 					<dt><label for="copyright">{lang}wcf.acp.style.copyright{/lang}</label></dt>
 					<dd>
-						<input type="text" name="copyright" id="copyright" value="{$copyright}" class="long"{if !$isTainted} readonly{/if} />
+						<input type="text" name="copyright" id="copyright" value="{$copyright}" class="long"{if !$isTainted} readonly{/if}>
 						{if $errorField == 'copyright'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -134,7 +134,7 @@
 				<dl{if $errorField == 'styleVersion'} class="formError"{/if}>
 					<dt><label for="styleVersion">{lang}wcf.acp.style.styleVersion{/lang}</label></dt>
 					<dd>
-						<input type="text" name="styleVersion" id="styleVersion" value="{$styleVersion}" class="small"{if !$isTainted} readonly{/if} />
+						<input type="text" name="styleVersion" id="styleVersion" value="{$styleVersion}" class="small"{if !$isTainted} readonly{/if}>
 						{if $errorField == 'styleVersion'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -149,7 +149,7 @@
 				<dl{if $errorField == 'styleDate'} class="formError"{/if}>
 					<dt><label for="styleDate">{lang}wcf.acp.style.styleDate{/lang}</label></dt>
 					<dd>
-						<input type="date" name="styleDate" id="styleDate" value="{$styleDate}" class="small"{if !$isTainted} readonly{/if} />
+						<input type="date" name="styleDate" id="styleDate" value="{$styleDate}" class="small"{if !$isTainted} readonly{/if}>
 						{if $errorField == 'styleDate'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -164,7 +164,7 @@
 				<dl{if $errorField == 'license'} class="formError"{/if}>
 					<dt><label for="license">{lang}wcf.acp.style.license{/lang}</label></dt>
 					<dd>
-						<input type="text" name="license" id="license" value="{$license}" class="long"{if !$isTainted} readonly{/if} />
+						<input type="text" name="license" id="license" value="{$license}" class="long"{if !$isTainted} readonly{/if}>
 						{if $errorField == 'license'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -179,7 +179,7 @@
 				<dl{if $errorField == 'authorURL'} class="formError"{/if}>
 					<dt><label for="authorURL">{lang}wcf.acp.style.authorURL{/lang}</label></dt>
 					<dd>
-						<input type="text" name="authorURL" id="authorURL" value="{$authorURL}" class="long"{if !$isTainted} readonly{/if} />
+						<input type="text" name="authorURL" id="authorURL" value="{$authorURL}" class="long"{if !$isTainted} readonly{/if}>
 						{if $errorField == 'authorURL'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -194,7 +194,7 @@
 				<dl{if $errorField == 'packageName'} class="formError"{/if}>
 					<dt><label for="packageName">{lang}wcf.acp.style.packageName{/lang}</label></dt>
 					<dd>
-						<input type="text" name="packageName" id="packageName" value="{$packageName}" class="long"{if !$isTainted} readonly{/if} />
+						<input type="text" name="packageName" id="packageName" value="{$packageName}" class="long"{if !$isTainted} readonly{/if}>
 						{if $errorField == 'packageName'}
 							<small class="innerError">{lang}wcf.acp.style.packageName.error.{$errorType}{/lang}</small>
 						{/if}
@@ -227,7 +227,7 @@
 				<dl{if $errorField == 'image'} class="formError"{/if}>
 					<dt><label for="image">{lang}wcf.acp.style.image{/lang}</label></dt>
 					<dd>
-						<img src="{if $action == 'add'}{@$__wcf->getPath()}images/stylePreview.png{else}{@$style->getPreviewImage()}{/if}" alt="" id="styleImage" />
+						<img src="{if $action == 'add'}{@$__wcf->getPath()}images/stylePreview.png{else}{@$style->getPreviewImage()}{/if}" alt="" id="styleImage">
 						<div id="uploadImage"></div>
 						{if $errorField == 'image'}
 							<small class="innerError">
@@ -266,7 +266,7 @@
 				<dl{if $errorField == 'imagePath'} class="formError"{/if}>
 					<dt><label for="imagePath">{lang}wcf.acp.style.imagePath{/lang}</label></dt>
 					<dd>
-						<input type="text" name="imagePath" id="imagePath" value="{$imagePath}" class="long" />
+						<input type="text" name="imagePath" id="imagePath" value="{$imagePath}" class="long">
 						{if $errorField == 'imagePath'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -295,7 +295,7 @@
 				<dl>
 					<dt></dt>
 					<dd><label>
-						<input type="checkbox" id="useFluidLayout" name="useFluidLayout" value="1"{if $variables[useFluidLayout]} checked="checked"{/if} />
+						<input type="checkbox" id="useFluidLayout" name="useFluidLayout" value="1"{if $variables[useFluidLayout]} checked="checked"{/if}>
 						<span>{lang}wcf.acp.style.globals.useFluidLayout{/lang}</span>
 					</label></dd>
 				</dl>
@@ -303,7 +303,7 @@
 				<dl id="fluidLayoutMinWidth">
 					<dt><label for="wcfLayoutMinWidth">{lang}wcf.acp.style.globals.fluidLayoutMinWidth{/lang}</label></dt>
 					<dd>
-						<input type="number" id="wcfLayoutMinWidth" name="wcfLayoutMinWidth" value="{@$variables[wcfLayoutMinWidth]}" class="tiny" />
+						<input type="number" id="wcfLayoutMinWidth" name="wcfLayoutMinWidth" value="{@$variables[wcfLayoutMinWidth]}" class="tiny">
 						<label class="selectDropdown">
 							<select name="wcfLayoutMinWidth_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
@@ -316,7 +316,7 @@
 				<dl id="fluidLayoutMaxWidth">
 					<dt><label for="wcfLayoutMaxWidth">{lang}wcf.acp.style.globals.fluidLayoutMaxWidth{/lang}</label></dt>
 					<dd>
-						<input type="number" id="wcfLayoutMaxWidth" name="wcfLayoutMaxWidth" value="{@$variables[wcfLayoutMaxWidth]}" class="tiny" />
+						<input type="number" id="wcfLayoutMaxWidth" name="wcfLayoutMaxWidth" value="{@$variables[wcfLayoutMaxWidth]}" class="tiny">
 						<label class="selectDropdown">
 							<select name="wcfLayoutMaxWidth_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
@@ -330,7 +330,7 @@
 				<dl id="fixedLayoutVariables">
 					<dt><label for="wcfLayoutFixedWidth">{lang}wcf.acp.style.globals.fixedLayoutWidth{/lang}</label></dt>
 					<dd>
-						<input type="number" id="wcfLayoutFixedWidth" name="wcfLayoutFixedWidth" value="{@$variables[wcfLayoutFixedWidth]}" class="tiny" />
+						<input type="number" id="wcfLayoutFixedWidth" name="wcfLayoutFixedWidth" value="{@$variables[wcfLayoutFixedWidth]}" class="tiny">
 						<label class="selectDropdown">
 							<select name="wcfLayoutFixedWidth_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
@@ -351,7 +351,7 @@
 				<dl>
 					<dt><label for="pageLogo">{lang}wcf.acp.style.globals.pageLogo{/lang}</label></dt>
 					<dd>
-						<img src="" alt="" id="styleLogo" style="max-width: 100%" />
+						<img src="" alt="" id="styleLogo" style="max-width: 100%">
 						<div id="uploadLogo"></div>
 						{if $errorField == 'image'}
 							<small class="innerError">
@@ -364,7 +364,7 @@
 						{/if}
 					</dd>
 					<dd>
-						<input type="text" name="pageLogo" id="pageLogo" value="{$variables[pageLogo]}" class="long" />
+						<input type="text" name="pageLogo" id="pageLogo" value="{$variables[pageLogo]}" class="long">
 						<small>{lang}wcf.acp.style.globals.pageLogo.description{/lang}</small>
 					</dd>
 				</dl>
@@ -379,7 +379,7 @@
 				<dl>
 					<dt><label for="wcfFontSizeDefault">{lang}wcf.acp.style.globals.fontSizeDefault{/lang}</label></dt>
 					<dd>
-						<input type="number" id="wcfFontSizeDefault" name="wcfFontSizeDefault" value="{@$variables[wcfFontSizeDefault]}" class="tiny" />
+						<input type="number" id="wcfFontSizeDefault" name="wcfFontSizeDefault" value="{@$variables[wcfFontSizeDefault]}" class="tiny">
 						<label class="selectDropdown">
 							<select name="wcfFontSizeDefault_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
@@ -392,7 +392,7 @@
 				<dl>
 					<dt><label for="wcfFontSizeSmall">{lang}wcf.acp.style.globals.fontSizeSmall{/lang}</label></dt>
 					<dd>
-						<input type="number" id="wcfFontSizeSmall" name="wcfFontSizeSmall" value="{@$variables[wcfFontSizeSmall]}" class="tiny" />
+						<input type="number" id="wcfFontSizeSmall" name="wcfFontSizeSmall" value="{@$variables[wcfFontSizeSmall]}" class="tiny">
 						<label class="selectDropdown">
 							<select name="wcfFontSizeSmall_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
@@ -405,7 +405,7 @@
 				<dl>
 					<dt><label for="wcfFontSizeHeadline">{lang}wcf.acp.style.globals.fontSizeHeadline{/lang}</label></dt>
 					<dd>
-						<input type="number" id="wcfFontSizeHeadline" name="wcfFontSizeHeadline" value="{@$variables[wcfFontSizeHeadline]}" class="tiny" />
+						<input type="number" id="wcfFontSizeHeadline" name="wcfFontSizeHeadline" value="{@$variables[wcfFontSizeHeadline]}" class="tiny">
 						<label class="selectDropdown">
 							<select name="wcfFontSizeHeadline_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
@@ -418,7 +418,7 @@
 				<dl>
 					<dt><label for="wcfFontSizeSection">{lang}wcf.acp.style.globals.fontSizeSection{/lang}</label></dt>
 					<dd>
-						<input type="number" id="wcfFontSizeSection" name="wcfFontSizeSection" value="{@$variables[wcfFontSizeSection]}" class="tiny" />
+						<input type="number" id="wcfFontSizeSection" name="wcfFontSizeSection" value="{@$variables[wcfFontSizeSection]}" class="tiny">
 						<label class="selectDropdown">
 							<select name="wcfFontSizeSection_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
@@ -431,7 +431,7 @@
 				<dl>
 					<dt><label for="wcfFontSizeTitle">{lang}wcf.acp.style.globals.fontSizeTitle{/lang}</label></dt>
 					<dd>
-						<input type="number" id="wcfFontSizeTitle" name="wcfFontSizeTitle" value="{@$variables[wcfFontSizeTitle]}" class="tiny" />
+						<input type="number" id="wcfFontSizeTitle" name="wcfFontSizeTitle" value="{@$variables[wcfFontSizeTitle]}" class="tiny">
 						<label class="selectDropdown">
 							<select name="wcfFontSizeTitle_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
@@ -445,7 +445,7 @@
 				<dl>
 					<dt></dt>
 					<dd><label>
-						<input type="checkbox" id="useGoogleFont" name="useGoogleFont" value="1"{if $variables[useGoogleFont]} checked="checked"{/if} />
+						<input type="checkbox" id="useGoogleFont" name="useGoogleFont" value="1"{if $variables[useGoogleFont]} checked="checked"{/if}>
 						<span>{lang}wcf.acp.style.globals.useGoogleFont{/lang}</span>
 					</label></dd>
 				</dl>
@@ -691,7 +691,7 @@
 											<li class="box24 spColor">
 												<div class="spColorBox">
 													<span class="styleVariableColor jsColorPicker" style="background-color: {$variables[$spColor]};" data-color="{$variables[$spColor]}" data-store="{$spColor}_value"></span>
-													<input type="hidden" id="{$spColor}_value" name="{$spColor}" value="{$variables[$spColor]}" />
+													<input type="hidden" id="{$spColor}_value" name="{$spColor}" value="{$variables[$spColor]}">
 												</div>
 												<div>
 													<span class="spVariable">${$spColor}</span>
@@ -919,8 +919,8 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		<input type="hidden" name="tmpHash" value="{$tmpHash}" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+		<input type="hidden" name="tmpHash" value="{$tmpHash}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl
index f963a70b0b..d0569cfec0 100644
--- a/wcfsetup/install/files/acp/templates/styleExport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleExport.tpl
@@ -26,13 +26,13 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="exportImages" value="1"{if $exportImages} checked="checked"{/if}{if !$canExportImages} disabled="disabled"{/if} /> <span>{lang}wcf.acp.style.exportImages{/lang}</span></label>
+				<label><input type="checkbox" name="exportImages" value="1"{if $exportImages} checked="checked"{/if}{if !$canExportImages} disabled="disabled"{/if}> <span>{lang}wcf.acp.style.exportImages{/lang}</span></label>
 			</dd>
 		</dl>
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="exportTemplates" value="1"{if $exportTemplates} checked="checked"{/if}{if !$canExportTemplates} disabled="disabled"{/if} /> <span>{lang}wcf.acp.style.exportTemplates{/lang}</span></label>
+				<label><input type="checkbox" name="exportTemplates" value="1"{if $exportTemplates} checked="checked"{/if}{if !$canExportTemplates} disabled="disabled"{/if}> <span>{lang}wcf.acp.style.exportTemplates{/lang}</span></label>
 			</dd>
 		</dl>
 		
@@ -49,7 +49,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" id="exportAsPackage" name="exportAsPackage" value="1"{if $exportAsPackage} checked="checked"{/if} /> <span>{lang}wcf.acp.style.exportAsPackage{/lang}</span></label>
+					<label><input type="checkbox" id="exportAsPackage" name="exportAsPackage" value="1"{if $exportAsPackage} checked="checked"{/if}> <span>{lang}wcf.acp.style.exportAsPackage{/lang}</span></label>
 				</dd>
 			</dl>
 			
@@ -60,7 +60,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.acp.style.button.exportStyle{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.acp.style.button.exportStyle{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/styleImport.tpl b/wcfsetup/install/files/acp/templates/styleImport.tpl
index 0ec638775c..058f74340d 100644
--- a/wcfsetup/install/files/acp/templates/styleImport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleImport.tpl
@@ -27,7 +27,7 @@
 		<dl{if $errorField == 'source'} class="formError"{/if}>
 			<dt><label for="source">{lang}wcf.acp.style.import.source.upload{/lang}</label></dt>
 			<dd>
-				<input type="file" id="source" name="source" value="" />
+				<input type="file" id="source" name="source" value="">
 				{if $errorField == 'source'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -47,7 +47,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/styleList.tpl b/wcfsetup/install/files/acp/templates/styleList.tpl
index 54f7956499..bdff3363ad 100644
--- a/wcfsetup/install/files/acp/templates/styleList.tpl
+++ b/wcfsetup/install/files/acp/templates/styleList.tpl
@@ -36,7 +36,7 @@
 		{foreach from=$objects item=style}
 			<li>
 				<div class="box64">
-					<span><img src="{@$style->getPreviewImage()}" alt="" /></span>
+					<span><img src="{@$style->getPreviewImage()}" alt=""></span>
 					<div class="details">
 						<div class="containerHeadline">
 							<h3><a href="{link controller='StyleEdit' id=$style->styleID}{/link}">{$style->styleName}</a></h3>
diff --git a/wcfsetup/install/files/acp/templates/styleVariableColor.tpl b/wcfsetup/install/files/acp/templates/styleVariableColor.tpl
index 6c67e55f2d..adea975667 100644
--- a/wcfsetup/install/files/acp/templates/styleVariableColor.tpl
+++ b/wcfsetup/install/files/acp/templates/styleVariableColor.tpl
@@ -1,9 +1,9 @@
 <figure>
 	<figcaption>
 		{lang}wcf.acp.style.colors.{$languageVariable}{/lang}
-		<br />
+		<br>
 		<span class="dimmed">${$variableName}</span>
 	</figcaption>
 	<div class="colorPreview"><div class="jsColorPicker" style="background-color: {$variables[$variableName]}" data-color="{$variables[$variableName]}" data-store="{$variableName}_value"></div></div>
-	<input type="hidden" id="{$variableName}_value" name="{$variableName}" value="{$variables[$variableName]}" /> 
+	<input type="hidden" id="{$variableName}_value" name="{$variableName}" value="{$variables[$variableName]}"> 
 </figure>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/styleVariableUnit.tpl b/wcfsetup/install/files/acp/templates/styleVariableUnit.tpl
index e9c76b52da..bbf2d0983f 100644
--- a/wcfsetup/install/files/acp/templates/styleVariableUnit.tpl
+++ b/wcfsetup/install/files/acp/templates/styleVariableUnit.tpl
@@ -1,7 +1,7 @@
 <dl>
 	<dt><label for="{$variableName}">{lang}wcf.acp.style.variable.{$variableName}{/lang}</label></dt>
 	<dd>
-		<input type="number" name="{$variableName}" id="{$variableName}" value="{$variableValue}" />
+		<input type="number" name="{$variableName}" id="{$variableName}" value="{$variableValue}">
 		<select name="{$variableName}_unit" id="{$variableName}_unit">
 			<option value="%"{if $variableUnit == '%'} selected="selected"{/if}>%</option>
 			<option value="em"{if $variableUnit == 'em'} selected="selected"{/if}>em</option>
diff --git a/wcfsetup/install/files/acp/templates/tagAdd.tpl b/wcfsetup/install/files/acp/templates/tagAdd.tpl
index 0566682b1c..89e1a6a7f0 100644
--- a/wcfsetup/install/files/acp/templates/tagAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/tagAdd.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'name'} class="formError"{/if}>
 			<dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long" />
+				<input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long">
 				{if $errorField == 'name'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -63,7 +63,7 @@
 				<dt><label for="synonyms">{lang}wcf.acp.tag.synonyms{/lang}</label></dt>
 				<dd>
 					<div id="synonymList" class="editableItemList"></div>
-					<input id="synonyms" type="text" value="" class="long" />
+					<input id="synonyms" type="text" value="" class="long">
 				</dd>
 			</dl>
 			
@@ -94,7 +94,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/tagList.tpl b/wcfsetup/install/files/acp/templates/tagList.tpl
index 2e6a107c8d..9143c38781 100644
--- a/wcfsetup/install/files/acp/templates/tagList.tpl
+++ b/wcfsetup/install/files/acp/templates/tagList.tpl
@@ -40,13 +40,13 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<input type="text" id="tagSearch" name="search" value="{$search}" placeholder="{lang}wcf.acp.tag.list.search.query{/lang}" autofocus="autofocus" class="medium" />
+					<input type="text" id="tagSearch" name="search" value="{$search}" placeholder="{lang}wcf.acp.tag.list.search.query{/lang}" autofocus="autofocus" class="medium">
 				</dd>
 			</dl>
 		</section>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</form>
@@ -63,7 +63,7 @@
 		<table data-type="com.woltlab.wcf.tag" class="table jsClipboardContainer">
 			<thead>
 				<tr>
-					<th class="columnMark"><label><input type="checkbox" class="jsClipboardMarkAll" /></label></th>
+					<th class="columnMark"><label><input type="checkbox" class="jsClipboardMarkAll"></label></th>
 					<th class="columnID columnTagID{if $sortField == 'tagID'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='TagList'}pageNo={@$pageNo}&sortField=tagID&sortOrder={if $sortField == 'tagID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&search={@$search|rawurlencode}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
 					<th class="columnTitle columnName{if $sortField == 'name'} active {@$sortOrder}{/if}"><a href="{link controller='TagList'}pageNo={@$pageNo}&sortField=name&sortOrder={if $sortField == 'name' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&search={@$search|rawurlencode}{/link}">{lang}wcf.acp.tag.name{/lang}</a></th>
 					<th class="columnDigits columnUsageCount{if $sortField == 'usageCount'} active {@$sortOrder}{/if}"><a href="{link controller='TagList'}pageNo={@$pageNo}&sortField=usageCount&sortOrder={if $sortField == 'usageCount' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&search={@$search|rawurlencode}{/link}">{lang}wcf.acp.tag.usageCount{/lang}</a></th>
@@ -77,7 +77,7 @@
 			<tbody>
 				{foreach from=$objects item=tag}
 					<tr class="jsTagRow jsClipboardObject">
-						<td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$tag->tagID}" /></td>
+						<td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$tag->tagID}"></td>
 						<td class="columnIcon">
 							<a href="{link controller='TagEdit' object=$tag}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
 							<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$tag->tagID}" data-confirm-message-html="{lang __encode=true}wcf.acp.tag.delete.sure{/lang}"></span>
diff --git a/wcfsetup/install/files/acp/templates/tagSetAsSynonyms.tpl b/wcfsetup/install/files/acp/templates/tagSetAsSynonyms.tpl
index 506ffd52c3..47b1c65727 100644
--- a/wcfsetup/install/files/acp/templates/tagSetAsSynonyms.tpl
+++ b/wcfsetup/install/files/acp/templates/tagSetAsSynonyms.tpl
@@ -3,7 +3,7 @@
 <ul class="containerBoxList">
 	{foreach from=$tags item=tag}
 		<li>
-			<label><input type="radio" name="tagID" value="{@$tag->tagID}" /> <span class="badge tag">{$tag->name}</span></label>
+			<label><input type="radio" name="tagID" value="{@$tag->tagID}"> <span class="badge tag">{$tag->name}</span></label>
 		</li>
 	{/foreach}
 </ul>
diff --git a/wcfsetup/install/files/acp/templates/templateAdd.tpl b/wcfsetup/install/files/acp/templates/templateAdd.tpl
index b1b0926863..2c39f71219 100644
--- a/wcfsetup/install/files/acp/templates/templateAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateAdd.tpl
@@ -37,7 +37,7 @@
 			<dl{if $errorField == 'tplName'} class="formError"{/if}>
 				<dt><label for="tplName">{lang}wcf.global.name{/lang}</label></dt>
 				<dd>
-					<input type="text" id="tplName" name="tplName" value="{$tplName}" required="required" class="long" />
+					<input type="text" id="tplName" name="tplName" value="{$tplName}" required="required" class="long">
 					{if $errorField == 'tplName'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -68,8 +68,8 @@
 		{event name='sections'}
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-			{if $copy}<input type="hidden" name="copy" value="{@$copy}" />{/if}
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+			{if $copy}<input type="hidden" name="copy" value="{@$copy}">{/if}
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</form>
diff --git a/wcfsetup/install/files/acp/templates/templateDiff.tpl b/wcfsetup/install/files/acp/templates/templateDiff.tpl
index da05ab4fec..6670d537b5 100644
--- a/wcfsetup/install/files/acp/templates/templateDiff.tpl
+++ b/wcfsetup/install/files/acp/templates/templateDiff.tpl
@@ -46,8 +46,8 @@
 	</section>
 	
 	<div class="formSubmit">
-		<input type="hidden" name="id" value="{$templateID}" />
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="hidden" name="id" value="{$templateID}">
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 	</div>
 </form>
 
diff --git a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
index 970d46f6c0..71f79314e8 100644
--- a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
@@ -46,7 +46,7 @@
 		<dl{if $errorField == 'templateGroupName'} class="formError"{/if}>
 			<dt><label for="templateGroupName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="templateGroupName" name="templateGroupName" value="{$templateGroupName}" required="required" class="long" />
+				<input type="text" id="templateGroupName" name="templateGroupName" value="{$templateGroupName}" required="required" class="long">
 				{if $errorField == 'templateGroupName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -62,7 +62,7 @@
 		<dl{if $errorField == 'templateGroupFolderName'} class="formError"{/if}>
 			<dt><label for="templateGroupFolderName">{lang}wcf.acp.template.group.folderName{/lang}</label></dt>
 			<dd>
-				<input type="text" id="templateGroupFolderName" name="templateGroupFolderName" value="{$templateGroupFolderName}" required="required" class="long" />
+				<input type="text" id="templateGroupFolderName" name="templateGroupFolderName" value="{$templateGroupFolderName}" required="required" class="long">
 				{if $errorField == 'templateGroupFolderName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -81,7 +81,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl
index bbdd9a4677..3c4cb1a1ce 100644
--- a/wcfsetup/install/files/acp/templates/templateList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateList.tpl
@@ -70,7 +70,7 @@
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="searchTemplateName" name="searchTemplateName" value="{$searchTemplateName}" placeholder="{lang}wcf.global.name{/lang}" class="long" />
+					<input type="text" id="searchTemplateName" name="searchTemplateName" value="{$searchTemplateName}" placeholder="{lang}wcf.global.name{/lang}" class="long">
 				</dd>
 			</dl>
 			
@@ -78,7 +78,7 @@
 		</div>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</section>
diff --git a/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
index d495bbdbe6..364e423ece 100644
--- a/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
@@ -1,2 +1,2 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="{$option->optionName}" value="{$i18nPlainValues[$option->optionName]}" class="long" />
+<input type="{@$inputType}" id="{$option->optionName}" name="{$option->optionName}" value="{$i18nPlainValues[$option->optionName]}" class="long">
 {include file='multipleLanguageInputJavascript' elementIdentifier=$option->optionName forceSelection=$option->requireI18n}
diff --git a/wcfsetup/install/files/acp/templates/textOptionType.tpl b/wcfsetup/install/files/acp/templates/textOptionType.tpl
index 56de435ec3..bb4e157568 100644
--- a/wcfsetup/install/files/acp/templates/textOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textOptionType.tpl
@@ -1 +1 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if $inputType == 'password'} autocomplete="off"{/if} />
\ No newline at end of file
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if $inputType == 'password'} autocomplete="off"{/if}>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl
index 945e8366e7..b16f8c98d4 100644
--- a/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl
@@ -1,5 +1,5 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchTextOption{/lang}</label>
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled="disabled"{/if} />
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled="disabled"{/if}>
 
 <script data-relocate="true">
 //<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl
index 7d22daa2d6..33d4a793e2 100644
--- a/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl
@@ -1,4 +1,4 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchTextOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
 <textarea id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if} cols="40" rows="10">{$value}</textarea>
 
 <script data-relocate="true">
diff --git a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
index 22247195ee..30a6c36737 100644
--- a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
@@ -39,7 +39,7 @@
 			<dl{if $errorField == $objectType->objectTypeID} class="formError"{/if}>
 				<dt><label for="{@$objectType->objectType}">{lang}wcf.user.activityPoint.objectType.{$objectType->objectType}{/lang}</label></dt>
 				<dd>
-					<input type="number" id="{@$objectType->objectType}" name="points[{@$objectType->objectTypeID}]" value="{$points[$objectType->objectTypeID]}" required="required" min="0" class="tiny" />
+					<input type="number" id="{@$objectType->objectType}" name="points[{@$objectType->objectTypeID}]" value="{$points[$objectType->objectTypeID]}" required="required" min="0" class="tiny">
 					{if $errorField == $objectType->objectTypeID}
 						<small class="innerError">
 							{lang greaterThan=-1}wcf.global.form.error.greaterThan{/lang}
@@ -51,7 +51,7 @@
 	</section>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 1189a56d83..22aa740f31 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -60,7 +60,7 @@
 				<dl{if $errorType.username|isset} class="formError"{/if}>
 					<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 					<dd>
-						<input type="text" id="username" name="username" value="{$username}" pattern="^[^,\n]+$" autofocus="autofocus" class="medium" />
+						<input type="text" id="username" name="username" value="{$username}" pattern="^[^,\n]+$" autofocus="autofocus" class="medium">
 						{if $errorType.username|isset}
 							<small class="innerError">
 								{if $errorType.username == 'empty'}
@@ -94,7 +94,7 @@
 					<dl{if $errorType.email|isset} class="formError"{/if}>
 						<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
 						<dd>
-							<input type="email" id="email" name="email" value="{$email}" class="medium" />
+							<input type="email" id="email" name="email" value="{$email}" class="medium">
 							{if $errorType.email|isset}
 								<small class="innerError">
 									{if $errorType.email == 'empty'}
@@ -110,7 +110,7 @@
 					<dl{if $errorType.confirmEmail|isset} class="formError"{/if}>
 						<dt><label for="confirmEmail">{lang}wcf.user.confirmEmail{/lang}</label></dt>
 						<dd>
-							<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" class="medium" />
+							<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" class="medium">
 							{if $errorType.confirmEmail|isset}
 								<small class="innerError">
 									{lang}wcf.user.confirmEmail.error.{@$errorType.confirmEmail}{/lang}
@@ -130,7 +130,7 @@
 					<dl{if $errorType.password|isset} class="formError"{/if}>
 						<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
 						<dd>
-							<input type="password" id="password" name="password" value="{$password}" class="medium" autocomplete="off" />
+							<input type="password" id="password" name="password" value="{$password}" class="medium" autocomplete="off">
 							{if $errorType.password|isset}
 								<small class="innerError">
 									{if $errorType.password == 'empty'}
@@ -146,7 +146,7 @@
 					<dl{if $errorType.confirmPassword|isset} class="formError"{/if}>
 						<dt><label for="confirmPassword">{lang}wcf.user.confirmPassword{/lang}</label></dt>
 						<dd>
-							<input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}" class="medium" autocomplete="off" />
+							<input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}" class="medium" autocomplete="off">
 							{if $errorType.confirmPassword|isset}
 								<small class="innerError">
 									{lang}wcf.user.confirmPassword.error.{@$errorType.confirmPassword}{/lang}
@@ -166,7 +166,7 @@
 					<dl>
 						<dt></dt>
 						<dd>
-							<label><input type="checkbox" id="banned" name="banned" value="1" {if $banned == 1}checked="checked" {/if}/> {lang}wcf.acp.user.banUser{/lang}</label>
+							<label><input type="checkbox" id="banned" name="banned" value="1"{if $banned == 1} checked="checked"{/if}> {lang}wcf.acp.user.banUser{/lang}</label>
 							<small>{lang}wcf.acp.user.banUser.description{/lang}</small>	
 						</dd>
 					</dl>
@@ -181,13 +181,13 @@
 					
 					<dl>
 						<dt></dt>
-						<dd><label><input type="checkbox" id="banNeverExpires" name="banNeverExpires" value="1" {if !$banExpires}checked="checked" {/if}/> {lang}wcf.acp.user.ban.neverExpires{/lang}</label></dd>
+						<dd><label><input type="checkbox" id="banNeverExpires" name="banNeverExpires" value="1"{if !$banExpires} checked="checked"{/if}> {lang}wcf.acp.user.ban.neverExpires{/lang}</label></dd>
 					</dl>
 					
 					<dl id="banExpiresSetting">
 						<dt><label for="banExpires">{lang}wcf.acp.user.ban.expires{/lang}</label></dt>
 						<dd>
-							<input type="date" name="banExpires" id="banExpires" min="{TIME_NOW|date:'Y-m-d'}" {if $banExpires} value="{$banExpires|date:'Y-m-d'}"{/if} class="medium" data-ignore-timezone="true" />
+							<input type="date" name="banExpires" id="banExpires" min="{TIME_NOW|date:'Y-m-d'}" {if $banExpires} value="{$banExpires|date:'Y-m-d'}"{/if} class="medium" data-ignore-timezone="true">
 							<small>{lang}wcf.acp.user.ban.expires.description{/lang}</small>
 						</dd>
 					</dl>
@@ -250,7 +250,7 @@
 									</dt>
 									<dd>
 										{foreach from=$availableContentLanguages key=availableLanguageID item=availableLanguage}
-											<label><input type="checkbox" name="visibleLanguages[]" value="{@$availableLanguageID}"{if $availableLanguageID|in_array:$visibleLanguages} checked="checked"{/if} /> {@$availableLanguage}</label>
+											<label><input type="checkbox" name="visibleLanguages[]" value="{@$availableLanguageID}"{if $availableLanguageID|in_array:$visibleLanguages} checked="checked"{/if}> {@$availableLanguage}</label>
 										{/foreach}
 									</dd>
 								</dl>
@@ -261,7 +261,7 @@
 							<dl>
 								<dt><label for="userTitle">{lang}wcf.user.userTitle{/lang}</label></dt>
 								<dd>
-									<input type="text" id="userTitle" name="userTitle" value="{$userTitle}" class="long" maxlength="{@USER_TITLE_MAX_LENGTH}" />
+									<input type="text" id="userTitle" name="userTitle" value="{$userTitle}" class="long" maxlength="{@USER_TITLE_MAX_LENGTH}">
 									{if $errorType[userTitle]|isset}
 										<small class="innerError">
 											{lang}wcf.user.userTitle.error.{@$errorType[userTitle]}{/lang}
@@ -301,9 +301,9 @@
 					<dl>
 						<dt>{lang}wcf.message.settings{/lang}</dt>
 						<dd>
-							<label><input id="signatureEnableSmilies" name="signatureEnableSmilies" type="checkbox" value="1"{if $signatureEnableSmilies} checked="checked"{/if} /> {lang}wcf.message.settings.enableSmilies{/lang}</label>
-							<label><input id="signatureEnableBBCodes" name="signatureEnableBBCodes" type="checkbox" value="1"{if $signatureEnableBBCodes} checked="checked"{/if} /> {lang}wcf.message.settings.enableBBCodes{/lang}</label>
-							<label><input id="signatureEnableHtml" name="signatureEnableHtml" type="checkbox" value="1"{if $signatureEnableHtml} checked="checked"{/if} /> {lang}wcf.message.settings.enableHtml{/lang}</label>
+							<label><input id="signatureEnableSmilies" name="signatureEnableSmilies" type="checkbox" value="1"{if $signatureEnableSmilies} checked="checked"{/if}> {lang}wcf.message.settings.enableSmilies{/lang}</label>
+							<label><input id="signatureEnableBBCodes" name="signatureEnableBBCodes" type="checkbox" value="1"{if $signatureEnableBBCodes} checked="checked"{/if}> {lang}wcf.message.settings.enableBBCodes{/lang}</label>
+							<label><input id="signatureEnableHtml" name="signatureEnableHtml" type="checkbox" value="1"{if $signatureEnableHtml} checked="checked"{/if}> {lang}wcf.message.settings.enableHtml{/lang}</label>
 						</dd>
 					</dl>
 					
@@ -317,7 +317,7 @@
 						<dl>
 							<dt></dt>
 							<dd>
-								<label><input type="checkbox" id="disableSignature" name="disableSignature" value="1" {if $disableSignature == 1}checked="checked" {/if}/> {lang}wcf.acp.user.disableSignature{/lang}</label>
+								<label><input type="checkbox" id="disableSignature" name="disableSignature" value="1"{if $disableSignature == 1} checked="checked"{/if}> {lang}wcf.acp.user.disableSignature{/lang}</label>
 							</dd>
 						</dl>
 						
@@ -330,13 +330,13 @@
 						
 						<dl>
 							<dt></dt>
-							<dd><label><input type="checkbox" id="disableSignatureNeverExpires" name="disableSignatureNeverExpires" value="1" {if !$disableSignatureExpires}checked="checked" {/if}/> {lang}wcf.acp.user.disableSignature.neverExpires{/lang}</label></dd>
+							<dd><label><input type="checkbox" id="disableSignatureNeverExpires" name="disableSignatureNeverExpires" value="1"{if !$disableSignatureExpires} checked="checked"{/if}> {lang}wcf.acp.user.disableSignature.neverExpires{/lang}</label></dd>
 						</dl>
 						
 						<dl id="disableSignatureExpiresSetting">
 							<dt><label for="disableSignatureExpiresExpires">{lang}wcf.acp.user.disableSignature.expires{/lang}</label></dt>
 							<dd>
-								<input type="date" name="disableSignatureExpires" id="disableSignatureExpires" min="{TIME_NOW|date:'Y-m-d'}" {if $disableSignatureExpires} value="{$disableSignatureExpires|date:'Y-m-d'}"{/if} class="medium" data-ignore-timezone="true" />
+								<input type="date" name="disableSignatureExpires" id="disableSignatureExpires" min="{TIME_NOW|date:'Y-m-d'}" {if $disableSignatureExpires} value="{$disableSignatureExpires|date:'Y-m-d'}"{/if} class="medium" data-ignore-timezone="true">
 								<small>{lang}wcf.acp.user.disableSignature.expires.description{/lang}</small>
 							</dd>
 						</dl>
@@ -387,7 +387,7 @@
 					<dl>
 						<dt></dt>
 						<dd>
-							<label><input type="radio" name="avatarType" value="none" {if $avatarType == 'none'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.none{/lang}</label>
+							<label><input type="radio" name="avatarType" value="none"{if $avatarType == 'none'} checked="checked"{/if}> {lang}wcf.user.avatar.type.none{/lang}</label>
 						</dd>
 					</dl>
 					
@@ -398,16 +398,16 @@
 								{if $userAvatar->canCrop()}
 									{assign var='__customAvatar' value=$__customAvatar|substr:0:-2}
 									{assign var='__customAvatarTitle' value='wcf.user.avatar.type.custom.crop'|language}
-									{append var='__customAvatar' value='class="userAvatarCrop jsTooltip" title="'|concat:$__customAvatarTitle:'" />'}
+									{append var='__customAvatar' value='class="userAvatarCrop jsTooltip" title="'|concat:$__customAvatarTitle:'">'}
 								{/if}
 								
 								{@$__customAvatar}
 							{else}
-								<img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage icon96" />
+								<img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage icon96">
 							{/if}
 						</dt>
 						<dd>
-							<label><input type="radio" name="avatarType" value="custom" {if $avatarType == 'custom'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.custom{/lang}</label>
+							<label><input type="radio" name="avatarType" value="custom"{if $avatarType == 'custom'} checked="checked"{/if}> {lang}wcf.user.avatar.type.custom{/lang}</label>
 							
 							{* placeholder for upload button: *}
 							<div></div>
@@ -422,9 +422,9 @@
 					
 					{if MODULE_GRAVATAR}
 						<dl{if $errorType[gravatar]|isset} class="formError"{/if}>
-							<dt><img src="https://secure.gravatar.com/avatar/{@$user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="userAvatarImage icon96" /></dt>
+							<dt><img src="https://secure.gravatar.com/avatar/{@$user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="userAvatarImage icon96"></dt>
 							<dd>
-								<label><input type="radio" name="avatarType" value="gravatar" {if $avatarType == 'gravatar'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
+								<label><input type="radio" name="avatarType" value="gravatar"{if $avatarType == 'gravatar'} checked="checked"{/if}> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
 								
 								{if $errorType[gravatar]|isset}
 									<small class="innerError">
@@ -445,7 +445,7 @@
 						<dl>
 							<dt></dt>
 							<dd>
-								<label><input type="checkbox" id="disableAvatar" name="disableAvatar" value="1" {if $disableAvatar == 1}checked="checked" {/if}/> {lang}wcf.acp.user.disableAvatar{/lang}</label>
+								<label><input type="checkbox" id="disableAvatar" name="disableAvatar" value="1"{if $disableAvatar == 1} checked="checked"{/if}> {lang}wcf.acp.user.disableAvatar{/lang}</label>
 							</dd>
 						</dl>
 						
@@ -458,13 +458,13 @@
 						
 						<dl>
 							<dt></dt>
-							<dd><label><input type="checkbox" id="disableAvatarNeverExpires" name="disableAvatarNeverExpires" value="1" {if !$disableAvatarExpires}checked="checked" {/if}/> {lang}wcf.acp.user.disableAvatar.neverExpires{/lang}</label></dd>
+							<dd><label><input type="checkbox" id="disableAvatarNeverExpires" name="disableAvatarNeverExpires" value="1"{if !$disableAvatarExpires} checked="checked"{/if}> {lang}wcf.acp.user.disableAvatar.neverExpires{/lang}</label></dd>
 						</dl>
 						
 						<dl id="disableAvatarExpiresSetting">
 							<dt><label for="disableAvatarExpiresExpires">{lang}wcf.acp.user.disableAvatar.expires{/lang}</label></dt>
 							<dd>
-								<input type="date" name="disableAvatarExpires" id="disableAvatarExpires" min="{TIME_NOW|date:'Y-m-d'}" {if $disableAvatarExpires} value="{$disableAvatarExpires|date:'Y-m-d'}"{/if} class="medium" />
+								<input type="date" name="disableAvatarExpires" id="disableAvatarExpires" min="{TIME_NOW|date:'Y-m-d'}" {if $disableAvatarExpires} value="{$disableAvatarExpires|date:'Y-m-d'}"{/if} class="medium">
 								<small>{lang}wcf.acp.user.disableAvatar.expires.description{/lang}</small>
 							</dd>
 						</dl>
@@ -535,7 +535,7 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
index 16b96917ec..68cc650d47 100644
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -47,7 +47,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userContentRevertChanges.tpl b/wcfsetup/install/files/acp/templates/userContentRevertChanges.tpl
index 2ee2f90ac1..c364452071 100644
--- a/wcfsetup/install/files/acp/templates/userContentRevertChanges.tpl
+++ b/wcfsetup/install/files/acp/templates/userContentRevertChanges.tpl
@@ -33,7 +33,7 @@
 		<dl{if $errorField == 'timeframe'} class="formError"{/if}>
 			<dt><label for="timeframe">{lang}wcf.acp.user.revertChanges.timeframe{/lang}</label></dt>
 			<dd>
-				<input name="timeframe" type="number" min="0" value="{$timeframe}" />
+				<input name="timeframe" type="number" min="0" value="{$timeframe}">
 				
 				{if $errorField == 'timeframe'}
 					<small class="innerError">
@@ -50,7 +50,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index 13c1bdfd72..5ea88965b7 100644
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -41,22 +41,22 @@
 		<dl>
 			<dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
 			<dd>
-				<label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}class="jsEnablesOptions" data-disable-options="[ ]" data-enable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
-				<label><input type="radio" class="jsEnablesOptions" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}data-disable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" data-enable-options="[ ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
+				<label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}class="jsEnablesOptions" data-disable-options="[ ]" data-enable-options="[ 'separatorDiv', 'textSeparatorDiv' ]"> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
+				<label><input type="radio" class="jsEnablesOptions" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}data-disable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" data-enable-options="[ ]"> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
 			</dd>
 		</dl>
 		
 		<dl id="separatorDiv">
 			<dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
 			<dd>
-				<input type="text" id="separator" name="separator" value="{$separator}" class="medium" />
+				<input type="text" id="separator" name="separator" value="{$separator}" class="medium">
 			</dd>
 		</dl>
 		
 		<dl id="textSeparatorDiv">
 			<dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
 			<dd>
-				<input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
+				<input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium">
 			</dd>
 		</dl>
 		
@@ -66,7 +66,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userException.tpl b/wcfsetup/install/files/acp/templates/userException.tpl
index 8d66efb277..117b0ae469 100644
--- a/wcfsetup/install/files/acp/templates/userException.tpl
+++ b/wcfsetup/install/files/acp/templates/userException.tpl
@@ -7,7 +7,7 @@
 <script data-relocate="true">
 	//<![CDATA[
 	if (document.referrer) {
-		$('#errorMessage').append('<br /><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>');
+		$('#errorMessage').append('<br><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>');
 	}
 	//]]>
 </script>
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index c1fd1f9aeb..e6b915f711 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -72,7 +72,7 @@
 		<dl{if $errorType.groupName|isset} class="formError"{/if}>
 			<dt><label for="groupName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" autofocus="autofocus" class="medium" />
+				<input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" autofocus="autofocus" class="medium">
 				{if $errorType.groupName|isset}
 					<small class="innerError">
 						{if $errorType.groupName == 'empty'}
@@ -106,7 +106,7 @@
 		<dl{if $errorType.priority|isset} class="formError"{/if}>
 			<dt><label for="priority">{lang}wcf.acp.group.priority{/lang}</label></dt>
 			<dd>
-				<input type="number" id="priority" name="priority" value="{@$priority}" class="tiny" max="8388607" />
+				<input type="number" id="priority" name="priority" value="{@$priority}" class="tiny" max="8388607">
 				{if $errorType.priority|isset}
 					<small class="innerError">
 						{lang}wcf.acp.group.priority.error.{@$errorType.priority}{/lang}
@@ -120,7 +120,7 @@
 			<dl{if $errorType.userOnlineMarking|isset} class="formError"{/if}>
 				<dt><label for="userOnlineMarking">{lang}wcf.acp.group.userOnlineMarking{/lang}</label></dt>
 				<dd>
-					<input type="text" id="userOnlineMarking" name="userOnlineMarking" value="{$userOnlineMarking}" class="long" />
+					<input type="text" id="userOnlineMarking" name="userOnlineMarking" value="{$userOnlineMarking}" class="long">
 					{if $errorType.userOnlineMarking|isset}
 						<small class="innerError">
 							{lang}wcf.acp.group.userOnlineMarking.error.{@$errorType.userOnlineMarking}{/lang}
@@ -135,7 +135,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" id="showOnTeamPage" name="showOnTeamPage" value="1" {if $showOnTeamPage}checked="checked" {/if}/> {lang}wcf.acp.group.showOnTeamPage{/lang}</label>
+					<label><input type="checkbox" id="showOnTeamPage" name="showOnTeamPage" value="1"{if $showOnTeamPage} checked="checked"{/if}> {lang}wcf.acp.group.showOnTeamPage{/lang}</label>
 				</dd>
 			</dl>
 		{/if}
@@ -192,8 +192,8 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		<input type="hidden" name="action" value="{@$action}" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+		<input type="hidden" name="action" value="{@$action}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
index 5d1f23c13d..c291d2dcea 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
@@ -33,7 +33,7 @@
 		<dl{if $errorField == 'title'} class="formError"{/if}>
 			<dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="title" name="title" value="{$title}" class="long" />
+				<input type="text" id="title" name="title" value="{$title}" class="long">
 				{if $errorField == 'title'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -63,7 +63,7 @@
 		<dl class="formError">
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
+				<label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -86,8 +86,8 @@
 	</section>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		<input type="hidden" name="action" value="{@$action}" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+		<input type="hidden" name="action" value="{@$action}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userGroupOption.tpl b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
index b32bdf432c..1aa798102b 100644
--- a/wcfsetup/install/files/acp/templates/userGroupOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
@@ -92,7 +92,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index 6f5483da17..ae07672199 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -84,7 +84,7 @@
 		<table data-type="com.woltlab.wcf.user" class="table jsClipboardContainer">
 			<thead>
 				<tr>
-					<th class="columnMark"><label><input type="checkbox" class="jsClipboardMarkAll" /></label></th>
+					<th class="columnMark"><label><input type="checkbox" class="jsClipboardMarkAll"></label></th>
 					<th class="columnID columnUserID{if $sortField == 'userID'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='UserList' id=$searchID}action={@$encodedAction}&pageNo={@$pageNo}&sortField=userID&sortOrder={if $sortField == 'userID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
 					<th class="columnTitle columnUsername{if $sortField == 'username'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='UserList' id=$searchID}action={@$encodedAction}&pageNo={@$pageNo}&sortField=username&sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.user.username{/lang}</a></th>
 					
@@ -99,7 +99,7 @@
 			<tbody>
 				{foreach from=$users item=user}
 					<tr class="jsUserRow jsClipboardObject">
-						<td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$user->userID}" /></td>
+						<td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$user->userID}"></td>
 						<td class="columnIcon">
 							{if $user->editable}
 								<a href="{link controller='UserEdit' id=$user->userID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 70b1884ddf..6299bd6013 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -81,7 +81,7 @@
 		<dl{if $errorField == 'subject'} class="formError"{/if}>
 			<dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
 			<dd>
-				<input type="text" id="subject" name="subject" value="{$subject}" autofocus="autofocus" class="long" />
+				<input type="text" id="subject" name="subject" value="{$subject}" autofocus="autofocus" class="long">
 				{if $errorField == 'subject'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -97,7 +97,7 @@
 		<dl{if $errorField == 'from'} class="formError"{/if}>
 			<dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
 			<dd>
-				<input type="text" id="from" name="from" value="{$from}" class="long" />
+				<input type="text" id="from" name="from" value="{$from}" class="long">
 				{if $errorField == 'from'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -131,7 +131,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" id="enableHTML" name="enableHTML" {if $enableHTML == 1}checked="checked" {/if}value="1" /> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
+				<label><input type="checkbox" id="enableHTML" name="enableHTML" {if $enableHTML == 1}checked="checked" {/if}value="1"> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -141,9 +141,9 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		<input type="hidden" name="action" value="{@$action}" />
-		<input type="hidden" name="userIDs" value="{implode from=$userIDs item=userID glue=','}{@$userID}{/implode}" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+		<input type="hidden" name="action" value="{@$action}">
+		<input type="hidden" name="userIDs" value="{implode from=$userIDs item=userID glue=','}{@$userID}{/implode}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
index c337c07d12..a729931129 100644
--- a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
@@ -27,7 +27,7 @@
 			<dl{if $errorField == 'optionName'} class="formError"{/if}>
 				<dt><label for="optionName">{lang}wcf.global.name{/lang}</label></dt>
 				<dd>
-					<input type="text" id="optionName" name="optionName" value="{$i18nPlainValues['optionName']}" required="required" autofocus="autofocus" class="long" />
+					<input type="text" id="optionName" name="optionName" value="{$i18nPlainValues['optionName']}" required="required" autofocus="autofocus" class="long">
 					{if $errorField == 'optionName'}
 						<small class="innerError">
 							{if $errorType == 'multilingual'}
@@ -86,7 +86,7 @@
 			<dl>
 				<dt><label for="showOrder">{lang}wcf.acp.user.option.showOrder{/lang}</label></dt>
 				<dd>
-					<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short" />
+					<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short">
 				</dd>
 			</dl>
 			
@@ -120,7 +120,7 @@
 			<dl>
 				<dt><label for="defaultValue">{lang}wcf.acp.user.option.defaultValue{/lang}</label></dt>
 				<dd>
-					<input type="text" id="defaultValue" name="defaultValue" value="{$defaultValue}" class="long" />
+					<input type="text" id="defaultValue" name="defaultValue" value="{$defaultValue}" class="long">
 					<small>{lang}wcf.acp.user.option.defaultValue.description{/lang}</small>
 				</dd>
 			</dl>
@@ -145,7 +145,7 @@
 			<dl{if $errorField == 'outputClass'} class="formError"{/if}>
 				<dt><label for="outputClass">{lang}wcf.acp.user.option.outputClass{/lang}</label></dt>
 				<dd>
-					<input type="text" id="outputClass" name="outputClass" value="{$outputClass}" class="long" />
+					<input type="text" id="outputClass" name="outputClass" value="{$outputClass}" class="long">
 					{if $errorField == 'outputClass'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -194,7 +194,7 @@
 			<dl{if $errorField == 'validationPattern'} class="formError"{/if}>
 				<dt><label for="validationPattern">{lang}wcf.acp.user.option.validationPattern{/lang}</label></dt>
 				<dd>
-					<input type="text" id="validationPattern" name="validationPattern" value="{$validationPattern}" class="long" />
+					<input type="text" id="validationPattern" name="validationPattern" value="{$validationPattern}" class="long">
 					{if $errorField == 'validationPattern'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -211,9 +211,9 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" name="required" id="required" value="1" {if $required == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.required{/lang}</label>
-					<label><input type="checkbox" name="askDuringRegistration" id="askDuringRegistration" value="1" {if $askDuringRegistration == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.askDuringRegistration{/lang}</label>
-					<label><input type="checkbox" name="searchable" id="searchable" value="1" {if $searchable == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.searchable{/lang}</label>
+					<label><input type="checkbox" name="required" id="required" value="1"{if $required == 1} checked="checked"{/if}> {lang}wcf.acp.user.option.required{/lang}</label>
+					<label><input type="checkbox" name="askDuringRegistration" id="askDuringRegistration" value="1"{if $askDuringRegistration == 1} checked="checked"{/if}> {lang}wcf.acp.user.option.askDuringRegistration{/lang}</label>
+					<label><input type="checkbox" name="searchable" id="searchable" value="1"{if $searchable == 1} checked="checked"{/if}> {lang}wcf.acp.user.option.searchable{/lang}</label>
 				</dd>
 			</dl>
 			
@@ -223,7 +223,7 @@
 		{event name='sections'}
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</form>
diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
index 9ec322bd79..e800236e57 100644
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
@@ -26,7 +26,7 @@
 		<dl{if $errorField == 'categoryName'} class="formError"{/if}>
 			<dt><label for="categoryName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="categoryName" name="categoryName" value="{$i18nPlainValues['categoryName']}" required="required" autofocus="autofocus" class="long" />
+				<input type="text" id="categoryName" name="categoryName" value="{$i18nPlainValues['categoryName']}" required="required" autofocus="autofocus" class="long">
 				{if $errorField == 'categoryName'}
 					<small class="innerError">
 						{if $errorType == 'multilingual'}
@@ -43,7 +43,7 @@
 		<dl>
 			<dt><label for="showOrder">{lang}wcf.acp.user.option.category.showOrder{/lang}</label></dt>
 			<dd>
-				<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short" />
+				<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short">
 			</dd>
 		</dl>
 		
@@ -53,7 +53,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
index bc259a3ee3..be2980da05 100644
--- a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
@@ -26,7 +26,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" name="applyChangesToExistingUsers" value="1" {if $applyChangesToExistingUsers}checked="checked" {/if}/> {lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers{/lang}</label>
+					<label><input type="checkbox" name="applyChangesToExistingUsers" value="1"{if $applyChangesToExistingUsers} checked="checked"{/if}> {lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers{/lang}</label>
 					<small>{lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers.description{/lang}</small>	
 				</dd>
 			</dl>
@@ -49,7 +49,7 @@
 		{event name='sections'}
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 			{@SECURITY_TOKEN_INPUT_TAG}
 		</div>
 	</form>
diff --git a/wcfsetup/install/files/acp/templates/userRankAdd.tpl b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
index 84085112e2..c6ed4194e2 100644
--- a/wcfsetup/install/files/acp/templates/userRankAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
@@ -33,7 +33,7 @@
 		<dl{if $errorField == 'rankTitle'} class="formError"{/if}>
 			<dt><label for="rankTitle">{lang}wcf.acp.user.rank.title{/lang}</label></dt>
 			<dd>
-				<input type="text" id="rankTitle" name="rankTitle" value="{$i18nPlainValues['rankTitle']}" required="required" autofocus="autofocus" class="long" />
+				<input type="text" id="rankTitle" name="rankTitle" value="{$i18nPlainValues['rankTitle']}" required="required" autofocus="autofocus" class="long">
 				{if $errorField == 'rankTitle'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -55,9 +55,9 @@
 				<ul id="labelList">
 					{foreach from=$availableCssClassNames item=className}
 						{if $className == 'custom'}
-							<li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if} /> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long" /></span></li>
+							<li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if}> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long"></span></li>
 						{else}
-							<li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if} /> <span class="badge label{if $className != 'none'} {$className}{/if}">{lang}wcf.acp.user.rank.title{/lang}</span></label></li>
+							<li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if}> <span class="badge label{if $className != 'none'} {$className}{/if}">{lang}wcf.acp.user.rank.title{/lang}</span></label></li>
 						{/if}
 					{/foreach}
 				</ul>
@@ -84,7 +84,7 @@
 		<dl{if $errorField == 'rankImage'} class="formError"{/if}>
 			<dt><label for="rankImage">{lang}wcf.acp.user.rank.image{/lang}</label></dt>
 			<dd>
-				<input type="text" id="rankImage" name="rankImage" value="{$rankImage}" class="long" />
+				<input type="text" id="rankImage" name="rankImage" value="{$rankImage}" class="long">
 				{if $errorField == 'rankImage'}
 					<small class="innerError">
 						{lang}wcf.acp.user.rank.image.error.{@$errorType}{/lang}
@@ -97,7 +97,7 @@
 		<dl{if $errorField == 'repeatImage'} class="formError"{/if}>
 			<dt><label for="repeatImage">{lang}wcf.acp.user.rank.repeatImage{/lang}</label></dt>
 			<dd>
-				<input type="number" id="repeatImage" name="repeatImage" value="{@$repeatImage}" min="1" class="tiny" />
+				<input type="number" id="repeatImage" name="repeatImage" value="{@$repeatImage}" min="1" class="tiny">
 				{if $errorField == 'rankImage'}
 					<small class="innerError">
 						{lang}wcf.acp.user.rank.repeatImage.error.{@$errorType}{/lang}
@@ -161,7 +161,7 @@
 		<dl{if $errorField == 'requiredPoints'} class="formError"{/if}>
 			<dt><label for="requiredPoints">{lang}wcf.acp.user.rank.requiredPoints{/lang}</label></dt>
 			<dd>
-				<input type="number" id="requiredPoints" name="requiredPoints" value="{@$requiredPoints}" min="0" class="tiny" />
+				<input type="number" id="requiredPoints" name="requiredPoints" value="{@$requiredPoints}" min="0" class="tiny">
 				{if $errorField == 'requiredPoints'}
 					<small class="innerError">
 						{lang}wcf.acp.user.rank.requiredPoints.error.{@$errorType}{/lang}
@@ -177,7 +177,7 @@
 	{event name='sections'}
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index a7ac6ffbd7..c93e672393 100644
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -74,7 +74,7 @@
 			<dl>
 				<dt><label for="itemsPerPage">{lang}wcf.acp.user.search.display.itemsPerPage{/lang}</label></dt>
 				<dd>
-					<input type="number" id="itemsPerPage" name="itemsPerPage" value="{@$itemsPerPage}" class="tiny" />
+					<input type="number" id="itemsPerPage" name="itemsPerPage" value="{@$itemsPerPage}" class="tiny">
 				</dd>
 			</dl>
 			
@@ -92,7 +92,7 @@
 					<dd>
 						{foreach from=$columnOptions item=optionData}
 							{assign var='option' value=$optionData.object}
-							<label><input type="checkbox" name="columns[]" value="{$option->optionName}" {if $option->optionName|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.option.{$option->optionName}{/lang}</label>
+							<label><input type="checkbox" name="columns[]" value="{$option->optionName}"{if $option->optionName|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.option.{$option->optionName}{/lang}</label>
 						{/foreach}
 					</dd>
 				</dl>
@@ -102,14 +102,14 @@
 				<dt><label>{lang}wcf.acp.user.search.display.columns.other{/lang}</label></dt>
 				<dd>
 					{if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
-						<label><input type="checkbox" name="columns[]" value="email" {if "email"|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.email{/lang}</label>
+						<label><input type="checkbox" name="columns[]" value="email"{if "email"|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.email{/lang}</label>
 					{/if}
-					<label><input type="checkbox" name="columns[]" value="registrationDate" {if "registrationDate"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.user.registrationDate{/lang}</label>
-					<label><input type="checkbox" name="columns[]" value="lastActivityTime" {if "lastActivityTime"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.user.lastActivityTime{/lang}</label>
-					<label><input type="checkbox" name="columns[]" value="profileHits" {if "profileHits"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.user.profileHits{/lang}</label>
-					<label><input type="checkbox" name="columns[]" value="activityPoints" {if "activityPoints"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.user.activityPoint{/lang}</label>
+					<label><input type="checkbox" name="columns[]" value="registrationDate"{if "registrationDate"|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.registrationDate{/lang}</label>
+					<label><input type="checkbox" name="columns[]" value="lastActivityTime"{if "lastActivityTime"|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.lastActivityTime{/lang}</label>
+					<label><input type="checkbox" name="columns[]" value="profileHits"{if "profileHits"|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.profileHits{/lang}</label>
+					<label><input type="checkbox" name="columns[]" value="activityPoints"{if "activityPoints"|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.activityPoint{/lang}</label>
 					{if MODULE_LIKE}
-						<label><input type="checkbox" name="columns[]" value="likesReceived" {if "likesReceived"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.like.likesReceived{/lang}</label>
+						<label><input type="checkbox" name="columns[]" value="likesReceived"{if "likesReceived"|in_array:$columns} checked="checked"{/if}> {lang}wcf.like.likesReceived{/lang}</label>
 					{/if}
 					{event name='searchDisplayColumns'}
 				</dd>
@@ -122,7 +122,7 @@
 	</section>	
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl b/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl
index 2bf3f5d843..3bd597c367 100644
--- a/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl
@@ -23,7 +23,7 @@
 			{foreach from=$availableOptions item=availableOption}
 				<li class="sortableNode">
 					<span class="sortableNodeLabel">
-						<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$availableOption}" {if $availableOption|in_array:$value}checked="checked" {/if}/> {lang}wcf.user.option.{$availableOption}{/lang}</label>
+						<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$availableOption}"{if $availableOption|in_array:$value} checked="checked"{/if}> {lang}wcf.user.option.{$availableOption}{/lang}</label>
 					</span>
 				</li>
 			{/foreach}
@@ -31,6 +31,6 @@
 	</div>
 {else}
 	{foreach from=$availableOptions item=availableOption}
-		<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$availableOption}" {if $availableOption|in_array:$value}checked="checked" {/if}/> {lang}wcf.user.option.{$availableOption}{/lang}</label>
+		<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$availableOption}"{if $availableOption|in_array:$value} checked="checked"{/if}> {lang}wcf.user.option.{$availableOption}{/lang}</label>
 	{/foreach}
 {/if}
\ No newline at end of file
diff --git a/wcfsetup/install/files/icon/flag/index.php b/wcfsetup/install/files/icon/flag/index.php
index 263bedda08..4166b4aa8f 100644
--- a/wcfsetup/install/files/icon/flag/index.php
+++ b/wcfsetup/install/files/icon/flag/index.php
@@ -7,11 +7,11 @@ foreach ($flags as $flag) {
 		continue;
 	}
 	
-	echo '<img src="'.$flag.'" style="height: 15px; width: 24px; margin: 1em; box-shadow: 0px 0px 15px rgba(102, 102, 102, .8)" alt="" />';
-	echo '<img src="'.$flag.'" style="height: 30px; width: 48px; margin: 1em; box-shadow: 0px 0px 15px rgba(102, 102, 102, .8)" alt="" />';
-	echo '<img src="'.$flag.'" style="height: 60px; width: 96px; margin: 1em; box-shadow: 0px 0px 15px rgba(102, 102, 102, .8)" alt="" />';
-	echo '<img src="'.$flag.'" style="height: 120px; width: 192px; margin: 1em; box-shadow: 0px 0px 15px rgba(102, 102, 102, .8)" alt="" />';
-	echo '<hr />';
+	echo '<img src="'.$flag.'" style="height: 15px; width: 24px; margin: 1em; box-shadow: 0px 0px 15px rgba(102, 102, 102, .8)" alt="">';
+	echo '<img src="'.$flag.'" style="height: 30px; width: 48px; margin: 1em; box-shadow: 0px 0px 15px rgba(102, 102, 102, .8)" alt="">';
+	echo '<img src="'.$flag.'" style="height: 60px; width: 96px; margin: 1em; box-shadow: 0px 0px 15px rgba(102, 102, 102, .8)" alt="">';
+	echo '<img src="'.$flag.'" style="height: 120px; width: 192px; margin: 1em; box-shadow: 0px 0px 15px rgba(102, 102, 102, .8)" alt="">';
+	echo '<hr>';
 }
 ?>
 </div>
\ No newline at end of file
diff --git a/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php b/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php
index e68a1021a5..da597e69f2 100644
--- a/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php
+++ b/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php
@@ -51,7 +51,7 @@ class ViewableMedia extends DatabaseObjectDecorator {
 		if ($this->isImage && $this->tinyThumbnailType) {
 			$tinyThumbnail = Media::getThumbnailSizes()['tiny'];
 			if ($size <= $tinyThumbnail['width'] && $size <= $tinyThumbnail['height']) {
-				return '<img src="' . $this->getThumbnailLink('tiny') . '" alt="' . StringUtil::encodeHTML($this->altText) . '" '.($this->title ? 'title="'.StringUtil::encodeHTML($this->title).'" ' : '').'style="width: ' . $size . 'px; height: ' . $size . 'px;" />';
+				return '<img src="' . $this->getThumbnailLink('tiny') . '" alt="' . StringUtil::encodeHTML($this->altText) . '" '.($this->title ? 'title="'.StringUtil::encodeHTML($this->title).'" ' : '').'style="width: ' . $size . 'px; height: ' . $size . 'px;">';
 			}
 		}
 		
diff --git a/wcfsetup/install/files/lib/data/notice/Notice.class.php b/wcfsetup/install/files/lib/data/notice/Notice.class.php
index db25179adc..63c6a52673 100644
--- a/wcfsetup/install/files/lib/data/notice/Notice.class.php
+++ b/wcfsetup/install/files/lib/data/notice/Notice.class.php
@@ -58,7 +58,7 @@ class Notice extends DatabaseObject implements IRouteController {
 		]);
 		
 		if (!$this->noticeUseHtml) {
-			$text = nl2br(htmlspecialchars($text));
+			$text = nl2br(htmlspecialchars($text), false);
 		}
 		
 		return $text;
diff --git a/wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php
index 7f30b1a7dd..11d86b6547 100644
--- a/wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php
+++ b/wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php
@@ -33,7 +33,7 @@ class DefaultAvatar implements IUserAvatar {
 	public function getImageTag($size = null) {
 		if ($size === null) $size = $this->size;
 		
-		return '<img src="'.StringUtil::encodeHTML($this->getURL($size)).'" style="width: '.$size.'px; height: '.$size.'px" alt="" class="userAvatarImage" />';
+		return '<img src="'.StringUtil::encodeHTML($this->getURL($size)).'" style="width: '.$size.'px; height: '.$size.'px" alt="" class="userAvatarImage">';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php
index 2a059df527..db5b4465ec 100644
--- a/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php
+++ b/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php
@@ -146,7 +146,7 @@ class Gravatar extends DefaultAvatar {
 				break;
 		}
 		
-		return '<img src="'.StringUtil::encodeHTML($this->getURL($size)).'" '.($retinaSize !== null ? ('srcset="'.StringUtil::encodeHTML($this->getURL($retinaSize)).' 2x" ') : '').'style="width: '.$size.'px; height: '.$size.'px" alt="" class="userAvatarImage" />';
+		return '<img src="'.StringUtil::encodeHTML($this->getURL($size)).'" '.($retinaSize !== null ? ('srcset="'.StringUtil::encodeHTML($this->getURL($retinaSize)).' 2x" ') : '').'style="width: '.$size.'px; height: '.$size.'px" alt="" class="userAvatarImage">';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php
index a463f9a113..539b99c558 100644
--- a/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php
+++ b/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php
@@ -161,7 +161,7 @@ class UserAvatar extends DatabaseObject implements IUserAvatar {
 			break;
 		}
 		
-		return '<img src="'.StringUtil::encodeHTML($this->getURL($size)).'" '.($retinaSize !== null ? ('srcset="'.StringUtil::encodeHTML($this->getURL($retinaSize)).' 2x" ') : '').'style="width: '.$width.'px; height: '.$height.'px" alt="" class="userAvatarImage" />';
+		return '<img src="'.StringUtil::encodeHTML($this->getURL($size)).'" '.($retinaSize !== null ? ('srcset="'.StringUtil::encodeHTML($this->getURL($retinaSize)).' 2x" ') : '').'style="width: '.$width.'px; height: '.$height.'px" alt="" class="userAvatarImage">';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/data/user/rank/UserRank.class.php b/wcfsetup/install/files/lib/data/user/rank/UserRank.class.php
index b54385786f..6266b25da2 100644
--- a/wcfsetup/install/files/lib/data/user/rank/UserRank.class.php
+++ b/wcfsetup/install/files/lib/data/user/rank/UserRank.class.php
@@ -41,7 +41,7 @@ class UserRank extends DatabaseObject {
 	 */
 	public function getImage() {
 		if ($this->rankImage) {
-			$image = '<img src="'.(!preg_match('~^(/|https?://)~i', $this->rankImage) ? WCF::getPath() : '').StringUtil::encodeHTML($this->rankImage).'" alt="" />';
+			$image = '<img src="'.(!preg_match('~^(/|https?://)~i', $this->rankImage) ? WCF::getPath() : '').StringUtil::encodeHTML($this->rankImage).'" alt="">';
 			if ($this->repeatImage > 1) $image = str_repeat($image, $this->repeatImage);
 			return $image;
 		}
diff --git a/wcfsetup/install/files/lib/system/MetaTagHandler.class.php b/wcfsetup/install/files/lib/system/MetaTagHandler.class.php
index 9f3a7f352c..758666e584 100644
--- a/wcfsetup/install/files/lib/system/MetaTagHandler.class.php
+++ b/wcfsetup/install/files/lib/system/MetaTagHandler.class.php
@@ -92,7 +92,7 @@ class MetaTagHandler extends SingletonFactory implements \Countable, \Iterator {
 	public function current() {
 		$tag = $this->objects[$this->indexToObject[$this->index]];
 		
-		return '<meta ' . ($tag['isProperty'] ? 'property' : 'name') . '="' . $tag['name'] . '" content="' . StringUtil::encodeHTML($tag['value']) . '" />';
+		return '<meta ' . ($tag['isProperty'] ? 'property' : 'name') . '="' . $tag['name'] . '" content="' . StringUtil::encodeHTML($tag['value']) . '">';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
index cde73c7290..204b11f8fb 100644
--- a/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
@@ -88,7 +88,7 @@ class AttachmentBBCode extends AbstractBBCode {
 					$source = StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('Attachment', ['object' => $attachment]));
 					$title = StringUtil::encodeHTML($attachment->filename);
 					
-					$result = '<a href="' . $source . '" title="' . $title . '" class="embeddedAttachmentLink jsImageViewer' . ($class ? ' '.$class : '') . '"><img src="' . $source . '" alt="" /></a>';
+					$result = '<a href="' . $source . '" title="' . $title . '" class="embeddedAttachmentLink jsImageViewer' . ($class ? ' '.$class : '') . '"><img src="' . $source . '" alt=""></a>';
 				}
 				else {
 					$linkParameters = [
@@ -110,7 +110,7 @@ class AttachmentBBCode extends AbstractBBCode {
 						$imageClasses .= ' '.$class;
 					}
 					
-					$result = '<img src="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('Attachment', $linkParameters)).'"'.($imageClasses ? ' class="'.$imageClasses.'"' : '').' style="width: '.($attachment->hasThumbnail() ? $attachment->thumbnailWidth : $attachment->width).'px; height: '.($attachment->hasThumbnail() ? $attachment->thumbnailHeight : $attachment->height).'px;" alt="" />';
+					$result = '<img src="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('Attachment', $linkParameters)).'"'.($imageClasses ? ' class="'.$imageClasses.'"' : '').' style="width: '.($attachment->hasThumbnail() ? $attachment->thumbnailWidth : $attachment->width).'px; height: '.($attachment->hasThumbnail() ? $attachment->thumbnailHeight : $attachment->height).'px;" alt="">';
 					if ($attachment->hasThumbnail() && $attachment->canDownload()) {
 						$result = '<a href="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('Attachment', ['object' => $attachment])).'" title="'.StringUtil::encodeHTML($attachment->filename).'" class="embeddedAttachmentLink jsImageViewer' . ($class ? ' '.$class : '') . '">'.$result.'</a>';
 					}
diff --git a/wcfsetup/install/files/lib/system/bbcode/ImageBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/ImageBBCode.class.php
index 577ddc3459..6cdb09c403 100644
--- a/wcfsetup/install/files/lib/system/bbcode/ImageBBCode.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/ImageBBCode.class.php
@@ -47,7 +47,7 @@ class ImageBBCode extends AbstractBBCode {
 				$style .= 'width: ' . $openingTag['attributes'][2] . 'px;';
 			}
 			
-			return '<img src="'.$src.'" class="jsResizeImage" alt=""'.($style ? ' style="' . $style . '"' : '').($dataSource ? ' data-source="'.StringUtil::encodeJS($dataSource).'"' : '').' />';
+			return '<img src="'.$src.'" class="jsResizeImage" alt=""'.($style ? ' style="' . $style . '"' : '').($dataSource ? ' data-source="'.StringUtil::encodeJS($dataSource).'"' : '').'>';
 		}
 		else if ($parser->getOutputType() == 'text/simplified-html') {
 			$src = StringUtil::decodeHTML($src);
diff --git a/wcfsetup/install/files/lib/system/bbcode/ListBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/ListBBCode.class.php
index f52ca6600d..848385ea22 100644
--- a/wcfsetup/install/files/lib/system/bbcode/ListBBCode.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/ListBBCode.class.php
@@ -24,7 +24,7 @@ class ListBBCode extends AbstractBBCode {
 			// remove empty elements
 			foreach ($listElements as $key => $val) {
 				$listElements[$key] = StringUtil::trim($val);
-				if (empty($listElements[$key]) || $listElements[$key] == '<br />') {
+				if (empty($listElements[$key]) || $listElements[$key] == '<br />' || $listElements[$key] == '<br>') {
 					unset($listElements[$key]);
 				}
 			}
diff --git a/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php b/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php
index de9dd81750..0dc9b876f2 100644
--- a/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/MessageParser.class.php
@@ -51,7 +51,7 @@ class MessageParser extends BBCodeParser {
 				/** @var Smiley $smiley */
 				foreach ($categorySmilies as $smiley) {
 					foreach ($smiley->smileyCodes as $smileyCode) {
-						$this->smilies[$smileyCode] = '<img src="'.$smiley->getURL().'" alt="'.StringUtil::encodeHTML($smiley->smileyCode).'" />';
+						$this->smilies[$smileyCode] = '<img src="'.$smiley->getURL().'" alt="'.StringUtil::encodeHTML($smiley->smileyCode).'">';
 					}
 				}
 			}
@@ -85,9 +85,9 @@ class MessageParser extends BBCodeParser {
 			// encode html
 			$this->message = StringUtil::encodeHTML($this->message);
 			
-			// converts newlines to <br />'s
+			// converts newlines to <br>'s
 			if ($this->getOutputType() == 'text/html') {
-				$this->message = nl2br($this->message);
+				$this->message = nl2br($this->message, false);
 			}
 		}
 		else {
@@ -137,7 +137,7 @@ class MessageParser extends BBCodeParser {
 	protected function parseSmilies($text, $enableHtml = false) {
 		foreach ($this->smilies as $code => $html) {
 			//$text = preg_replace('~(?<!&\w{2}|&\w{3}|&\w{4}|&\w{5}|&\w{6}|&#\d{2}|&#\d{3}|&#\d{4}|&#\d{5})'.preg_quote((!$enableHtml ? StringUtil::encodeHTML($code) : $code), '~').'(?![^<]*>)~', $html, $text);
-			$text = preg_replace('~(?<=^|\s|<li>)'.preg_quote((!$enableHtml ? StringUtil::encodeHTML($code) : $code), '~').'(?=$|\s|</li>'.(!$enableHtml ? '|<br />' : '').')~', $html, $text);
+			$text = preg_replace('~(?<=^|\s|<li>)'.preg_quote((!$enableHtml ? StringUtil::encodeHTML($code) : $code), '~').'(?=$|\s|</li>'.(!$enableHtml ? '|<br />|<br>' : '').')~', $html, $text);
 		}
 		
 		return $text;
@@ -228,7 +228,7 @@ class MessageParser extends BBCodeParser {
 	 */
 	public function stripHTML($message) {
 		// remove img tags (smilies)
-		$message = preg_replace('~<img src="[^"]+" alt="([^"]+)" />~', '\\1', $message);
+		$message = preg_replace('~<img src="[^"]+" alt="([^"]+)"(?: /)?>~', '\\1', $message);
 		
 		// strip other HTML tags
 		$message = StringUtil::stripHTML($message);
diff --git a/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php b/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php
index 53c6875e95..1ef72aa3a2 100644
--- a/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/SimpleMessageParser.class.php
@@ -63,7 +63,7 @@ class SimpleMessageParser extends SingletonFactory {
 				/** @var Smiley $smiley */
 				foreach ($categorySmilies as $smiley) {
 					foreach ($smiley->smileyCodes as $smileyCode) {
-						$this->smilies[$smileyCode] = '<img src="'.$smiley->getURL().'" alt="'.StringUtil::encodeHTML($smiley->smileyCode).'" />';
+						$this->smilies[$smileyCode] = '<img src="'.$smiley->getURL().'" alt="'.StringUtil::encodeHTML($smiley->smileyCode).'">';
 					}
 				}
 			}
@@ -94,8 +94,8 @@ class SimpleMessageParser extends SingletonFactory {
 		// encode html
 		$this->message = StringUtil::encodeHTML($this->message);
 		
-		// converts newlines to <br />'s
-		$this->message = nl2br($this->message);
+		// converts newlines to <br>'s
+		$this->message = nl2br($this->message, false);
 		
 		// parse urls
 		if ($parseURLs) {
@@ -224,7 +224,7 @@ class SimpleMessageParser extends SingletonFactory {
 	public function parseSmilies($text) {
 		foreach ($this->smilies as $code => $html) {
 			//$text = preg_replace('~(?<!&\w{2}|&\w{3}|&\w{4}|&\w{5}|&\w{6}|&#\d{2}|&#\d{3}|&#\d{4}|&#\d{5})'.preg_quote(StringUtil::encodeHTML($code), '~').'(?![^<]*>)~', $html, $text);
-			$text = preg_replace('~(?<=^|\s)'.preg_quote(StringUtil::encodeHTML($code), '~').'(?=$|\s|<br />)~', $html, $text);
+			$text = preg_replace('~(?<=^|\s)'.preg_quote(StringUtil::encodeHTML($code), '~').'(?=$|\s|<br />|<br>)~', $html, $text);
 		}
 		
 		return $text;
diff --git a/wcfsetup/install/files/lib/system/bbcode/TableBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/TableBBCode.class.php
index 04dcc77a48..0ddca19f54 100644
--- a/wcfsetup/install/files/lib/system/bbcode/TableBBCode.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/TableBBCode.class.php
@@ -18,7 +18,7 @@ class TableBBCode extends AbstractBBCode {
 	 */
 	public function getParsedTag(array $openingTag, $content, array $closingTag, BBCodeParser $parser) {
 		if ($parser->getOutputType() == 'text/html') {
-			$parsedContent = Regex::compile('(?:\s|<br />)*(\[tr\].*\[/tr\])(?:\s|<br />)*', Regex::CASE_INSENSITIVE | Regex::DOT_ALL)->replace($content, '\\1');
+			$parsedContent = Regex::compile('(?:\s|<br>)*(\[tr\].*\[/tr\])(?:\s|<br>)*', Regex::CASE_INSENSITIVE | Regex::DOT_ALL)->replace($content, '\\1');
 			
 			// check syntax
 			$regex = new Regex('\[/?t[rd]\]', Regex::CASE_INSENSITIVE);
@@ -33,46 +33,46 @@ class TableBBCode extends AbstractBBCode {
 				foreach ($matches[0] as $match) {
 					switch ($match) {
 						case '[td]':
-							if (end($openTags) !== '[tr]') return;
+							if (end($openTags) !== '[tr]') return '';
 							$openTags[] = $match;
 							$openTDs++;
 						break;
 						case '[/td]':
-							if (end($openTags) !== '[td]') return;
+							if (end($openTags) !== '[td]') return '';
 							array_pop($openTags);
 						break;
 						case '[tr]':
-							if (!empty($openTags)) return;
+							if (!empty($openTags)) return '';
 							$openTags[] = $match;
 						break;
 						case '[/tr]':
-							if (end($openTags) !== '[tr]') return;
+							if (end($openTags) !== '[tr]') return '';
 							
 							array_pop($openTags);
 							
 							// check that every row has got the same number of tds
 							if ($firstRowTDs === 0) $firstRowTDs = $openTDs;
-							if ($openTDs !== $firstRowTDs) return;
+							if ($openTDs !== $firstRowTDs) return '';
 							
 							$openTDs = 0;
 						break;
 					}
 				}
 				
-				if (!empty($openTags)) return;
+				if (!empty($openTags)) return '';
 			}
 			else {
 				return '';
 			}
 			
 			// tr
-			$parsedContent = Regex::compile('\[tr\](?:\s|<br />)*', Regex::CASE_INSENSITIVE)->replace($parsedContent, '<tr>');
+			$parsedContent = Regex::compile('\[tr\](?:\s|<br>)*', Regex::CASE_INSENSITIVE)->replace($parsedContent, '<tr>');
 			// td
 			$parsedContent = str_ireplace('[td]', '<td>', $parsedContent);
 			// /td
-			$parsedContent = Regex::compile('\[/td\](?:\s|<br />)*', Regex::CASE_INSENSITIVE)->replace($parsedContent, '</td>');
+			$parsedContent = Regex::compile('\[/td\](?:\s|<br>)*', Regex::CASE_INSENSITIVE)->replace($parsedContent, '</td>');
 			// /tr
-			$parsedContent = Regex::compile('\[/tr\](?:\s|<br />)*', Regex::CASE_INSENSITIVE)->replace($parsedContent, '</tr>');
+			$parsedContent = Regex::compile('\[/tr\](?:\s|<br>)*', Regex::CASE_INSENSITIVE)->replace($parsedContent, '</tr>');
 			
 			return '<div class="container bbcodeTable"><table class="table responsiveTable"><tbody>'.$parsedContent.'</tbody></table></div>';
 		}
@@ -85,5 +85,7 @@ class TableBBCode extends AbstractBBCode {
 			
 			return $content;
 		}
+		
+		return '';
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/bbcode/highlighter/PhpHighlighter.class.php b/wcfsetup/install/files/lib/system/bbcode/highlighter/PhpHighlighter.class.php
index 256d2d5647..4851aefc53 100644
--- a/wcfsetup/install/files/lib/system/bbcode/highlighter/PhpHighlighter.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/highlighter/PhpHighlighter.class.php
@@ -65,6 +65,7 @@ class PhpHighlighter extends Highlighter {
 		// remove breaks
 		$highlightedCode = str_replace("\n", "", $highlightedCode);
 		$highlightedCode = str_replace('<br />', "\n", $highlightedCode);
+		$highlightedCode = str_replace('<br>', "\n", $highlightedCode);
 		
 		// get tabs back
 		$highlightedCode = str_replace('&nbsp;&nbsp;&nbsp;&nbsp;', "\t", $highlightedCode);
diff --git a/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php b/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
index 877c17a2a9..fd07212720 100644
--- a/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
+++ b/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
@@ -228,7 +228,7 @@ class ImportCLICommand implements ICLICommand {
 				$errorMessage = WCF::getLanguage()->getDynamicVariable('wcf.acp.dataImport.configure.database.error', [
 					'exception' => $e
 				]);
-				$errorMessageLines = explode('<br />', $errorMessage);
+				$errorMessageLines = explode('<br>', $errorMessage);
 				foreach ($errorMessageLines as &$line) {
 					$line = StringUtil::stripHTML($line);
 				}
diff --git a/wcfsetup/install/files/lib/system/condition/AbstractCheckboxCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractCheckboxCondition.class.php
index 989a1bdfc6..e584c01d5a 100644
--- a/wcfsetup/install/files/lib/system/condition/AbstractCheckboxCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/AbstractCheckboxCondition.class.php
@@ -56,7 +56,7 @@ abstract class AbstractCheckboxCondition extends AbstractSingleFieldCondition {
 	 * @inheritDoc
 	 */
 	public function getFieldElement() {
-		return '<label><input type="checkbox" name="' . $this->fieldName . '" id="' . $this->fieldName . '"'.($this->fieldValue ? ' checked="checked"' : '').' /> '.WCF::getLanguage()->get($this->label).'</label>';
+		return '<label><input type="checkbox" name="' . $this->fieldName . '" id="' . $this->fieldName . '"'.($this->fieldValue ? ' checked="checked"' : '').'> '.WCF::getLanguage()->get($this->label).'</label>';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/condition/AbstractIntegerCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractIntegerCondition.class.php
index b4859a1203..caf4976ae2 100644
--- a/wcfsetup/install/files/lib/system/condition/AbstractIntegerCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/AbstractIntegerCondition.class.php
@@ -120,8 +120,8 @@ abstract class AbstractIntegerCondition extends AbstractSingleFieldCondition {
 		$lessThanPlaceHolder = WCF::getLanguage()->get('wcf.condition.lessThan');
 		
 		return <<<HTML
-<input type="number" name="greaterThan_{$this->getIdentifier()}" value="{$this->greaterThan}" placeholder="{$greaterThanPlaceHolder}"{$this->getMinMaxAttributes('greaterThan')} class="medium" />
-<input type="number" name="lessThan_{$this->getIdentifier()}" value="{$this->lessThan}" placeholder="{$lessThanPlaceHolder}"{$this->getMinMaxAttributes('lessThan')} class="medium" />
+<input type="number" name="greaterThan_{$this->getIdentifier()}" value="{$this->greaterThan}" placeholder="{$greaterThanPlaceHolder}"{$this->getMinMaxAttributes('greaterThan')} class="medium">
+<input type="number" name="lessThan_{$this->getIdentifier()}" value="{$this->lessThan}" placeholder="{$lessThanPlaceHolder}"{$this->getMinMaxAttributes('lessThan')} class="medium">
 HTML;
 	}
 	
diff --git a/wcfsetup/install/files/lib/system/condition/AbstractTextCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractTextCondition.class.php
index 6da75a4ee9..6db5ed3e09 100644
--- a/wcfsetup/install/files/lib/system/condition/AbstractTextCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/AbstractTextCondition.class.php
@@ -41,7 +41,7 @@ abstract class AbstractTextCondition extends AbstractSingleFieldCondition {
 	 * @inheritDoc
 	 */
 	protected function getFieldElement() {
-		return '<input type="text" name="'.$this->fieldName.'" value="'.StringUtil::encodeHTML($this->fieldValue).'" class="long" />';
+		return '<input type="text" name="'.$this->fieldName.'" value="'.StringUtil::encodeHTML($this->fieldValue).'" class="long">';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php
index bef81c20a2..9a402723b5 100644
--- a/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php
@@ -115,8 +115,8 @@ abstract class AbstractTimestampCondition extends AbstractSingleFieldCondition i
 		$end = WCF::getLanguage()->get('wcf.date.period.end');
 		
 		return <<<HTML
-<input type="date" id="{$this->getPropertyName()}StartTime" name="{$this->getPropertyName()}StartTime" value="{$this->startTime}" placeholder="{$start}" />
-<input type="date" id="{$this->getPropertyName()}EndTime" name="{$this->getPropertyName()}EndTime" value="{$this->endTime}" placeholder="{$end}" />
+<input type="date" id="{$this->getPropertyName()}StartTime" name="{$this->getPropertyName()}StartTime" value="{$this->startTime}" placeholder="{$start}">
+<input type="date" id="{$this->getPropertyName()}EndTime" name="{$this->getPropertyName()}EndTime" value="{$this->endTime}" placeholder="{$end}">
 HTML;
 	}
 	
diff --git a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
index fc8c94a79c..51996d94ea 100644
--- a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
@@ -78,8 +78,8 @@ class TimeCondition extends AbstractMultipleFieldsCondition implements IContentC
 <dl>
 	<dt>{$this->getLabel('time')}</dt>
 	<dd>
-		<input type="datetime" data-ignore-timezone="1" data-time-only="1" id="startTime" name="startTime" value="{$this->startTime}" placeholder="{$start}" />
-		<input type="datetime" data-ignore-timezone="1" data-time-only="1" id="endTime" name="endTime" value="{$this->endTime}" placeholder="{$end}" />
+		<input type="datetime" data-ignore-timezone="1" data-time-only="1" id="startTime" name="startTime" value="{$this->startTime}" placeholder="{$start}">
+		<input type="datetime" data-ignore-timezone="1" data-time-only="1" id="endTime" name="endTime" value="{$this->endTime}" placeholder="{$end}">
 		{$this->getDescriptionElement('time')}
 		{$this->getErrorMessageElement('time')}
 	</dd>
diff --git a/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php
index d60187b2c5..e9e23a4651 100644
--- a/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php
@@ -46,7 +46,7 @@ class UserBirthdayCondition extends AbstractCondition implements IContentConditi
 <dl>
 	<dt></dt>
 	<dd>
-		<label><input type="checkbox" name="birthdayToday" id="birthdayToday"{$checked} /> {$label}</label>
+		<label><input type="checkbox" name="birthdayToday" id="birthdayToday"{$checked}> {$label}</label>
 	</dd>
 </dl>
 HTML;
diff --git a/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php
index 0b27097293..e76af29349 100644
--- a/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php
@@ -145,7 +145,7 @@ HTML;
 		$returnValue = "";
 		foreach ($userGroups as $userGroup) {
 			/** @noinspection PhpVariableVariableInspection */
-			$returnValue .= "<label><input type=\"checkbox\" name=\"".$identifier."[]\" value=\"".$userGroup->groupID."\"".(in_array($userGroup->groupID, $this->$identifier) ? ' checked="checked"' : "")." /> ".$userGroup->getName()."</label>";
+			$returnValue .= "<label><input type=\"checkbox\" name=\"".$identifier."[]\" value=\"".$userGroup->groupID."\"".(in_array($userGroup->groupID, $this->$identifier) ? ' checked="checked"' : "")."> ".$userGroup->getName()."</label>";
 		}
 		
 		return $returnValue;
diff --git a/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php
index 2ea1e516ad..f82953a798 100644
--- a/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php
@@ -74,7 +74,7 @@ class UserLanguageCondition extends AbstractSingleFieldCondition implements ICon
 	protected function getFieldElement() {
 		$returnValue = "";
 		foreach (LanguageFactory::getInstance()->getLanguages() as $language) {
-			$returnValue .= "<label><input type=\"checkbox\" name=\"languageIDs[]\" value=\"".$language->languageID."\"".(in_array($language->languageID, $this->languageIDs) ? ' checked="checked"' : "")." /> ".$language->languageName."</label>";
+			$returnValue .= "<label><input type=\"checkbox\" name=\"languageIDs[]\" value=\"".$language->languageID."\"".(in_array($language->languageID, $this->languageIDs) ? ' checked="checked"' : "")."> ".$language->languageName."</label>";
 		}
 		
 		return $returnValue;
diff --git a/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php
index af3cc7be65..40b794f5b8 100644
--- a/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php
@@ -65,8 +65,8 @@ class UserMobileBrowserCondition extends AbstractSingleFieldCondition implements
 		}
 		
 		return <<<HTML
-<label><input type="checkbox" name="usesMobileBrowser" id="usesMobileBrowser"{$usesMobileBrowserChecked} /> {$usesMobileBrowserLabel}</label>
-<label><input type="checkbox" name="usesNoMobileBrowser" id="usesNoMobileBrowser"{$usesNoMobileBrowserChecked} /> {$usesNoMobileBrowserLabel}</label>
+<label><input type="checkbox" name="usesMobileBrowser" id="usesMobileBrowser"{$usesMobileBrowserChecked}> {$usesMobileBrowserLabel}</label>
+<label><input type="checkbox" name="usesNoMobileBrowser" id="usesNoMobileBrowser"{$usesNoMobileBrowserChecked}> {$usesNoMobileBrowserLabel}</label>
 HTML;
 	}
 	
diff --git a/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php
index a930235e9c..b23b659b66 100644
--- a/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php
@@ -95,8 +95,8 @@ class UserRegistrationDateCondition extends AbstractSingleFieldCondition impleme
 		$end = WCF::getLanguage()->get('wcf.date.period.end');
 		
 		return <<<HTML
-<input type="date" id="registrationDateStart" name="registrationDateStart" value="{$this->registrationDateStart}" placeholder="{$start}" />
-<input type="date" id="registrationDateEnd" name="registrationDateEnd" value="{$this->registrationDateEnd}" placeholder="{$end}" />
+<input type="date" id="registrationDateStart" name="registrationDateStart" value="{$this->registrationDateStart}" placeholder="{$start}">
+<input type="date" id="registrationDateEnd" name="registrationDateEnd" value="{$this->registrationDateEnd}" placeholder="{$end}">
 HTML;
 	}
 	
diff --git a/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php
index f8fa95f130..ee8bd516b5 100644
--- a/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php
@@ -142,10 +142,10 @@ class UserStateCondition extends AbstractSingleFieldCondition implements IConten
 		$userIsEnabled = WCF::getLanguage()->get('wcf.user.condition.state.isEnabled');
 		
 		return <<<HTML
-<label><input type="checkbox" name="userIsBanned" value="1"{$this->getCheckedAttribute('userIsBanned')} /> {$userIsBanned}</label>
-<label><input type="checkbox" name="userIsNotBanned" value="1"{$this->getCheckedAttribute('userIsNotBanned')} /> {$userIsNotBanned}</label>
-<label><input type="checkbox" name="userIsEnabled" value="1"{$this->getCheckedAttribute('userIsEnabled')} /> {$userIsEnabled}</label>
-<label><input type="checkbox" name="userIsDisabled" value="1"{$this->getCheckedAttribute('userIsDisabled')} /> {$userIsDisabled}</label>
+<label><input type="checkbox" name="userIsBanned" value="1"{$this->getCheckedAttribute('userIsBanned')}> {$userIsBanned}</label>
+<label><input type="checkbox" name="userIsNotBanned" value="1"{$this->getCheckedAttribute('userIsNotBanned')}> {$userIsNotBanned}</label>
+<label><input type="checkbox" name="userIsEnabled" value="1"{$this->getCheckedAttribute('userIsEnabled')}> {$userIsEnabled}</label>
+<label><input type="checkbox" name="userIsDisabled" value="1"{$this->getCheckedAttribute('userIsDisabled')}> {$userIsDisabled}</label>
 HTML;
 	}
 	
diff --git a/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php b/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php
index 51ecfce9cc..b32b1d3014 100644
--- a/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php
@@ -49,7 +49,7 @@ class MultiPageCondition extends AbstractMultiSelectCondition implements IConten
 			if (in_array($pageNode->pageID, $this->fieldValue)) {
 				$fieldElement .= ' checked="checked"';
 			}
-			$fieldElement .= ' /> '.$pageNode->name.'</label></li>';
+			$fieldElement .= '> '.$pageNode->name.'</label></li>';
 		}
 		$fieldElement .= "</ul>";
 		
diff --git a/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php
index 1d3f75ecc9..c5d0a28e41 100644
--- a/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php
+++ b/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php
@@ -61,7 +61,7 @@ class MultipleSelectionFormElement extends AbstractNamedFormElement {
 		}
 		
 		return <<<HTML
-<label><input type="checkbox" name="{$formName}{$this->getParent()->getName()}[]" value="{$this->getValue()}"{$disabled} /> {$this->getLabel()}</label>
+<label><input type="checkbox" name="{$formName}{$this->getParent()->getName()}[]" value="{$this->getValue()}"{$disabled}> {$this->getLabel()}</label>
 <small>{$this->getDescription()}</small>
 HTML;
 	}
diff --git a/wcfsetup/install/files/lib/system/form/element/PasswordInputFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/PasswordInputFormElement.class.php
index 2911ae47ad..1d0f255486 100644
--- a/wcfsetup/install/files/lib/system/form/element/PasswordInputFormElement.class.php
+++ b/wcfsetup/install/files/lib/system/form/element/PasswordInputFormElement.class.php
@@ -20,7 +20,7 @@ class PasswordInputFormElement extends AbstractNamedFormElement {
 <dl{$this->getErrorClass()}>
 	<dt><label for="{$this->getName()}">{$this->getLabel()}</label></dt>
 	<dd>
-		<input type="password" id="{$this->getName()}" name="{$formName}{$this->getName()}" value="{$this->getValue()}" class="medium" />
+		<input type="password" id="{$this->getName()}" name="{$formName}{$this->getName()}" value="{$this->getValue()}" class="medium">
 		<small>{$this->getDescription()}</small>
 		{$this->getErrorField()}
 	</dd>
diff --git a/wcfsetup/install/files/lib/system/form/element/SingleSelectionFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/SingleSelectionFormElement.class.php
index 0ef0c26085..0e2091e6d4 100644
--- a/wcfsetup/install/files/lib/system/form/element/SingleSelectionFormElement.class.php
+++ b/wcfsetup/install/files/lib/system/form/element/SingleSelectionFormElement.class.php
@@ -17,7 +17,7 @@ class SingleSelectionFormElement extends AbstractNamedFormElement {
 	 */
 	public function getHTML($formName) {
 		return <<<HTML
-<label><input type="radio" name="{$formName}{$this->getParent()->getName()}" value="{$this->getValue()}" /> {$this->getLabel()}</label>
+<label><input type="radio" name="{$formName}{$this->getParent()->getName()}" value="{$this->getValue()}"> {$this->getLabel()}</label>
 HTML;
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/form/element/TextInputFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/TextInputFormElement.class.php
index 59f7f98f24..44ccc62dc9 100644
--- a/wcfsetup/install/files/lib/system/form/element/TextInputFormElement.class.php
+++ b/wcfsetup/install/files/lib/system/form/element/TextInputFormElement.class.php
@@ -20,7 +20,7 @@ class TextInputFormElement extends AbstractNamedFormElement {
 <dl{$this->getErrorClass()}>
 	<dt><label for="{$this->getName()}">{$this->getLabel()}</label></dt>
 	<dd>
-		<input type="text" id="{$this->getName()}" name="{$formName}{$this->getName()}" value="{$this->getValue()}" class="long" />
+		<input type="text" id="{$this->getName()}" name="{$formName}{$this->getName()}" value="{$this->getValue()}" class="long">
 		<small>{$this->getDescription()}</small>
 		{$this->getErrorField()}
 	</dd>
diff --git a/wcfsetup/install/files/lib/system/option/user/ImageUserOptionOutput.class.php b/wcfsetup/install/files/lib/system/option/user/ImageUserOptionOutput.class.php
index 3de3e68e34..74786b33a6 100644
--- a/wcfsetup/install/files/lib/system/option/user/ImageUserOptionOutput.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/ImageUserOptionOutput.class.php
@@ -21,6 +21,6 @@ class ImageUserOptionOutput implements IUserOptionOutput {
 	public function getOutput(User $user, UserOption $option, $value) {
 		if (empty($value)) return '';
 		
-		return '<img src="'.StringUtil::encodeHTML($value).'" alt="" />';
+		return '<img src="'.StringUtil::encodeHTML($value).'" alt="">';
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/option/user/SelectOptionsUserOptionOutput.class.php b/wcfsetup/install/files/lib/system/option/user/SelectOptionsUserOptionOutput.class.php
index 264f191326..aa8cf2ee02 100644
--- a/wcfsetup/install/files/lib/system/option/user/SelectOptionsUserOptionOutput.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/SelectOptionsUserOptionOutput.class.php
@@ -27,7 +27,7 @@ class SelectOptionsUserOptionOutput implements IUserOptionOutput {
 		else if (is_array($result)) {
 			$output = '';
 			foreach ($result as $resultValue) {
-				if (!empty($output)) $output .= "<br />\n";
+				if (!empty($output)) $output .= "<br>\n";
 				$output .= WCF::getLanguage()->get($resultValue);
 			}
 			
diff --git a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
index 6576eabdc2..07fe5d1c23 100644
--- a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
+++ b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
@@ -62,45 +62,45 @@ class PaypalPaymentMethod extends AbstractPaymentMethod {
 		if ($isRecurring) {
 			// subscribe button
 			return '<form method="post" action="https://www.' . (ENABLE_DEBUG_MODE ? 'sandbox.' : '') . 'paypal.com/cgi-bin/webscr">
-					<input type="hidden" name="a3" value="'.$cost.'" />
-					<input type="hidden" name="p3" value="'.$subscriptionLength.'" />
-					<input type="hidden" name="t3" value="'.$subscriptionLengthUnit.'" />
-					<input type="hidden" name="src" value="1" />
-					<input type="hidden" name="business" value="'.StringUtil::encodeHTML(PAYPAL_EMAIL_ADDRESS).'" />
-					<input type="hidden" name="cancel_return" value="'.StringUtil::encodeHTML($cancelReturnURL).'" />
-					<input type="hidden" name="charset" value="utf-8" />
-					<input type="hidden" name="cmd" value="_xclick-subscriptions" />
-					<input type="hidden" name="currency_code" value="'.$currency.'" />
-					<input type="hidden" name="custom" value="'.StringUtil::encodeHTML($token).'" />
-					<input type="hidden" name="email" value="'.StringUtil::encodeHTML(WCF::getUser()->email).'" />
-					<input type="hidden" name="item_name" value="'.StringUtil::encodeHTML($name).'" />
-					<input type="hidden" name="lc" value="'.strtoupper(WCF::getLanguage()->languageCode).'" />
-					<input type="hidden" name="no_note" value="1" />
-					<input type="hidden" name="no_shipping" value="1" />
-					<input type="hidden" name="notify_url" value="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('PaypalCallback', ['appendSession' => false])).'" />
-					<input type="hidden" name="quantity" value="1" />
-					<input type="hidden" name="return" value="'.StringUtil::encodeHTML($returnURL).'" />
+					<input type="hidden" name="a3" value="'.$cost.'">
+					<input type="hidden" name="p3" value="'.$subscriptionLength.'">
+					<input type="hidden" name="t3" value="'.$subscriptionLengthUnit.'">
+					<input type="hidden" name="src" value="1">
+					<input type="hidden" name="business" value="'.StringUtil::encodeHTML(PAYPAL_EMAIL_ADDRESS).'">
+					<input type="hidden" name="cancel_return" value="'.StringUtil::encodeHTML($cancelReturnURL).'">
+					<input type="hidden" name="charset" value="utf-8">
+					<input type="hidden" name="cmd" value="_xclick-subscriptions">
+					<input type="hidden" name="currency_code" value="'.$currency.'">
+					<input type="hidden" name="custom" value="'.StringUtil::encodeHTML($token).'">
+					<input type="hidden" name="email" value="'.StringUtil::encodeHTML(WCF::getUser()->email).'">
+					<input type="hidden" name="item_name" value="'.StringUtil::encodeHTML($name).'">
+					<input type="hidden" name="lc" value="'.strtoupper(WCF::getLanguage()->languageCode).'">
+					<input type="hidden" name="no_note" value="1">
+					<input type="hidden" name="no_shipping" value="1">
+					<input type="hidden" name="notify_url" value="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('PaypalCallback', ['appendSession' => false])).'">
+					<input type="hidden" name="quantity" value="1">
+					<input type="hidden" name="return" value="'.StringUtil::encodeHTML($returnURL).'">
 			
 					<button class="small" type="submit">'.WCF::getLanguage()->get('wcf.payment.paypal.button.subscribe').'</button>
 				</form>';
 		}
 		else {
 			return '<form method="post" action="https://www.' . (ENABLE_DEBUG_MODE ? 'sandbox.' : '') . 'paypal.com/cgi-bin/webscr">
-					<input type="hidden" name="amount" value="'.$cost.'" />
-					<input type="hidden" name="business" value="'.StringUtil::encodeHTML(PAYPAL_EMAIL_ADDRESS).'" />
-					<input type="hidden" name="cancel_return" value="'.StringUtil::encodeHTML($cancelReturnURL).'" />
-					<input type="hidden" name="charset" value="utf-8" />
-					<input type="hidden" name="cmd" value="_xclick" />
-					<input type="hidden" name="currency_code" value="'.$currency.'" />
-					<input type="hidden" name="custom" value="'.StringUtil::encodeHTML($token).'" />
-					<input type="hidden" name="email" value="'.StringUtil::encodeHTML(WCF::getUser()->email).'" />
-					<input type="hidden" name="item_name" value="'.StringUtil::encodeHTML($name).'" />
-					<input type="hidden" name="lc" value="'.strtoupper(WCF::getLanguage()->languageCode).'" />
-					<input type="hidden" name="no_note" value="1" />
-					<input type="hidden" name="no_shipping" value="1" />
-					<input type="hidden" name="notify_url" value="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('PaypalCallback', ['appendSession' => false])).'" />
-					<input type="hidden" name="quantity" value="1" />
-					<input type="hidden" name="return" value="'.StringUtil::encodeHTML($returnURL).'" />	
+					<input type="hidden" name="amount" value="'.$cost.'">
+					<input type="hidden" name="business" value="'.StringUtil::encodeHTML(PAYPAL_EMAIL_ADDRESS).'">
+					<input type="hidden" name="cancel_return" value="'.StringUtil::encodeHTML($cancelReturnURL).'">
+					<input type="hidden" name="charset" value="utf-8">
+					<input type="hidden" name="cmd" value="_xclick">
+					<input type="hidden" name="currency_code" value="'.$currency.'">
+					<input type="hidden" name="custom" value="'.StringUtil::encodeHTML($token).'">
+					<input type="hidden" name="email" value="'.StringUtil::encodeHTML(WCF::getUser()->email).'">
+					<input type="hidden" name="item_name" value="'.StringUtil::encodeHTML($name).'">
+					<input type="hidden" name="lc" value="'.strtoupper(WCF::getLanguage()->languageCode).'">
+					<input type="hidden" name="no_note" value="1">
+					<input type="hidden" name="no_shipping" value="1">
+					<input type="hidden" name="notify_url" value="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('PaypalCallback', ['appendSession' => false])).'">
+					<input type="hidden" name="quantity" value="1">
+					<input type="hidden" name="return" value="'.StringUtil::encodeHTML($returnURL).'">	
 					
 					<button class="small" type="submit">'.WCF::getLanguage()->get('wcf.payment.paypal.button.purchase').'</button>
 				</form>';
diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index d6d9cf768f..96c7467ff7 100644
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -332,7 +332,7 @@ class SessionHandler extends SingletonFactory {
 		
 		// security token
 		if (!defined('SECURITY_TOKEN')) define('SECURITY_TOKEN', $this->getSecurityToken());
-		if (!defined('SECURITY_TOKEN_INPUT_TAG')) define('SECURITY_TOKEN_INPUT_TAG', '<input type="hidden" name="t" value="'.$this->getSecurityToken().'" />');
+		if (!defined('SECURITY_TOKEN_INPUT_TAG')) define('SECURITY_TOKEN_INPUT_TAG', '<input type="hidden" name="t" value="'.$this->getSecurityToken().'">');
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/setup/Installer.class.php b/wcfsetup/install/files/lib/system/setup/Installer.class.php
index 978b27c368..6e62e6a5e1 100644
--- a/wcfsetup/install/files/lib/system/setup/Installer.class.php
+++ b/wcfsetup/install/files/lib/system/setup/Installer.class.php
@@ -166,7 +166,7 @@ class Installer {
 			}
 		}
 		if (!empty($errors)) {
-			throw new SystemException('error(s) during the installation of the files.', 0, implode("<br />", $errors));
+			throw new SystemException('error(s) during the installation of the files.', 0, implode("<br>", $errors));
 		}
 		
 		$this->logFiles($files);
diff --git a/wcfsetup/install/files/lib/system/style/StyleHandler.class.php b/wcfsetup/install/files/lib/system/style/StyleHandler.class.php
index f7e989d950..c21647223f 100644
--- a/wcfsetup/install/files/lib/system/style/StyleHandler.class.php
+++ b/wcfsetup/install/files/lib/system/style/StyleHandler.class.php
@@ -136,7 +136,7 @@ class StyleHandler extends SingletonFactory {
 			}
 		}
 		
-		return '<link rel="stylesheet" type="text/css" href="'.WCF::getPath().$filename.'?m='.filemtime(WCF_DIR.$filename).'" />';
+		return '<link rel="stylesheet" type="text/css" href="'.WCF::getPath().$filename.'?m='.filemtime(WCF_DIR.$filename).'">';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/template/plugin/HtmlCheckboxesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/HtmlCheckboxesFunctionTemplatePlugin.class.php
index 7a5041b1f7..49ce330dfe 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/HtmlCheckboxesFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/HtmlCheckboxesFunctionTemplatePlugin.class.php
@@ -71,7 +71,7 @@ class HtmlCheckboxesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
 		$html = '';
 		foreach ($tagArgs['options'] as $key => $value) {
 			if (!empty($html)) $html .= $tagArgs['separator'];
-			$html .= '<label><input type="checkbox" name="'.$this->encodeHTML($tagArgs['name']).'[]" value="'.$this->encodeHTML($key).'"'.(in_array($key, $tagArgs['selected']) ? ' checked="checked"' : '').' /> '.$this->encodeHTML($value).'</label>';
+			$html .= '<label><input type="checkbox" name="'.$this->encodeHTML($tagArgs['name']).'[]" value="'.$this->encodeHTML($key).'"'.(in_array($key, $tagArgs['selected']) ? ' checked="checked"' : '').'> '.$this->encodeHTML($value).'</label>';
 		}
 		
 		return $html;
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index ae7bacf2f9..79f2b90254 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -97,13 +97,13 @@
 		<item name="wcf.acp.bbcode.mediaProvider.delete.sure"><![CDATA[Wollen Sie den Medienanbieter <span class="confirmationObject">{$mediaProvider->title}</span> wirklich löschen?]]></item>
 		<item name="wcf.acp.bbcode.mediaProvider.edit"><![CDATA[Medienanbieter bearbeiten]]></item>
 		<item name="wcf.acp.bbcode.mediaProvider.html"><![CDATA[HTML-Code]]></item>
-		<item name="wcf.acp.bbcode.mediaProvider.html.description"><![CDATA[{literal}Geben Sie hier den HTML-Code für das Medium an. Variablen im Format <code>{$variable}</code> werden durch die entsprechend benannte Untergruppe des regulären Ausdrucks ersetzt.<br />
-		Beispiel:<br />
+		<item name="wcf.acp.bbcode.mediaProvider.html.description"><![CDATA[{literal}Geben Sie hier den HTML-Code für das Medium an. Variablen im Format <code>{$variable}</code> werden durch die entsprechend benannte Untergruppe des regulären Ausdrucks ersetzt.<br>
+		Beispiel:<br>
 		<code>{$ID}</code> wird durch die beispielhaften Medium-IDs der Erklärung oberhalb ersetzt.{/literal}]]></item>
 		<item name="wcf.acp.bbcode.mediaProvider.list"><![CDATA[Medienanbieter]]></item>
 		<item name="wcf.acp.bbcode.mediaProvider.regex"><![CDATA[Regulärer Ausdruck]]></item>
-		<item name="wcf.acp.bbcode.mediaProvider.regex.description"><![CDATA[Geben Sie hier das Linkformat als <a href="{@$__wcf->getPath('wcf')}acp/dereferrer.php?url=http%3A%2F%2Fde.wikipedia.org%2Fwiki%2FRegul%25C3%25A4rer_Ausdruck">regulären Ausdruck</a> an.<br />
-		Mehrere Ausdrücke können zeilenweise angegeben werden.<br />
+		<item name="wcf.acp.bbcode.mediaProvider.regex.description"><![CDATA[Geben Sie hier das Linkformat als <a href="{@$__wcf->getPath('wcf')}acp/dereferrer.php?url=http%3A%2F%2Fde.wikipedia.org%2Fwiki%2FRegul%25C3%25A4rer_Ausdruck">regulären Ausdruck</a> an.<br>
+		Mehrere Ausdrücke können zeilenweise angegeben werden.<br>
 		Beispiele für die Medium-ID Erkennungen:
 		<ul>
 			<li><code>(?&lt;ID&gt;[0-9]+)</code> erkennt eine Medium-ID aus Zahlen.</li>
@@ -212,7 +212,7 @@
 		<item name="wcf.acp.dataImport.configure.fileSystem.path"><![CDATA[Pfad zur Installation]]></item>
 		<item name="wcf.acp.dataImport.configure.fileSystem.path.description"><![CDATA[Wird für den Import von Datei-basierten Inhalten (wie z.B. Avatare) benötigt.]]></item>
 		<item name="wcf.acp.dataImport.configure.database.error"><![CDATA[Beim Verbindungsversuch mit der Datenbank ist folgender Fehler aufgetreten:
-		<br /><strong>{$exception->getMessage()}<br />{$exception->getErrorDesc()}</strong>]]></item>
+		<br><strong>{$exception->getMessage()}<br>{$exception->getErrorDesc()}</strong>]]></item>
 		<item name="wcf.acp.dataImport.configure.fileSystem.path.error"><![CDATA[Es wurde keine Installation unter dem angegeben Pfad gefunden.]]></item>
 		<item name="wcf.acp.dataImport.configure.settings"><![CDATA[Einstellungen]]></item>
 		<item name="wcf.acp.dataImport.configure.settings.userMergeMode"><![CDATA[Verhalten bei sich überschneidenden Benutzeraccounts]]></item>
@@ -847,8 +847,8 @@
 		<item name="wcf.acp.option.module_smiley"><![CDATA[Smileys]]></item>
 		<item name="wcf.acp.option.category.message.censorship"><![CDATA[Zensur-Funktion]]></item>
 		<item name="wcf.acp.option.censored_words"><![CDATA[Zu zensierende Wörter]]></item>
-		<item name="wcf.acp.option.censored_words.description"><![CDATA[Ein Wort pro Zeile. Sollte bei der Erstellung einer Nachricht eines dieser Wörter verwendet werden, so wird die Erstellung verweigert.<br />
-<em>Verwenden Sie „*“, um Wortteile zu finden: „wolt*“ findet auch „woltlab“</em><br />
+		<item name="wcf.acp.option.censored_words.description"><![CDATA[Ein Wort pro Zeile. Sollte bei der Erstellung einer Nachricht eines dieser Wörter verwendet werden, so wird die Erstellung verweigert.<br>
+<em>Verwenden Sie „*“, um Wortteile zu finden: „wolt*“ findet auch „woltlab“</em><br>
 <em>Verwenden Sie „~“, um Worttrennungen zu finden: „wolt~“ findet auch „wolt-lab“</em>]]></item>
 		<item name="wcf.acp.option.enable_censorship"><![CDATA[Zensur aktivieren]]></item>
 		<item name="wcf.acp.option.enable_censorship.description"><![CDATA[Aktiviert die Zensur der unten angegebenen Wörter in allen von Benutzern geschriebenen Texten.]]></item>
@@ -975,9 +975,9 @@
 		<item name="wcf.acp.option.footer_code.description"><![CDATA[Der hier angegebene Code wird im Fußbereich jeder Seite ausgegeben. Der Footer-Code eignet sich z.B. sehr gut für die Einbindung von Diensten wie „Google Analytics“ oder „Piwik“.]]></item>
 		<item name="wcf.acp.option.profile_enable_visitors"><![CDATA[Profil-Besucher anzeigen]]></item>
 		<item name="wcf.acp.option.url_title_component_replacement"><![CDATA[URL-Ersetzungen]]></item>
-		<item name="wcf.acp.option.url_title_component_replacement.description"><![CDATA[Sie können den in URLs enthaltenen Titel durch eigene Ersetzungen verändern. Dies kann z.B. zum Ersetzen von Umlauten oder zum Expandieren von Abkürzungen genutzt werden. (Eine Ersetzung pro Zeile)<br />
-Beispiele:<br />
-WBB=WoltLab Burning Board<br />
+		<item name="wcf.acp.option.url_title_component_replacement.description"><![CDATA[Sie können den in URLs enthaltenen Titel durch eigene Ersetzungen verändern. Dies kann z.B. zum Ersetzen von Umlauten oder zum Expandieren von Abkürzungen genutzt werden. (Eine Ersetzung pro Zeile)<br>
+Beispiele:<br>
+WBB=WoltLab Burning Board<br>
 GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.url_controller_replacement"><![CDATA[Controller-Umbenennung]]></item>
 		<item name="wcf.acp.option.url_controller_replacement.description"><![CDATA[Sie können die Controller umbenennen und diesen so eine neue Bezeichnung zuweisen, pro Zeile können Sie einen Alias definieren. Die Angabe muss im Format „realer-name=neuer-name“ erfolgen und darf aus Kompatibilitätsgründen nur aus den Kleinbuchstaben a-z, den Zahlen 0-9 sowie Bindestrichen bestehen. Beispiele:
@@ -1240,7 +1240,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 	
 	<category name="wcf.acp.pluginStore">
 		<item name="wcf.acp.pluginStore.api.error"><![CDATA[Fehler {@$status}: Der Server konnte die Anfrage nicht erfolgreich bearbeiten.]]></item>
-		<item name="wcf.acp.pluginStore.api.noSSL"><![CDATA[Die Abfrage der erworbenen Produkte aus dem Plugin-Store kann nur über eine sichere Verbindung erfolgen.<br /><br />Ihre PHP-Version wurde ohne Unterstützung für OpenSSL kompiliert und kann daher keine sicheren Verbindungen aufbauen, bitte wenden Sie sich an Ihren Anbieter oder System-Administrator um diesen Umstand zu korrigieren.]]></item>
+		<item name="wcf.acp.pluginStore.api.noSSL"><![CDATA[Die Abfrage der erworbenen Produkte aus dem Plugin-Store kann nur über eine sichere Verbindung erfolgen.<br><br>Ihre PHP-Version wurde ohne Unterstützung für OpenSSL kompiliert und kann daher keine sicheren Verbindungen aufbauen, bitte wenden Sie sich an Ihren Anbieter oder System-Administrator um diesen Umstand zu korrigieren.]]></item>
 		<item name="wcf.acp.pluginStore.authorization"><![CDATA[Autorisierung erforderlich]]></item>
 		<item name="wcf.acp.pluginStore.authorization.credentials"><![CDATA[Zugangsdaten]]></item>
 		<item name="wcf.acp.pluginStore.authorization.credentials.description"><![CDATA[Bitte geben Sie Benutzername und Passwort für Ihr WoltLab.com-Benutzerkonto ein.]]></item>
@@ -1257,7 +1257,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.pluginStore.purchasedItems.status.upToDate"><![CDATA[Aktuellste Version bereits installiert]]></item>
 		<item name="wcf.acp.pluginStore.purchasedItems.status.install.confirmMessage"><![CDATA[Möchten Sie das Produkt <span class="confirmationObject">{$product[packageName]}</span> wirklich installieren?]]></item>
 		<item name="wcf.acp.pluginStore.purchasedItems.updateServer.disabled"><![CDATA[Der Paket-Server für „{$wcfMajorRelease}“ („http://store.woltlab.com/{$wcfMajorRelease}/“) ist deaktiviert und steht weder für Neuinstallation noch Updates zur Verfügung.]]></item>
-		<item name="wcf.acp.pluginStore.purchasedItems.updateServer.missing"><![CDATA[Der Paket-Server für „{$wcfMajorRelease}“ ist bei Ihnen nicht eingetragen. Wenn Sie die unten stehenden Pakete installieren möchten, müssen Sie diesen zuvor <a href="{link controller='PackageUpdateServerAdd'}{/link}">hinzufügen</a>.<br />Die Adresse des Servers lautet: „http://store.woltlab.com/{$wcfMajorRelease}/“]]></item>
+		<item name="wcf.acp.pluginStore.purchasedItems.updateServer.missing"><![CDATA[Der Paket-Server für „{$wcfMajorRelease}“ ist bei Ihnen nicht eingetragen. Wenn Sie die unten stehenden Pakete installieren möchten, müssen Sie diesen zuvor <a href="{link controller='PackageUpdateServerAdd'}{/link}">hinzufügen</a>.<br>Die Adresse des Servers lautet: „http://store.woltlab.com/{$wcfMajorRelease}/“]]></item>
 		<item name="wcf.acp.pluginStore.purchasedItems.updateServer.requireUpdate"><![CDATA[Der Paket-Server für „{$wcfMajorRelease}“ („http://store.woltlab.com/{$wcfMajorRelease}/“) wurde noch nicht abgefragt, bitte lassen Sie zuerst nach Updates suchen, um den Server abzufragen.]]></item>
 		<item name="wcf.acp.pluginStore.purchasedItems.wcfMajorRelease"><![CDATA[Paket-Server für „{$wcfMajorRelease}“]]></item>
 	</category>
@@ -1585,7 +1585,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.user.sendMail.all"><![CDATA[E-Mail an alle Benutzer senden]]></item>
 		<item name="wcf.acp.user.sendMail.enableHTML"><![CDATA[E-Mail als HTML versenden]]></item>
 		<item name="wcf.acp.user.sendMail.from"><![CDATA[Absender]]></item>
-		<item name="wcf.acp.user.sendMail.from.description"><![CDATA[Hier können Sie die E-Mail-Adresse des Absenders definieren.<br />
+		<item name="wcf.acp.user.sendMail.from.description"><![CDATA[Hier können Sie die E-Mail-Adresse des Absenders definieren.<br>
 Wenn Sie unter <em>System -&gt; Optionen -&gt; Allgemein -&gt; E-Mails</em> alles ausgefüllt haben, wird dieses Feld automatisch ausgefüllt. Sollten Sie E-Mails per SMTP senden, so achten Sie darauf, dass die E-Mail-Adresse des Absenders auch vom Server akzeptiert werden muss.]]></item>
 		<item name="wcf.acp.user.sendMail.group"><![CDATA[E-Mail an Gruppenmitglieder senden]]></item>
 		<item name="wcf.acp.user.sendMail.groups"><![CDATA[E-Mail an die Mitglieder folgender Benutzergruppen senden]]></item>
@@ -1758,8 +1758,8 @@ Sie können jetzt den vollen Funktionsumfang der Seite nutzen.]]></item>
 		<item name="wcf.attachment.upload.error.reachedLimit"><![CDATA[Sie haben die maximale Anzahl an Dateianhängen erreicht.]]></item>
 		<item name="wcf.attachment.upload.error.reachedRemainingLimit"><![CDATA[Sie haben zu viele Dateianhänge ausgewählt, maximal verbleibend: #remaining#.]]></item>
 		<item name="wcf.attachment.upload.error.uploadFailed"><![CDATA[Beim Hochladen der Datei ist ein unbekannter Fehler aufgetreten.]]></item>
-		<item name="wcf.attachment.upload.limits"><![CDATA[Maximale Anzahl an Dateianhängen: {#$attachmentHandler->getMaxCount()}<br />
-Maximale Dateigröße: {@$attachmentHandler->getMaxSize()|filesize}<br />
+		<item name="wcf.attachment.upload.limits"><![CDATA[Maximale Anzahl an Dateianhängen: {#$attachmentHandler->getMaxCount()}<br>
+Maximale Dateigröße: {@$attachmentHandler->getMaxSize()|filesize}<br>
 Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExtensions()}]]></item>
 		<item name="wcf.attachment.insert"><![CDATA[In Text einfügen]]></item>
 		<item name="wcf.attachment.insertAll"><![CDATA[Alle einfügen]]></item>
@@ -2608,7 +2608,7 @@ Fehler sind beispielsweise:
 		<item name="wcf.search.query.description"><![CDATA[Geben Sie einen oder mehrere Begriffe ein. Ein Begriff muss mindestens vier Zeichen lang sein.]]></item>
 		<item name="wcf.search.results"><![CDATA[Suchergebnisse]]></item>
 		<item name="wcf.search.results.change"><![CDATA[Suche ändern]]></item>
-		<item name="wcf.search.results.description"><![CDATA[Suchergebnisse {#$startIndex}-{#$endIndex} von insgesamt {#$items}{if $query} für „<strong>{$query}</strong>“{/if}.{if $items == 1000} Es gibt noch weitere Suchergebnisse, bitte verfeinern Sie Ihre Suche.{/if}{if $highlight}<br />Diese Suchbegriffe wurden hervorgehoben: <span class="highlight">{$highlight}</span>{/if}]]></item>
+		<item name="wcf.search.results.description"><![CDATA[Suchergebnisse {#$startIndex}-{#$endIndex} von insgesamt {#$items}{if $query} für „<strong>{$query}</strong>“{/if}.{if $items == 1000} Es gibt noch weitere Suchergebnisse, bitte verfeinern Sie Ihre Suche.{/if}{if $highlight}<br>Diese Suchbegriffe wurden hervorgehoben: <span class="highlight">{$highlight}</span>{/if}]]></item>
 		<item name="wcf.search.sortBy"><![CDATA[Sortierung]]></item>
 		<item name="wcf.search.sortBy.relevance"><![CDATA[Relevanz]]></item>
 		<item name="wcf.search.sortBy.time"><![CDATA[Datum]]></item>
@@ -2679,7 +2679,7 @@ Fehler sind beispielsweise:
 		<item name="wcf.user.option.error.validationFailed"><![CDATA[Sie haben einen ungültigen Inhalt eingegeben.]]></item>
 		<item name="wcf.user.option.error.birthdayTooYoung"><![CDATA[Sie sind zu jung. Für eine Anmeldung auf dieser Seite müssen Sie mindestens {#REGISTER_MIN_USER_AGE} Jahre alt sein.]]></item>
 		<item name="wcf.user.option.error.censoredWordsFound"><![CDATA[Ihr Text enthält folgende zensierte Wörter: {implode from=$censoredWords key=censoredWord item=number}{$censoredWord}{if $number > 1} ({#$number}×){/if}{/implode}]]></item>
-		<item name="wcf.user.error.isBanned"><![CDATA[Ihr Benutzeraccount wurde{if $__wcf->user->banExpires != 0} bis zum {@$__wcf->user->banExpires|plainTime}{/if} gesperrt{if $__wcf->user->banReason}: {@$__wcf->user->banReason|htmlspecialchars|nl2br}{else}.{/if}]]></item>
+		<item name="wcf.user.error.isBanned"><![CDATA[Ihr Benutzeraccount wurde{if $__wcf->user->banExpires != 0} bis zum {@$__wcf->user->banExpires|plainTime}{/if} gesperrt{if $__wcf->user->banReason}: {@$__wcf->user->banReason|newlineToBreak}{else}.{/if}]]></item>
 		<item name="wcf.user.access.everyone"><![CDATA[Jeder]]></item>
 		<item name="wcf.user.access.following"><![CDATA[Benutzer, denen ich folge]]></item>
 		<item name="wcf.user.access.nobody"><![CDATA[Keiner]]></item>
@@ -2886,9 +2886,9 @@ Wenn Sie Probleme mit der Aktivierung haben, wenden Sie sich bitte an den Admini
 	<category name="wcf.user.register">
 		<item name="wcf.user.register"><![CDATA[Registrierung]]></item>
 		<item name="wcf.user.register.needActivation.mail.subject"><![CDATA[Aktivierung der Registrierung auf der Website: {@PAGE_TITLE|language}]]></item>
-		<item name="wcf.user.register.needActivation"><![CDATA[Vielen Dank für die Registrierung, {$user->username}.<br />
+		<item name="wcf.user.register.needActivation"><![CDATA[Vielen Dank für die Registrierung, {$user->username}.<br>
 Wir haben Ihnen eine E-Mail an {$user->email} geschickt. Die E-Mail enthält einen Link, den Sie einmalig aufrufen müssen, um die Gültigkeit Ihrer E-Mail-Adresse zu bestätigen und damit Ihre Registrierung abzuschließen.]]></item>
-		<item name="wcf.user.register.awaitActivation"><![CDATA[Vielen Dank für die Registrierung, {$user->username}. Ihre Benutzerdaten werden in Kürze von einem Administrator geprüft.<br />
+		<item name="wcf.user.register.awaitActivation"><![CDATA[Vielen Dank für die Registrierung, {$user->username}. Ihre Benutzerdaten werden in Kürze von einem Administrator geprüft.<br>
 Sobald Ihr Benutzerkonto freigeschaltet ist, werden Sie per E-Mail darüber in Kenntnis gesetzt.]]></item>
 		<item name="wcf.user.register.notification.mail"><![CDATA[Hallo Administrator,
 		
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 9fae0282f8..1efe846d9b 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -97,12 +97,12 @@
 		<item name="wcf.acp.bbcode.mediaProvider.delete.sure"><![CDATA[Do you really want to delete the media provider <span class="confirmationObject">{$mediaProvider->title}</span>?]]></item>
 		<item name="wcf.acp.bbcode.mediaProvider.edit"><![CDATA[Edit Media Provider]]></item>
 		<item name="wcf.acp.bbcode.mediaProvider.html"><![CDATA[HTML Code]]></item>
-		<item name="wcf.acp.bbcode.mediaProvider.html.description"><![CDATA[{literal}Enter the media’s HTML code. Variables are recognized as {$variable} and will be replaced with the regular expression’s matching named group.<br />
-Example:<br />
+		<item name="wcf.acp.bbcode.mediaProvider.html.description"><![CDATA[{literal}Enter the media’s HTML code. Variables are recognized as {$variable} and will be replaced with the regular expression’s matching named group.<br>
+Example:<br>
 <code>{$ID}</code> will be replaced with the medium ID as shown above.{/literal}]]></item>
 		<item name="wcf.acp.bbcode.mediaProvider.list"><![CDATA[Media Providers]]></item>
 		<item name="wcf.acp.bbcode.mediaProvider.regex"><![CDATA[Regular Expression]]></item>
-		<item name="wcf.acp.bbcode.mediaProvider.regex.description"><![CDATA[Provide the link format as a <a href="{@$__wcf->getPath()}acp/dereferrer.php?url=http%3A%2F%2Fen.wikipedia.org%2Fwiki%2FRegular_expression">regular expression</a>. One expression per line.<br />
+		<item name="wcf.acp.bbcode.mediaProvider.regex.description"><![CDATA[Provide the link format as a <a href="{@$__wcf->getPath()}acp/dereferrer.php?url=http%3A%2F%2Fen.wikipedia.org%2Fwiki%2FRegular_expression">regular expression</a>. One expression per line.<br>
 Examples for medium ID detection:
 <ul>
 	<li><code>(?&lt;ID&gt;[0-9]+)</code> detects a numeric ID.</li>
@@ -211,7 +211,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.dataImport.configure.fileSystem.path"><![CDATA[Installation Path]]></item>
 		<item name="wcf.acp.dataImport.configure.fileSystem.path.description"><![CDATA[Required if file-based data (e.g. avatars or attachments) should be imported.]]></item>
 		<item name="wcf.acp.dataImport.configure.database.error"><![CDATA[An error occurred while trying to access the database:
-		<br /><strong>{$exception->getMessage()}<br />{$exception->getErrorDesc()}</strong>]]></item>
+		<br><strong>{$exception->getMessage()}<br>{$exception->getErrorDesc()}</strong>]]></item>
 		<item name="wcf.acp.dataImport.configure.fileSystem.path.error"><![CDATA[Unable to find a valid installation with the given path.]]></item>
 		<item name="wcf.acp.dataImport.configure.settings"><![CDATA[Settings]]></item>
 		<item name="wcf.acp.dataImport.configure.settings.userMergeMode"><![CDATA[Behavior for colliding user accounts]]></item>
@@ -848,8 +848,8 @@ Examples for medium ID detection:
 		<item name="wcf.acp.option.module_smiley"><![CDATA[Smilies]]></item>
 		<item name="wcf.acp.option.category.message.censorship"><![CDATA[Censorship]]></item>
 		<item name="wcf.acp.option.censored_words"><![CDATA[Censored Words]]></item>
-		<item name="wcf.acp.option.censored_words.description"><![CDATA[One word per Line. Using at least one of these words within a message causes an immediate rejection.<br />
-<em>Use “*” to match parts: “wolt*” matches “woltlab”</em><br />
+		<item name="wcf.acp.option.censored_words.description"><![CDATA[One word per Line. Using at least one of these words within a message causes an immediate rejection.<br>
+<em>Use “*” to match parts: “wolt*” matches “woltlab”</em><br>
 <em>Use “~” to find splitted parts: “wolt~” matches “wolt-lab”</em>]]></item>
 		<item name="wcf.acp.option.enable_censorship"><![CDATA[Enable censorship]]></item>
 		<item name="wcf.acp.option.enable_censorship.description"><![CDATA[Enables censorship for all messages containing the words below.]]></item>
@@ -983,9 +983,9 @@ Examples for medium ID detection:
 		<item name="wcf.acp.option.footer_code.description"><![CDATA[The entered code will be appended to the page footer of your site. You can use it to embed services like “Google Analytics” or “Piwik”.]]></item>
 		<item name="wcf.acp.option.profile_enable_visitors"><![CDATA[Display user’s profile visitors in profile sidebar]]></item>
 		<item name="wcf.acp.option.url_title_component_replacement"><![CDATA[URL Replacements]]></item>
-		<item name="wcf.acp.option.url_title_component_replacement.description"><![CDATA[You may replace parts of the title within the URL. You could use it to replace special characters or to expand abbreviations. (One replacement per line)<br />
-Examples:<br />
-WBB=WoltLab Burning Board<br />
+		<item name="wcf.acp.option.url_title_component_replacement.description"><![CDATA[You may replace parts of the title within the URL. You could use it to replace special characters or to expand abbreviations. (One replacement per line)<br>
+Examples:<br>
+WBB=WoltLab Burning Board<br>
 GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.url_controller_replacement"><![CDATA[Controller Aliasing]]></item>
 		<item name="wcf.acp.option.url_controller_replacement.description"><![CDATA[You can rename controllers by assigning an alias to them, please provide only one alias per line. Aliases must be defined as “real-name=custom-name” and contain only lower-case a-z, the numbers 0-9 and the dash for compatibility reasons. Examples:
@@ -1247,7 +1247,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 	
 	<category name="wcf.acp.pluginStore">
 		<item name="wcf.acp.pluginStore.api.error"><![CDATA[Error {@$status}: The server was unable to process your request.]]></item>
-		<item name="wcf.acp.pluginStore.api.noSSL"><![CDATA[Querying the Plugin-Store to fetch the purchased products requires a secure connection.<br /><br />Your PHP version has been compiled without OpenSSL support required to establish secure connections, please contact your hosting company or system-administrator to resolve this shortcoming.]]></item>
+		<item name="wcf.acp.pluginStore.api.noSSL"><![CDATA[Querying the Plugin-Store to fetch the purchased products requires a secure connection.<br><br>Your PHP version has been compiled without OpenSSL support required to establish secure connections, please contact your hosting company or system-administrator to resolve this shortcoming.]]></item>
 		<item name="wcf.acp.pluginStore.authorization"><![CDATA[Authorization Required]]></item>
 		<item name="wcf.acp.pluginStore.authorization.credentials"><![CDATA[Credentials]]></item>
 		<item name="wcf.acp.pluginStore.authorization.credentials.description"><![CDATA[Please enter your WoltLab.com username and password.]]></item>
@@ -1264,7 +1264,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.pluginStore.purchasedItems.status.requireUpdate"><![CDATA[Update-Server must be updated]]></item>
 		<item name="wcf.acp.pluginStore.purchasedItems.status.install.confirmMessage"><![CDATA[Do you really want to install the product <span class="confirmationObject">{$product[packageName]}</span>?]]></item>
 		<item name="wcf.acp.pluginStore.purchasedItems.updateServer.disabled"><![CDATA[The Update-Server for “{$wcfMajorRelease}” (“http://store.woltlab.com/{$wcfMajorRelease}/”) is disabled and cannot be used for new installs or updates.]]></item>
-		<item name="wcf.acp.pluginStore.purchasedItems.updateServer.missing"><![CDATA[The Update-Server for “{$wcfMajorRelease}” does not exist in your installation. If you wish to install the packages below, you must <a href="{link controller='PackageUpdateServerAdd'}{/link}">add it</a>.<br />The server address is: “http://store.woltlab.com/{$wcfMajorRelease}/”]]></item>
+		<item name="wcf.acp.pluginStore.purchasedItems.updateServer.missing"><![CDATA[The Update-Server for “{$wcfMajorRelease}” does not exist in your installation. If you wish to install the packages below, you must <a href="{link controller='PackageUpdateServerAdd'}{/link}">add it</a>.<br>The server address is: “http://store.woltlab.com/{$wcfMajorRelease}/”]]></item>
 		<item name="wcf.acp.pluginStore.purchasedItems.updateServer.requireUpdate"><![CDATA[The Update-Server for “{$wcfMajorRelease}” has not been queried yet, please search for updates to fetch the package list.]]></item>
 		<item name="wcf.acp.pluginStore.purchasedItems.wcfMajorRelease"><![CDATA[Update-Server for “{$wcfMajorRelease}”]]></item>
 	</category>
@@ -1592,7 +1592,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.user.sendMail.all"><![CDATA[Send email to all users]]></item>
 		<item name="wcf.acp.user.sendMail.enableHTML"><![CDATA[Enable HTML code in email message]]></item>
 		<item name="wcf.acp.user.sendMail.from"><![CDATA[Sender’s Email]]></item>
-		<item name="wcf.acp.user.sendMail.from.description"><![CDATA[Specify the sender’s email address.<br />
+		<item name="wcf.acp.user.sendMail.from.description"><![CDATA[Specify the sender’s email address.<br>
 You can define the default sender in <em>System -&gt; Options -&gt; General -&gt; Emails</em>. The sender’s email must be known to the server if using SMTP, otherwise it would be rejected.]]></item>
 		<item name="wcf.acp.user.sendMail.group"><![CDATA[Email to user group]]></item>
 		<item name="wcf.acp.user.sendMail.groups"><![CDATA[Send email to members of the following user groups]]></item>
@@ -1765,8 +1765,8 @@ You can now fully access the website.]]></item>
 		<item name="wcf.attachment.upload.error.reachedLimit"><![CDATA[You have reached the maximum number of attachments.]]></item>
 		<item name="wcf.attachment.upload.error.reachedRemainingLimit"><![CDATA[You have chosen too many attachments, remaining: #remaining#.]]></item>
 		<item name="wcf.attachment.upload.error.uploadFailed"><![CDATA[An unknown error occurred during upload.]]></item>
-		<item name="wcf.attachment.upload.limits"><![CDATA[Maximum number of attachments: {#$attachmentHandler->getMaxCount()}<br />
-Maximum file size: {@$attachmentHandler->getMaxSize()|filesize}<br />
+		<item name="wcf.attachment.upload.limits"><![CDATA[Maximum number of attachments: {#$attachmentHandler->getMaxCount()}<br>
+Maximum file size: {@$attachmentHandler->getMaxSize()|filesize}<br>
 Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensions()}]]></item>
 		<item name="wcf.attachment.insert"><![CDATA[Insert into message]]></item>
 		<item name="wcf.attachment.insertAll"><![CDATA[Insert All]]></item>
@@ -2645,7 +2645,7 @@ Errors are:
 		<item name="wcf.search.query.description"><![CDATA[Type in one or more search terms, each must be at least 4 characters.]]></item>
 		<item name="wcf.search.results"><![CDATA[Search Results]]></item>
 		<item name="wcf.search.results.change"><![CDATA[Change Search]]></item>
-		<item name="wcf.search.results.description"><![CDATA[Search results {#$startIndex}-{#$endIndex} of {#$items}{if $query} for “<strong>{$query}</strong>”{/if}.{if $items == 1000} There are more results available, please enhance your search parameters.{/if}{if $highlight}<br />These terms were highlighted: <span class="highlight">{$highlight}</span>{/if}]]></item>
+		<item name="wcf.search.results.description"><![CDATA[Search results {#$startIndex}-{#$endIndex} of {#$items}{if $query} for “<strong>{$query}</strong>”{/if}.{if $items == 1000} There are more results available, please enhance your search parameters.{/if}{if $highlight}<br>These terms were highlighted: <span class="highlight">{$highlight}</span>{/if}]]></item>
 		<item name="wcf.search.sortBy"><![CDATA[Sort by]]></item>
 		<item name="wcf.search.sortBy.relevance"><![CDATA[Relevance]]></item>
 		<item name="wcf.search.sortBy.time"><![CDATA[Time]]></item>
@@ -2716,7 +2716,7 @@ Errors are:
 		<item name="wcf.user.option.error.validationFailed"><![CDATA[Entered text is invalid.]]></item>
 		<item name="wcf.user.option.error.birthdayTooYoung"><![CDATA[You’re not old enough. To register with this website you must be at least {#REGISTER_MIN_USER_AGE} years old.]]></item>
 		<item name="wcf.user.option.error.censoredWordsFound"><![CDATA[Text contains censored words: {implode from=$censoredWords key=censoredWord item=number}{$censoredWord}{if $number > 1} ({#$number}×){/if}{/implode}]]></item>
-		<item name="wcf.user.error.isBanned"><![CDATA[Your user account has been banned{if $__wcf->user->banExpires != 0} until {@$__wcf->user->banExpires|plainTime}{/if}{if $__wcf->user->banReason}: {@$__wcf->user->banReason|htmlspecialchars|nl2br}{else}.{/if}]]></item>
+		<item name="wcf.user.error.isBanned"><![CDATA[Your user account has been banned{if $__wcf->user->banExpires != 0} until {@$__wcf->user->banExpires|plainTime}{/if}{if $__wcf->user->banReason}: {@$__wcf->user->banReason|newlineToBreak}{else}.{/if}]]></item>
 		<item name="wcf.user.access.everyone"><![CDATA[Everyone]]></item>
 		<item name="wcf.user.access.following"><![CDATA[Users I’m following]]></item>
 		<item name="wcf.user.access.nobody"><![CDATA[Nobody]]></item>
@@ -2920,10 +2920,10 @@ If you cannot activate your email address or have any troubles following the ins
 	<category name="wcf.user.register">
 		<item name="wcf.user.register"><![CDATA[Registration]]></item>
 		<item name="wcf.user.register.needActivation.mail.subject"><![CDATA[Activate Your Registration for Website: {@PAGE_TITLE|language}]]></item>
-		<item name="wcf.user.register.needActivation"><![CDATA[Thank you for registering, {$user->username}.<br />
+		<item name="wcf.user.register.needActivation"><![CDATA[Thank you for registering, {$user->username}.<br>
 An email was sent to “{$user->email}” containing a one-time link to verify your account and ultimately completing your registration.]]></item>
-		<item name="wcf.user.register.awaitActivation"><![CDATA[Thank you for registering, {$user->username}.<br />
-Your account is awaiting approval from an administrator.<br />
+		<item name="wcf.user.register.awaitActivation"><![CDATA[Thank you for registering, {$user->username}.<br>
+Your account is awaiting approval from an administrator.<br>
 A notification will be sent once your account has been approved.]]></item>
 		<item name="wcf.user.register.notification.mail"><![CDATA[Dear Administrator,
 
@@ -2935,7 +2935,7 @@ Open the link below to access the user profile:
 {link controller='User' object=$user isEmail=true}{/link} ]]></item>
 		<item name="wcf.user.register.notification.mail.subject"><![CDATA[New Registration with Your Website: {@PAGE_TITLE|language}]]></item>
 		<item name="wcf.user.register.error.disabled"><![CDATA[Registration is currently disabled.]]></item>
-		<item name="wcf.user.register.success"><![CDATA[Thank you for registering, {$user->username}.<br />
+		<item name="wcf.user.register.success"><![CDATA[Thank you for registering, {$user->username}.<br>
 Your registration is now completed.]]></item>
 		<item name="wcf.user.register.needActivation.mail"><![CDATA[Dear {@$user->username},
 
diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml
index b96b31f253..183f956358 100644
--- a/wcfsetup/setup/lang/setup_de.xml
+++ b/wcfsetup/setup/lang/setup_de.xml
@@ -8,7 +8,7 @@
 		<item name="wcf.global.button.next"><![CDATA[Weiter »]]></item>
 		<item name="wcf.global.progressBar"><![CDATA[{@$progress}% fertiggestellt]]></item>
 		<item name="wcf.global.welcome"><![CDATA[Vielen Dank, dass Sie sich für {$setupPackageName} entschieden haben!]]></item>
-		<item name="wcf.global.welcome.description"><![CDATA[Dieser Installationsassistent hilft Ihnen bei der Einrichtung von <br /><b>WoltLab Community Framework</b>{if $setupPackageName != 'WoltLab Community Framework'} und von <b>{$setupPackageName}</b>{/if}.]]></item>
+		<item name="wcf.global.welcome.description"><![CDATA[Dieser Installationsassistent hilft Ihnen bei der Einrichtung von <br><b>WoltLab Community Framework</b>{if $setupPackageName != 'WoltLab Community Framework'} und von <b>{$setupPackageName}</b>{/if}.]]></item>
 		<item name="wcf.global.welcome.language"><![CDATA[Sprache]]></item>
 		<item name="wcf.global.welcome.language.description"><![CDATA[Die Sprache dieses Assistenten ist zurzeit {@$languageChooser}]]></item>
 		<item name="wcf.global.welcome.language.change"><![CDATA[Sprache wechseln]]></item>
@@ -51,8 +51,8 @@
 		<item name="wcf.global.configureDB.number"><![CDATA[Installationsnummer]]></item>
 		<item name="wcf.global.configureDB.number.description"><![CDATA[Die Installationsnummer erlaubt Ihnen mehrere Installationen der Software in der gleichen Datenbank zu speichern. Wenn dies Ihre erste Installation der Software in dieser Datenbank ist, sollten Sie hier den Wert <em>1</em> wählen.]]></item>
 		<item name="wcf.global.configureDB.error"><![CDATA[Beim Verbindungsversuch mit der Datenbank ist folgender Fehler aufgetreten:
-		<br /><strong>{$exception->getMessage()}{if $exception->getPrevious()}<br />{$exception->getPrevious()->getMessage()}{/if}</strong>]]></item>
-		<item name="wcf.global.configureDB.conflictedTables"><![CDATA[Folgende Tabelle{if $conflictedTables|count > 1}n{/if} existier{if $conflictedTables|count > 1}en{else}t{/if} schon in der Datenbank „{$dbName}“:<br />{implode from=$conflictedTables item="table"}{$table}{/implode}.<br /><br />Um dieses Problem zu beheben, können Sie:<br />1. diese Tabelle{if $conflictedTables|count > 1}n{/if} manuell löschen und die „Weiter“ Schaltfläche betätigen, oder<br />2. Sie geben die Daten einer anderen Datenbank ein und betätigen die „Weiter“ Schaltfläche, oder<br />3. Sie geben eine von „{$dbNumber}“ unterschiedliche Installationsnummer an und betätigen die „Weiter“ Schaltfläche.]]></item>
+		<br><strong>{$exception->getMessage()}{if $exception->getPrevious()}<br>{$exception->getPrevious()->getMessage()}{/if}</strong>]]></item>
+		<item name="wcf.global.configureDB.conflictedTables"><![CDATA[Folgende Tabelle{if $conflictedTables|count > 1}n{/if} existier{if $conflictedTables|count > 1}en{else}t{/if} schon in der Datenbank „{$dbName}“:<br>{implode from=$conflictedTables item="table"}{$table}{/implode}.<br><br>Um dieses Problem zu beheben, können Sie:<br>1. diese Tabelle{if $conflictedTables|count > 1}n{/if} manuell löschen und die „Weiter“ Schaltfläche betätigen, oder<br>2. Sie geben die Daten einer anderen Datenbank ein und betätigen die „Weiter“ Schaltfläche, oder<br>3. Sie geben eine von „{$dbNumber}“ unterschiedliche Installationsnummer an und betätigen die „Weiter“ Schaltfläche.]]></item>
 		<item name="wcf.global.createUser"><![CDATA[Administrator erstellen]]></item>
 		<item name="wcf.global.createUser.description"><![CDATA[Der Installationsassistent erstellt nun ein Administrator-Konto für Sie. Bitte geben Sie dazu einen Benutzernamen, eine E-Mail-Adresse und ein Kennwort ein.]]></item>
 		<item name="wcf.global.createUser.username"><![CDATA[Benutzername]]></item>
@@ -67,7 +67,7 @@
 		<item name="wcf.global.createUser.error.confirmEmail.notEqual"><![CDATA[Die eingegebenen E-Mail-Adressen sind nicht identisch. Bitte tragen Sie zur Sicherheit in beide Eingabefelder die selbe E-Mail-Adresse ein.]]></item>
 		<item name="wcf.global.createUser.error.confirmPassword.notEqual"><![CDATA[Die eingegebenen Kennwörter sind nicht identisch. Bitte tragen Sie zur Sicherheit in beide Eingabefelder das selbe Kennwort ein.]]></item>
 		<item name="wcf.global.wcfDir.error"><![CDATA[Beim Versuch die Dateien zu entpacken, ist folgender Fehler aufgetreten:
-		<br /><strong>{$exception->getMessage()}</strong><br />
+		<br><strong>{$exception->getMessage()}</strong><br>
 		Bitte kontrollieren Sie, ob das Zielverzeichnis existiert und beschreibbar ist.]]></item>
 		<item name="wcf.global.applicationDirectory"><![CDATA[Installationsverzeichnisse]]></item>
 		<item name="wcf.global.applicationDirectory.description"><![CDATA[Geben Sie die Verzeichnisse an, die für die Installation der aufgeführten Anwendungen verwendet werden sollen. Die Eingabe der Verzeichnisse erfolgt relativ zum Hauptverzeichnis der Website („{$documentRoot}“).]]></item>
diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index 0856712e15..c27e0e4b18 100644
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -8,7 +8,7 @@
 		<item name="wcf.global.button.next"><![CDATA[Next »]]></item>
 		<item name="wcf.global.progressBar"><![CDATA[{@$progress}% complete]]></item>
 		<item name="wcf.global.welcome"><![CDATA[Thank you for choosing {$setupPackageName}!]]></item>
-		<item name="wcf.global.welcome.description"><![CDATA[This installer will help you to install <br /><b>WoltLab Community Framework</b>{if $setupPackageName != 'WoltLab Community Framework'} and <b>{$setupPackageName}</b>{/if}.]]></item>
+		<item name="wcf.global.welcome.description"><![CDATA[This installer will help you to install <br><b>WoltLab Community Framework</b>{if $setupPackageName != 'WoltLab Community Framework'} and <b>{$setupPackageName}</b>{/if}.]]></item>
 		<item name="wcf.global.welcome.language"><![CDATA[Language]]></item>
 		<item name="wcf.global.welcome.language.description"><![CDATA[The installer language is currently set to {@$languageChooser}]]></item>
 		<item name="wcf.global.welcome.language.change"><![CDATA[Change Language]]></item>
@@ -51,8 +51,8 @@
 		<item name="wcf.global.configureDB.number"><![CDATA[Installation Number]]></item>
 		<item name="wcf.global.configureDB.number.description"><![CDATA[The installation number allows you to install multiple installations of this software into the same database. If this is your first installation in this database, you should enter <em>1</em>.]]></item>	
 		<item name="wcf.global.configureDB.error"><![CDATA[An error has occurred while trying to connect to your database:
-		<br /><strong>{$exception->getMessage()}{if $exception->getPrevious()}<br />{$exception->getPrevious()->getMessage()}{/if}</strong>]]></item>
-		<item name="wcf.global.configureDB.conflictedTables"><![CDATA[The following table{if $conflictedTables|count > 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your “{$dbName}” Database:<br />{implode from=$conflictedTables item="table"}{$table}{/implode}.<br /><br />To solve this problem, please do one of the following:<br />1. Remove the table{if $conflictedTables|count > 1}s{/if} manually and continue the installation with the “Next” button or<br />2. You re-enter the database access information, but to a different database and continue the installation with the “Next” button or<br />3. Enter a new installation number, not forgetting to continue the installation with the “Next” Button.]]></item>
+		<br><strong>{$exception->getMessage()}{if $exception->getPrevious()}<br>{$exception->getPrevious()->getMessage()}{/if}</strong>]]></item>
+		<item name="wcf.global.configureDB.conflictedTables"><![CDATA[The following table{if $conflictedTables|count > 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your “{$dbName}” Database:<br>{implode from=$conflictedTables item="table"}{$table}{/implode}.<br><br>To solve this problem, please do one of the following:<br>1. Remove the table{if $conflictedTables|count > 1}s{/if} manually and continue the installation with the “Next” button or<br>2. You re-enter the database access information, but to a different database and continue the installation with the “Next” button or<br>3. Enter a new installation number, not forgetting to continue the installation with the “Next” Button.]]></item>
 		<item name="wcf.global.createUser"><![CDATA[Create an Administrator]]></item>
 		<item name="wcf.global.createUser.description"><![CDATA[The installation will now generate an administrator account for you. Please provide username, email address and password.]]></item>
 		<item name="wcf.global.createUser.username"><![CDATA[Username]]></item>
@@ -67,7 +67,7 @@
 		<item name="wcf.global.createUser.error.confirmEmail.notEqual"><![CDATA[The email addresses you have given are not identical. For security reasons, please make sure that both email address fields have been filled in and are identical.]]></item>
 		<item name="wcf.global.createUser.error.confirmPassword.notEqual"><![CDATA[The passwords you have given are not identical. For security reasons, please make sure that both password fields have been filled in and are identical.]]></item>
 		<item name="wcf.global.wcfDir.error"><![CDATA[An Error has accured while extracting the required files:
-		<br /><strong>{$exception->getMessage()}</strong><br />
+		<br><strong>{$exception->getMessage()}</strong><br>
 		Please make sure that the destination folder exists and can be written to.]]></item>
 		<item name="wcf.global.applicationDirectory"><![CDATA[Configure Directories]]></item>
 		<item name="wcf.global.applicationDirectory.description"><![CDATA[Set up the installation directories for each application. Directories are evaluated relative to the website’s document root (“{$documentRoot}”).]]></item>
diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl
index 565e3d495f..628c692d00 100644
--- a/wcfsetup/setup/template/header.tpl
+++ b/wcfsetup/setup/template/header.tpl
@@ -3,9 +3,9 @@
 <head>
 	<title>{lang}wcf.global.progressBar{/lang} - {lang}wcf.global.title{/lang}</title>
 	
-	<meta charset="utf-8" />
+	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="stylesheet" type="text/css" media="screen" href="{if $lastStep|isset}{@RELATIVE_WCF_DIR}acp/style/setup/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showCSS={/if}WCFSetup.css" />
+	<link rel="stylesheet" type="text/css" media="screen" href="{if $lastStep|isset}{@RELATIVE_WCF_DIR}acp/style/setup/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showCSS={/if}WCFSetup.css">
 	
 	{if !$lastStep|isset}
 		<style type="text/css">
@@ -32,7 +32,7 @@
 				<div>
 					<div class="layoutBoundary">
 						<div id="pageHeaderLogo" class="pageHeaderLogo">
-							<img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}acp/images/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showImage={/if}wcfLogo.png" alt="" style="height: 40px; width: 288px;" />
+							<img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}acp/images/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showImage={/if}wcfLogo.png" alt="" style="height: 40px; width: 288px;">
 						</div>
 					</div>
 				</div>
diff --git a/wcfsetup/setup/template/stepConfigureDB.tpl b/wcfsetup/setup/template/stepConfigureDB.tpl
index 42f464ecca..a413703a2f 100644
--- a/wcfsetup/setup/template/stepConfigureDB.tpl
+++ b/wcfsetup/setup/template/stepConfigureDB.tpl
@@ -17,23 +17,23 @@
 	
 		<dl>
 			<dt><label for="dbHost">{lang}wcf.global.configureDB.host{/lang}</label></dt>
-			<dd><input type="text" id="dbHost" name="dbHost" value="{$dbHost}" required="required" class="long" /></dd>
+			<dd><input type="text" id="dbHost" name="dbHost" value="{$dbHost}" required="required" class="long"></dd>
 		</dl>
 		
 		<dl>
 			<dt><label for="dbUser">{lang}wcf.global.configureDB.user{/lang}</label></dt>
-			<dd><input type="text" id="dbUser" name="dbUser" value="{$dbUser}" required="required" class="medium" /></dd>
+			<dd><input type="text" id="dbUser" name="dbUser" value="{$dbUser}" required="required" class="medium"></dd>
 		</dl>
 		
 		<dl>
 			<dt><label for="dbPassword">{lang}wcf.global.configureDB.password{/lang}</label></dt>
-			<dd><input type="password" id="dbPassword" name="dbPassword" value="{$dbPassword}" class="medium" /></dd>
+			<dd><input type="password" id="dbPassword" name="dbPassword" value="{$dbPassword}" class="medium"></dd>
 		</dl>
 		
 		<dl>
 			<dt><label for="dbName">{lang}wcf.global.configureDB.database{/lang}</label></dt>
 			<dd>
-				<input type="text" id="dbName" name="dbName" value="{$dbName}" required="required" class="medium" />
+				<input type="text" id="dbName" name="dbName" value="{$dbName}" required="required" class="medium">
 				<small>{lang}wcf.global.configureDB.database.description{/lang}</small>
 			</dd>
 		</dl>
@@ -41,24 +41,24 @@
 		<dl>
 			<dt><label for="dbNumber">{lang}wcf.global.configureDB.number{/lang}</label></dt>
 			<dd>
-				<input type="number" id="dbNumber" name="dbNumber" value="{$dbNumber}" required="required" min="1" class="short" />
+				<input type="number" id="dbNumber" name="dbNumber" value="{$dbNumber}" required="required" min="1" class="short">
 				<small>{lang}wcf.global.configureDB.number.description{/lang}</small>
 			</dd>
 		</dl>
 	</section>
 		
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s" />
-		<input type="hidden" name="send" value="1" />
-		<input type="hidden" name="step" value="{@$nextStep}" />
-		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
-		<input type="hidden" name="languageCode" value="{@$languageCode}" />
-		<input type="hidden" name="dev" value="{@$developerMode}" />
+		<input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s">
+		<input type="hidden" name="send" value="1">
+		<input type="hidden" name="step" value="{@$nextStep}">
+		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
+		<input type="hidden" name="languageCode" value="{@$languageCode}">
+		<input type="hidden" name="dev" value="{@$developerMode}">
 		{foreach from=$directories key=application item=directory}
 			<input type="hidden" name="directories[{$application}]" value="{$directory}">
 		{/foreach}
 		{foreach from=$selectedLanguages item=language}
-			<input type="hidden" name="selectedLanguages[]" value="{$language}" />
+			<input type="hidden" name="selectedLanguages[]" value="{$language}">
 		{/foreach}
 	</div>
 </form>
diff --git a/wcfsetup/setup/template/stepConfigureDirectories.tpl b/wcfsetup/setup/template/stepConfigureDirectories.tpl
index 08644dd70d..d3c6bc09b6 100644
--- a/wcfsetup/setup/template/stepConfigureDirectories.tpl
+++ b/wcfsetup/setup/template/stepConfigureDirectories.tpl
@@ -44,11 +44,11 @@
 	</section>
 
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s" />
-		<input type="hidden" name="step" value="{@$nextStep}" />
-		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
-		<input type="hidden" name="languageCode" value="{@$languageCode}" />
-		<input type="hidden" name="dev" value="{@$developerMode}" />
+		<input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s">
+		<input type="hidden" name="step" value="{@$nextStep}">
+		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
+		<input type="hidden" name="languageCode" value="{@$languageCode}">
+		<input type="hidden" name="dev" value="{@$developerMode}">
 	</div>
 </form>
 
diff --git a/wcfsetup/setup/template/stepCreateUser.tpl b/wcfsetup/setup/template/stepCreateUser.tpl
index c5af0ff52f..b575658d60 100644
--- a/wcfsetup/setup/template/stepCreateUser.tpl
+++ b/wcfsetup/setup/template/stepCreateUser.tpl
@@ -14,7 +14,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.global.createUser.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
+				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}{lang}wcf.global.createUser.error.empty{/lang}{/if}
@@ -27,7 +27,7 @@
 		<dl{if $errorField == 'email'} class="formError"{/if}>
 			<dt><label for="email">{lang}wcf.global.createUser.email{/lang}</label></dt>
 			<dd>
-				<input type="email" id="email" name="email" value="{$email}" required="required" class="medium" />
+				<input type="email" id="email" name="email" value="{$email}" required="required" class="medium">
 				{if $errorField == 'email'}
 					<small class="innerError">
 						{if $errorType == 'empty'}{lang}wcf.global.createUser.error.empty{/lang}{/if}
@@ -40,7 +40,7 @@
 		<dl{if $errorField == 'confirmEmail'} class="formError"{/if}>
 			<dt><label for="confirmEmail">{lang}wcf.global.createUser.confirmEmail{/lang}</label></dt>
 			<dd>
-				<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" required="required" class="medium" />
+				<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" required="required" class="medium">
 				{if $errorField == 'confirmEmail'}
 					<small class="innerError">
 						{if $errorType == 'notEqual'}{lang}wcf.global.createUser.error.confirmEmail.notEqual{/lang}{/if}
@@ -52,7 +52,7 @@
 		<dl{if $errorField == 'password'} class="formError"{/if}>
 			<dt><label for="password">{lang}wcf.global.createUser.password{/lang}</label></dt>
 			<dd>
-				<input type="password" id="password" name="password" value="{$password}" required="required" class="medium" />
+				<input type="password" id="password" name="password" value="{$password}" required="required" class="medium">
 				{if $errorField == 'password'}
 					<small class="innerError">
 						{if $errorType == 'empty'}{lang}wcf.global.createUser.error.empty{/lang}{/if}
@@ -64,7 +64,7 @@
 		<dl{if $errorField == 'confirmPassword'} class="formError"{/if}>
 			<dt><label for="confirmPassword">{lang}wcf.global.createUser.confirmPassword{/lang}</label></dt>
 			<dd>
-				<input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}" required="required" class="medium" />
+				<input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}" required="required" class="medium">
 				{if $errorField == 'confirmPassword'}
 					<small class="innerError">
 						{if $errorType == 'notEqual'}{lang}wcf.global.createUser.error.confirmPassword.notEqual{/lang}{/if}
@@ -75,12 +75,12 @@
 	</section>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s" />
-		<input type="hidden" name="send" value="1" />
-		<input type="hidden" name="step" value="{@$nextStep}" />
-		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
-		<input type="hidden" name="languageCode" value="{@$languageCode}" />
-		<input type="hidden" name="dev" value="{@$developerMode}" />
+		<input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s">
+		<input type="hidden" name="send" value="1">
+		<input type="hidden" name="step" value="{@$nextStep}">
+		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
+		<input type="hidden" name="languageCode" value="{@$languageCode}">
+		<input type="hidden" name="dev" value="{@$developerMode}">
 		{foreach from=$directories key=application item=directory}
 			<input type="hidden" name="directories[{$application}]" value="{$directory}">
 		{/foreach}
diff --git a/wcfsetup/setup/template/stepInstallPackages.tpl b/wcfsetup/setup/template/stepInstallPackages.tpl
index 33021807a7..e5618eb031 100644
--- a/wcfsetup/setup/template/stepInstallPackages.tpl
+++ b/wcfsetup/setup/template/stepInstallPackages.tpl
@@ -8,7 +8,7 @@
 
 <form method="get" action="{@RELATIVE_WCF_DIR}acp/index.php">
 	<div class="formSubmit">
-		<input type="hidden" name="action" value="WCFSetup" />
+		<input type="hidden" name="action" value="WCFSetup">
 	</div>
 </form>
 
diff --git a/wcfsetup/setup/template/stepNext.tpl b/wcfsetup/setup/template/stepNext.tpl
index 632fa57e39..ea9370299e 100644
--- a/wcfsetup/setup/template/stepNext.tpl
+++ b/wcfsetup/setup/template/stepNext.tpl
@@ -9,18 +9,18 @@
 
 <form method="post" action="install.php?step={@$nextStep}">
 	<div class="formSubmit">
-		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
-		<input type="hidden" name="languageCode" value="{@$languageCode}" />
-		<input type="hidden" name="dev" value="{@$developerMode}" />
+		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
+		<input type="hidden" name="languageCode" value="{@$languageCode}">
+		<input type="hidden" name="dev" value="{@$developerMode}">
 		{foreach from=$directories key=application item=directory}
 			<input type="hidden" name="directories[{$application}]" value="{$directory}">
 		{/foreach}
 		{foreach from=$selectedLanguages item=language}
-			<input type="hidden" name="selectedLanguages[]" value="{$language}" />
+			<input type="hidden" name="selectedLanguages[]" value="{$language}">
 		{/foreach}
 		{if $__additionalParameters|isset}
 			{foreach from=$__additionalParameters key=__name item=__value}
-				<input type="hidden" name="{@$__name}" value="{@$__value}" />
+				<input type="hidden" name="{@$__name}" value="{@$__value}">
 			{/foreach}
 		{/if}
 	</div>
diff --git a/wcfsetup/setup/template/stepSelectLanguages.tpl b/wcfsetup/setup/template/stepSelectLanguages.tpl
index 41cc92198a..bd66fdb9eb 100644
--- a/wcfsetup/setup/template/stepSelectLanguages.tpl
+++ b/wcfsetup/setup/template/stepSelectLanguages.tpl
@@ -15,19 +15,19 @@
 			<dt>{lang}wcf.global.languages.languages{/lang}</dt>
 			<dd>
 				{foreach from=$availableLanguages key=availableLanguageCode item=languageName}
-					<label><input type="checkbox" name="selectedLanguages[]" value="{@$availableLanguageCode}" {if $availableLanguageCode|in_array:$selectedLanguages}checked="checked" {/if}/> {$languageName} ({$availableLanguageCode})</label>
+					<label><input type="checkbox" name="selectedLanguages[]" value="{@$availableLanguageCode}"{if $availableLanguageCode|in_array:$selectedLanguages} checked="checked"{/if}> {$languageName} ({$availableLanguageCode})</label>
 				{/foreach}
 			</dd>
 		</dl>
 	</section>
 	
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s" />
-		<input type="hidden" name="send" value="1" />
-		<input type="hidden" name="step" value="{@$nextStep}" />
-		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
-		<input type="hidden" name="languageCode" value="{@$languageCode}" />
-		<input type="hidden" name="dev" value="{@$developerMode}" />
+		<input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s">
+		<input type="hidden" name="send" value="1">
+		<input type="hidden" name="step" value="{@$nextStep}">
+		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
+		<input type="hidden" name="languageCode" value="{@$languageCode}">
+		<input type="hidden" name="dev" value="{@$developerMode}">
 		{foreach from=$directories key=application item=directory}
 			<input type="hidden" name="directories[{$application}]" value="{$directory}">
 		{/foreach}
diff --git a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
index da2840ae5b..57b41d3460 100644
--- a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
+++ b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
@@ -20,10 +20,10 @@
 		</dl>
 		
 		<div class="formSubmit">
-			<input type="submit" accesskey="s" value="{lang}wcf.global.button.next{/lang}" />
-			<input type="hidden" name="step" value="{@$nextStep}" />
-			<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
-			<input type="hidden" name="dev" value="{@$developerMode}" />
+			<input type="submit" accesskey="s" value="{lang}wcf.global.button.next{/lang}">
+			<input type="hidden" name="step" value="{@$nextStep}">
+			<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
+			<input type="hidden" name="dev" value="{@$developerMode}">
 		</div>
 	</section>
 </form>
diff --git a/wcfsetup/setup/template/stepShowLicense.tpl b/wcfsetup/setup/template/stepShowLicense.tpl
index 6aa8b2e789..7485ff9330 100644
--- a/wcfsetup/setup/template/stepShowLicense.tpl
+++ b/wcfsetup/setup/template/stepShowLicense.tpl
@@ -11,7 +11,7 @@
 			<dt></dt>
 			<dd>
 				<textarea rows="20" cols="40" readonly="readonly" autofocus="autofocus" id="license">{$license}</textarea>
-				<label><input type="checkbox" name="accepted" value="1" /> {lang}wcf.global.license.accept.description{/lang}</label>
+				<label><input type="checkbox" name="accepted" value="1"> {lang}wcf.global.license.accept.description{/lang}</label>
 				{if $missingAcception|isset}
 					<small class="innerError">
 						{lang}wcf.global.license.missingAcception{/lang}
@@ -21,12 +21,12 @@
 		</dl>
 		
 		<div class="formSubmit">
-			<input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s" />
-			<input type="hidden" name="send" value="1" />
-			<input type="hidden" name="step" value="{@$nextStep}" />
-			<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
-			<input type="hidden" name="languageCode" value="{@$languageCode}" />
-			<input type="hidden" name="dev" value="{@$developerMode}" />
+			<input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s">
+			<input type="hidden" name="send" value="1">
+			<input type="hidden" name="step" value="{@$nextStep}">
+			<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
+			<input type="hidden" name="languageCode" value="{@$languageCode}">
+			<input type="hidden" name="dev" value="{@$developerMode}">
 		</div>
 	</section>
 </form>
diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index 27a35b1b10..9a19e3e934 100644
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -108,11 +108,11 @@
 	</section>
 
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.sql.result || !$system.memoryLimit.result || !$system.gdLib.result} disabled="disabled"{/if} accesskey="s"/>
-		<input type="hidden" name="step" value="{@$nextStep}" />
-		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
-		<input type="hidden" name="languageCode" value="{@$languageCode}" />
-		<input type="hidden" name="dev" value="{@$developerMode}" />
+		<input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.sql.result || !$system.memoryLimit.result || !$system.gdLib.result} disabled="disabled"{/if} accesskey="s">
+		<input type="hidden" name="step" value="{@$nextStep}">
+		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
+		<input type="hidden" name="languageCode" value="{@$languageCode}">
+		<input type="hidden" name="dev" value="{@$developerMode}">
 	</div>
 </form>
 
diff --git a/wcfsetup/test.php b/wcfsetup/test.php
index ddd796e449..f9a6442597 100644
--- a/wcfsetup/test.php
+++ b/wcfsetup/test.php
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html dir="ltr" lang="en">
 <head>
 	<title>WoltLab Community Framework 2.2 System Requirements</title>
 </head>
@@ -7,7 +7,7 @@
 <?php
 /**
  * Tests the support of PHP 5.5.4 or greater.
- * ><p><b>Support for PHP is missing.<br />PHP Unterst&uuml;tzung nicht gefunden</b></p> <!--
+ * ><p><b>Support for PHP is missing.<br>PHP Unterst&uuml;tzung nicht gefunden</b></p> <!--
  * 
  * @author	Marcel Werk
  * @copyright	2001-2015 WoltLab GmbH
@@ -22,7 +22,7 @@ $neededPhpVersion = '5.5.4';
 $configArray = @ini_get_all();
 if (!(version_compare($comparePhpVersion, $neededPhpVersion) >= 0)) {
 	?>
-	<p style="color:red;" >Your PHP version '<?php echo $phpVersion; ?>' is insufficient for installation of this software. PHP version <?php echo $neededPhpVersion; ?> or greater is required.<br />
+	<p style="color:red;" >Your PHP version '<?php echo $phpVersion; ?>' is insufficient for installation of this software. PHP version <?php echo $neededPhpVersion; ?> or greater is required.<br>
 	Ihre PHP Version '<?php echo $phpVersion; ?>' ist unzureichend f&uuml;r die Installation dieser Software. PHP Version <?php echo $neededPhpVersion; ?> oder h&ouml;her wird ben&ouml;tigt.</p>
 	<?php
 }
@@ -30,7 +30,7 @@ if (!(version_compare($comparePhpVersion, $neededPhpVersion) >= 0)) {
 // check mbstring
 else if (!extension_loaded('mbstring')) {
 	?>
-	<p>The 'mbstring' PHP extension is missing. Mbstring is required for a stable work of this software.<br />
+	<p>The 'mbstring' PHP extension is missing. Mbstring is required for a stable work of this software.<br>
 	Die 'mbstring' Erweiterung f&uuml;r PHP wurde nicht gefunden. Diese Erweiterung ist f&uuml;r den Betrieb der Software notwendig.</p>
 	<?php
 }
@@ -38,7 +38,7 @@ else if (!extension_loaded('mbstring')) {
 // check libxml
 else if (!extension_loaded('libxml')) {
 	?>
-	<p>The 'libxml' PHP extension is missing. Libxml is required for a stable work of this software.<br />
+	<p>The 'libxml' PHP extension is missing. Libxml is required for a stable work of this software.<br>
 	Die 'libxml' Erweiterung f&uuml;r PHP wurde nicht gefunden. Diese Erweiterung ist f&uuml;r den Betrieb der Software notwendig.</p>
 	<?php
 }
@@ -46,7 +46,7 @@ else if (!extension_loaded('libxml')) {
 // check DOM
 else if (!extension_loaded('dom')) {
 	?>
-	<p>The 'DOM' PHP extension is missing. DOM is required for a stable work of this software.<br />
+	<p>The 'DOM' PHP extension is missing. DOM is required for a stable work of this software.<br>
 	Die 'DOM' Erweiterung f&uuml;r PHP wurde nicht gefunden. Diese Erweiterung ist f&uuml;r den Betrieb der Software notwendig.</p>
 	<?php
 }
@@ -54,7 +54,7 @@ else if (!extension_loaded('dom')) {
 // check zlib extension
 else if (!extension_loaded('zlib')) {
 	?>
-	<p>The 'zlib' PHP extension is missing. ZLib is required for a stable work of this software.<br />
+	<p>The 'zlib' PHP extension is missing. ZLib is required for a stable work of this software.<br>
 	Die 'zlib' Erweiterung f&uuml;r PHP wurde nicht gefunden. Diese Erweiterung ist f&uuml;r den Betrieb der Software notwendig.</p>
 	<?php
 }
@@ -62,7 +62,7 @@ else if (!extension_loaded('zlib')) {
 // check PDO extension
 else if (!extension_loaded('pdo')) {
 	?>
-	<p>The 'PDO' PHP extension is missing. PDO is required for a stable work of this software.<br />
+	<p>The 'PDO' PHP extension is missing. PDO is required for a stable work of this software.<br>
 	Die 'PDO' Erweiterung f&uuml;r PHP wurde nicht gefunden. Diese Erweiterung ist f&uuml;r den Betrieb der Software notwendig.</p>
 	<?php
 }
@@ -70,7 +70,7 @@ else if (!extension_loaded('pdo')) {
 // check PDO MySQL extension
 else if (!extension_loaded('pdo_mysql')) {
 	?>
-	<p>The 'PDO_MYSQL' PHP extension is missing. PDO_MYSQL is required for a stable work of this software.<br />
+	<p>The 'PDO_MYSQL' PHP extension is missing. PDO_MYSQL is required for a stable work of this software.<br>
 	Die 'PDO_MYSQL' Erweiterung f&uuml;r PHP wurde nicht gefunden. Diese Erweiterung ist f&uuml;r den Betrieb der Software notwendig.</p>
 	<?php
 }
@@ -78,7 +78,7 @@ else if (!extension_loaded('pdo_mysql')) {
 // check JSON extension
 else if (!extension_loaded('json')) {
 	?>
-	<p>The 'JSON' PHP extension is missing. JSON is required for a stable work of this software.<br />
+	<p>The 'JSON' PHP extension is missing. JSON is required for a stable work of this software.<br>
 	Die 'JSON' Erweiterung f&uuml;r PHP wurde nicht gefunden. Diese Erweiterung ist f&uuml;r den Betrieb der Software notwendig.</p>
 	<?php
 }
@@ -86,7 +86,7 @@ else if (!extension_loaded('json')) {
 // check PCRE extension
 else if (!extension_loaded('pcre')) {
 	?>
-	<p>The 'PCRE' PHP extension is missing. PCRE is required for a stable work of this software.<br />
+	<p>The 'PCRE' PHP extension is missing. PCRE is required for a stable work of this software.<br>
 	Die 'PCRE' Erweiterung f&uuml;r PHP wurde nicht gefunden. Diese Erweiterung ist f&uuml;r den Betrieb der Software notwendig.</p>
 	<?php
 }
@@ -94,7 +94,7 @@ else if (!extension_loaded('pcre')) {
 // check GD extension
 else if (!extension_loaded('gd')) {
 	?>
-	<p>The 'GD' PHP extension is missing. GD is required for a stable work of this software.<br />
+	<p>The 'GD' PHP extension is missing. GD is required for a stable work of this software.<br>
 	Die 'GD' Erweiterung f&uuml;r PHP wurde nicht gefunden. Diese Erweiterung ist f&uuml;r den Betrieb der Software notwendig.</p>
 	<?php
 }
@@ -102,7 +102,7 @@ else if (!extension_loaded('gd')) {
 // check Hash extension
 else if (!extension_loaded('hash')) {
 	?>
-	<p>The 'Hash' PHP extension is missing. Hash is required for a stable work of this software.<br />
+	<p>The 'Hash' PHP extension is missing. Hash is required for a stable work of this software.<br>
 	Die 'Hash' Erweiterung f&uuml;r PHP wurde nicht gefunden. Diese Erweiterung ist f&uuml;r den Betrieb der Software notwendig.</p>
 	<?php
 }
@@ -110,7 +110,7 @@ else if (!extension_loaded('hash')) {
 // check whether Hash extension is sane
 else if (!in_array('sha256', hash_algos())) {
 	?>
-	<p>The 'Hash' PHP extension is broken. It needs to support the SHA-256 algorithm.<br />
+	<p>The 'Hash' PHP extension is broken. It needs to support the SHA-256 algorithm.<br>
 	Die 'Hash' Erweiterung f&uuml;r PHP ist kaputt. Sie unterstützt die SHA-256-Hashfunktion nicht.</p>
 	<?php
 }
@@ -118,7 +118,7 @@ else if (!in_array('sha256', hash_algos())) {
 // everything is fine
 else {
 	?>
-	<p style="color:green;">PHP <?php echo $neededPhpVersion; ?> or greater is available. You can <a href="install.php">start</a> the installation now.<br />
+	<p style="color:green;">PHP <?php echo $neededPhpVersion; ?> or greater is available. You can <a href="install.php">start</a> the installation now.<br>
 	PHP <?php echo $neededPhpVersion; ?> oder h&ouml;her wurde gefunden. Sie k&ouml;nnen mit der Installation <a href="install.php">beginnen</a>.</p>
 	<?php
 }