diff --git a/public/global.js b/public/global.js
index e9486f8d..e95973ec 100644
--- a/public/global.js
+++ b/public/global.js
@@ -631,7 +631,7 @@ function mainInit(){
 		ev.preventDefault();
 		let bp = $(this).closest('.editable_parent');
 		let block = bp.find('.editable_block').eq(0);
-		block.html("<input name='edit_field' value='" + block.text() + "' type='text'/><a href='" + $(this).closest('a').attr("href") + "'><button class='submit_edit' type='submit'>Update</button></a>");
+		block.html("<input name='edit_field'value='" + block.text() + "' type='text'><a href='" + $(this).closest('a').attr("href") + "'><button class='submit_edit'type='submit'>Update</button></a>");
 
 		$(".submit_edit").click(function(ev) {
 			ev.preventDefault();
@@ -680,7 +680,7 @@ function mainInit(){
 				this.innerHTML = "<select data-field='"+fieldName+"' name='"+fieldName+"'>"+out+"</select>";
 			}
 			else if(fieldType=="hidden") {}
-			else this.innerHTML = "<input name='"+fieldName+"' value='"+this.textContent+"' type='text'/>";
+			else this.innerHTML = "<input name='"+fieldName+"' value='"+this.textContent+"' type='text'>";
 		});
 
 		// Remove any handlers already attached to the submitter
diff --git a/templates/account_own_edit_mfa_setup.html b/templates/account_own_edit_mfa_setup.html
index 78d6e8e6..b5bac8bf 100644
--- a/templates/account_own_edit_mfa_setup.html
+++ b/templates/account_own_edit_mfa_setup.html
@@ -7,14 +7,14 @@
 		</div>
 		<div class="colstack_item the_form">
 			<form action="/user/edit/mfa/setup/submit/?s={{.CurrentUser.Session}}" method="post">
-				<input name="code" value="{{.Something}}" type="hidden"/>
+				<input name="code" value="{{.Something}}" type="hidden">
 				<div class="formrow real_first_child">
 					<div class="formitem formlabel"><a>{{lang "account_mfa_setup_explanation"}}</a></div>
 					<div class="formitem formlabel">{{.Something}}</div>
 				</div>
 				<div class="formrow">
 					<div class="formitem formlabel"><a>{{lang "account_mfa_setup_verify"}}</a></div>
-					<div class="formitem"><input name="otp" type="text" autocomplete="off" required /></div> {{/** TODO: Make this a password? **/}}
+					<div class="formitem"><input name="otp" type="text" autocomplete="off" required></div> {{/** TODO: Make this a password? **/}}
 				</div>
 				<div class="formrow">
 					<div class="formitem"><button name="account-button" class="formbutton form_middle_button">{{lang "account_mfa_setup_button"}}</button></div>
diff --git a/templates/account_own_edit_password.html b/templates/account_own_edit_password.html
index 06a5dab3..0f413a98 100644
--- a/templates/account_own_edit_password.html
+++ b/templates/account_own_edit_password.html
@@ -9,15 +9,15 @@
 			<form action="/user/edit/password/submit/?s={{.CurrentUser.Session}}" method="post">
 				<div class="formrow real_first_child">
 					<div class="formitem formlabel"><a>{{lang "account_password_current_password"}}</a></div>
-					<div class="formitem"><input name="current-password" type="password" placeholder="*****" autocomplete="current-password" required /></div>
+					<div class="formitem"><input name="current-password" type="password" placeholder="*****" autocomplete="current-password" required></div>
 				</div>
 				<div class="formrow">
 					<div class="formitem formlabel"><a>{{lang "account_password_new_password"}}</a></div>
-					<div class="formitem"><input name="new-password" type="password" placeholder="*****" autocomplete="new-password" required /></div>
+					<div class="formitem"><input name="new-password" type="password" placeholder="*****" autocomplete="new-password" required></div>
 				</div>
 				<div class="formrow">
 					<div class="formitem formlabel"><a>{{lang "account_password_confirm_password"}}</a></div>
-					<div class="formitem"><input name="confirm-password" type="password" placeholder="*****" autocomplete="new-password" required /></div>
+					<div class="formitem"><input name="confirm-password" type="password" placeholder="*****" autocomplete="new-password" required></div>
 				</div>
 				<div class="formrow">
 					<div class="formitem"><button name="account-button" class="formbutton form_middle_button">{{lang "account_password_update_button"}}</button></div>
diff --git a/templates/account_own_edit_privacy.html b/templates/account_own_edit_privacy.html
index 941c31da..43dc9c2c 100644
--- a/templates/account_own_edit_privacy.html
+++ b/templates/account_own_edit_privacy.html
@@ -3,9 +3,9 @@
 </div>
 <div class="colstack_item the_form">
 	<form action="/user/edit/privacy/submit/?s={{.CurrentUser.Session}}" method="post">
-		<!--<input name="o_profile_comments" value="{{if .ProfileComments}}1{{else}}0{{end}}" type="hidden"/>
-		<input name="o_receive_convos" value="{{if .ReceiveConvos}}1{{else}}0{{end}}" type="hidden"/>-->
-		<input name="o_enable_embeds" value="{{if .EnableEmbeds}}1{{else}}0{{end}}" type="hidden"/>
+		<!--<input name="o_profile_comments" value="{{if .ProfileComments}}1{{else}}0{{end}}" type="hidden">
+		<input name="o_receive_convos" value="{{if .ReceiveConvos}}1{{else}}0{{end}}" type="hidden">-->
+		<input name="o_enable_embeds" value="{{if .EnableEmbeds}}1{{else}}0{{end}}" type="hidden">
 		<!--<div class="formrow real_first_child">
 			<div class="formitem formlabel">{{lang "account_privacy_profile_comments"}}</div>
 			<div class="formitem"><select name="profile_comments">
diff --git a/templates/convos.html b/templates/convos.html
index 2b1c2355..2bd722d5 100644
--- a/templates/convos.html
+++ b/templates/convos.html
@@ -9,7 +9,7 @@
 	<form action="/user/convos/create/submit/?s={{.CurrentUser.Session}}" method="post">
 		<div class="formrow real_first_child">
 			<div class="formitem formlabel"><a>{{lang "create_convo_recp"}}</a></div>
-			<div class="formitem"><input name="recp" type="text"/></div>
+			<div class="formitem"><input name="recp" type="text"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem"><textarea name="body"></textarea></div>
diff --git a/templates/create_convo.html b/templates/create_convo.html
index 2ac8c72b..e5d5fc30 100644
--- a/templates/create_convo.html
+++ b/templates/create_convo.html
@@ -7,7 +7,7 @@
 	<form action="/user/convos/create/submit/?s={{.CurrentUser.Session}}" method="post">
 		<div class="formrow real_first_child">
 			<div class="formitem formlabel"><a>{{lang "create_convo_recp"}}</a></div>
-			<div class="formitem"><input name="recp" type="text"{{if .RecpName}} value="{{.RecpName}}"{{end}}/></div>
+			<div class="formitem"><input name="recp"type="text"{{if .RecpName}}value="{{.RecpName}}"{{end}}></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem"><textarea name="body"></textarea></div>
diff --git a/templates/footer.html b/templates/footer.html
index c24192cb..02ba7d92 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -15,7 +15,7 @@
 				<select id="themeSelectorSelect" name="theme" aria-label="{{lang "footer_theme_selector_aria"}}">{{range .Header.Themes}}{{if not .HideFromThemes}}
 					<option value="{{.Name}}"{{if eq $.Header.Theme.Name .Name}} selected{{end}}>{{.FriendlyName}}</option>
 				{{end}}{{end}}</select>
-				<noscript><input type="submit"/></noscript>
+				<noscript><input type="submit"></noscript>
 			</div>
 		</form>
 	</div>
diff --git a/templates/guilds_create_guild.html b/templates/guilds_create_guild.html
index 781db643..76e64837 100644
--- a/templates/guilds_create_guild.html
+++ b/templates/guilds_create_guild.html
@@ -8,11 +8,11 @@
 	<form action="/guild/create/submit/" method="post">
 		<div class="formrow">
 			<div class="formitem formlabel"><a>Guild Name</a></div>
-			<div class="formitem"><input name="group_name" type="text" placeholder="Group Name" /></div>
+			<div class="formitem"><input name="group_name" type="text" placeholder="Group Name"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>Description</a></div>
-			<div class="formitem"><input name="group_desc" type="text" placeholder="Description" /></div>
+			<div class="formitem"><input name="group_desc" type="text" placeholder="Description"></div>
 		</div>
 		<div class="formrow">
 				<div class="formitem formlabel"><a>Visibility</a></div>
diff --git a/templates/ip_search.html b/templates/ip_search.html
index 03d6be85..ab0bea4f 100644
--- a/templates/ip_search.html
+++ b/templates/ip_search.html
@@ -8,12 +8,12 @@
 	<form action="/users/ips/" method="get" id="ip-search-form"></form>
 	<div class="rowblock ip_search_block">
 		<div class="rowitem passive">
-			<input form="ip-search-form" name="ip" class="ip_search_input" type="search" placeholder="🔍︎"{{if .IP}} value="{{.IP}}"{{end}}/>
-			<input form="ip-search-form" class="ip_search_search" type="submit" value="{{lang "ip_search_search_button"}}"/>
+			<input form="ip-search-form" name="ip" class="ip_search_input" type="search" placeholder="🔍︎"{{if .IP}} value="{{.IP}}"{{end}}>
+			<input form="ip-search-form" class="ip_search_search" type="submit" value="{{lang "ip_search_search_button"}}">
 		</div>
 	</div>
 	{{if .IP}}<div class="rowblock rowlist bgavatars micro_grid{{if .ItemList}} has_items{{end}}">
-		{{range .ItemList}}<div class="rowitem" style="background-image:url('{{.Avatar}}');">
+		{{range .ItemList}}<div class="rowitem"style="background-image:url('{{.Avatar}}');">
 			<img src="{{.Avatar}}"class="bgsub"alt="Avatar"aria-hidden="true">
 			<a class="rowTitle" href="{{.Link}}">{{.Name}}</a>
 		</div>
diff --git a/templates/login.html b/templates/login.html
index 58c3e265..cfd9a449 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -7,11 +7,11 @@
 		<form action="/accounts/login/submit/" method="post">
 			<div class="formrow login_name_row">
 				<div class="formitem formlabel"><a id="login_name_label">{{lang "login_account_name"}}</a></div>
-				<div class="formitem"><input name="username" type="text" placeholder="{{lang "login_account_name"}}" aria-labelledby="login_name_label" required /></div>
+				<div class="formitem"><input name="username" type="text" placeholder="{{lang "login_account_name"}}" aria-labelledby="login_name_label" required></div>
 			</div>
 			<div class="formrow login_password_row">
 				<div class="formitem formlabel"><a id="login_password_label">{{lang "login_account_password"}}</a></div>
-				<div class="formitem"><input name="password" type="password" autocomplete="current-password" placeholder="*****" aria-labelledby="login_password_label" required /></div>
+				<div class="formitem"><input name="password" type="password" autocomplete="current-password" placeholder="*****" aria-labelledby="login_password_label" required></div>
 			</div>
 			<div class="formrow login_button_row form_button_row">
 				<div class="formitem"><button name="login-button" class="formbutton">{{lang "login_submit_button"}}</button></div>
diff --git a/templates/login_mfa_verify.html b/templates/login_mfa_verify.html
index 80123804..62865115 100644
--- a/templates/login_mfa_verify.html
+++ b/templates/login_mfa_verify.html
@@ -10,7 +10,7 @@
 			</div>
 			<div class="formrow login_mfa_token_row">
 				<div class="formitem formlabel"><a id="login_mfa_verify_label">{{lang "login_mfa_token"}}</a></div>
-				<div class="formitem"><input name="mfa_token" type="text" autocomplete="off" placeholder="*****" aria-labelledby="login_mfa_verify_label" required /></div>
+				<div class="formitem"><input name="mfa_token" type="text" autocomplete="off" placeholder="*****" aria-labelledby="login_mfa_verify_label" required></div>
 			</div>
 			<div class="formrow login_button_row form_button_row">
 				<div class="formitem"><button name="login-button" class="formbutton">{{lang "login_mfa_verify_button"}}</button></div>
diff --git a/templates/panel_analytics_active_memory.html b/templates/panel_analytics_active_memory.html
index 966bcf96..604b64ac 100644
--- a/templates/panel_analytics_active_memory.html
+++ b/templates/panel_analytics_active_memory.html
@@ -6,7 +6,7 @@
 			<option value="1"{{if eq .MemType 1}} selected{{end}}>{{lang "panel_stats_memory_type_stack"}}</option>
 			<option value="2"{{if eq .MemType 2}} selected{{end}}>{{lang "panel_stats_memory_type_heap"}}</option>
 		</select>
-		<noscript><input form="timeRangeForm" type="submit" /></noscript>
+		<noscript><input form="timeRangeForm" type="submit"></noscript>
 		{{template "panel_analytics_time_range_month.html" . }}
 	</div>
 </div>
diff --git a/templates/panel_analytics_performance.html b/templates/panel_analytics_performance.html
index 49b3e491..fdc60880 100644
--- a/templates/panel_analytics_performance.html
+++ b/templates/panel_analytics_performance.html
@@ -6,7 +6,7 @@
 			<option value="1"{{if eq .PerfType 1}} selected{{end}}>{{lang "panel_stats_perf_high"}}</option>
 			<option value="2"{{if eq .PerfType 2}} selected{{end}}>{{lang "panel_stats_perf_avg"}}</option>
 		</select>
-		<noscript><input form="timeRangeForm" type="submit" /></noscript>
+		<noscript><input form="timeRangeForm" type="submit"></noscript>
 		{{template "panel_analytics_time_range_month.html" . }}
 	</div>
 </div>
diff --git a/templates/panel_analytics_referrers.html b/templates/panel_analytics_referrers.html
index 0fde1758..f9db0cb5 100644
--- a/templates/panel_analytics_referrers.html
+++ b/templates/panel_analytics_referrers.html
@@ -5,7 +5,7 @@
 			<option value="0"{{if not .ShowSpam}} selected{{end}}>{{lang "panel_stats_spam_hide"}}</option>
 			<option value="1"{{if .ShowSpam}} selected{{end}}>{{lang "panel_stats_spam_show"}}</option>
 		</select>
-		<noscript><input form="timeRangeForm" type="submit" /></noscript>
+		<noscript><input form="timeRangeForm" type="submit"></noscript>
 		{{template "panel_analytics_time_range.html" . }}
 	</div>
 </div>
diff --git a/templates/panel_analytics_time_range.html b/templates/panel_analytics_time_range.html
index 3f82507f..409b84b9 100644
--- a/templates/panel_analytics_time_range.html
+++ b/templates/panel_analytics_time_range.html
@@ -8,4 +8,4 @@
 	<option value="twelve-hours"{{if eq .TimeRange "twelve-hours"}} selected{{end}}>{{lang "panel_stats_time_range_twelve_hours"}}</option>
 	<option value="six-hours"{{if eq .TimeRange "six-hours"}} selected{{end}}>{{lang "panel_stats_time_range_six_hours"}}</option>
 </select>
-<noscript><input form="timeRangeForm" type="submit" /></noscript>
\ No newline at end of file
+<noscript><input form="timeRangeForm" type="submit"></noscript>
\ No newline at end of file
diff --git a/templates/panel_analytics_time_range_month.html b/templates/panel_analytics_time_range_month.html
index 712aff47..65e6d4e6 100644
--- a/templates/panel_analytics_time_range_month.html
+++ b/templates/panel_analytics_time_range_month.html
@@ -6,4 +6,4 @@
 	<option value="twelve-hours"{{if eq .TimeRange "twelve-hours"}} selected{{end}}>{{lang "panel_stats_time_range_twelve_hours"}}</option>
 	<option value="six-hours"{{if eq .TimeRange "six-hours"}} selected{{end}}>{{lang "panel_stats_time_range_six_hours"}}</option>
 </select>
-<noscript><input form="timeRangeForm" type="submit" /></noscript>
\ No newline at end of file
+<noscript><input form="timeRangeForm" type="submit"></noscript>
\ No newline at end of file
diff --git a/templates/panel_forum_edit.html b/templates/panel_forum_edit.html
index a89c60e1..120d85d8 100644
--- a/templates/panel_forum_edit.html
+++ b/templates/panel_forum_edit.html
@@ -5,11 +5,11 @@
 	<form action="/panel/forums/edit/submit/{{.ID}}?s={{.CurrentUser.Session}}" method="post">
 	<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_forum_name"}}</a></div>
-		<div class="formitem"><input name="forum_name" type="text" value="{{.Name}}" placeholder="{{lang "panel_forum_name_placeholder"}}"/></div>
+		<div class="formitem"><input name="forum_name" type="text" value="{{.Name}}" placeholder="{{lang "panel_forum_name_placeholder"}}"></div>
 	</div>
 	<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_forum_description"}}</a></div>
-		<div class="formitem"><input name="forum_desc" type="text" value="{{.Desc}}" placeholder="{{lang "panel_forum_description_placeholder"}}"/></div>
+		<div class="formitem"><input name="forum_desc" type="text" value="{{.Desc}}" placeholder="{{lang "panel_forum_description_placeholder"}}"></div>
 	</div>
 	<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_forum_active"}}</a></div>
@@ -47,7 +47,7 @@
 	<div class="formrow">
 		<div class="formitem editable_parent">
 			<a>{{.Group.Name}}</a>
-			<input name="gid" value="{{.Group.ID}}" type="hidden" class="editable_block" data-field="gid" data-type="hidden" data-value="{{.Group.ID}}"/>
+			<input name="gid" value="{{.Group.ID}}" type="hidden" class="editable_block" data-field="gid" data-type="hidden" data-value="{{.Group.ID}}">
 			<span class="edit_fields hide_on_edit rowsmall">{{lang "panel_forum_edit_button"}}</span>
 			<div class="panel_floater">
 				<span data-field="perm_preset" data-type="list" data-value="{{.Preset}}" class="editable_block perm_preset perm_preset_{{.Preset}}"></span>
diff --git a/templates/panel_forums.html b/templates/panel_forums.html
index 144987f2..898e787e 100644
--- a/templates/panel_forums.html
+++ b/templates/panel_forums.html
@@ -37,11 +37,11 @@
 	<form action="/panel/forums/create/?s={{.CurrentUser.Session}}" method="post">
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel.forums_create_name_label"}}</a></div>
-			<div class="formitem"><input name="name" type="text" placeholder="{{lang "panel.forums_create_name"}}"/></div>
+			<div class="formitem"><input name="name" type="text" placeholder="{{lang "panel.forums_create_name"}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel.forums_create_description_label"}}</a></div>
-			<div class="formitem"><input name="desc" type="text" placeholder="{{lang "panel.forums_create_description"}}"/></div>
+			<div class="formitem"><input name="desc" type="text" placeholder="{{lang "panel.forums_create_description"}}"></div>
 		</div>
 		<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel.forums_active_label"}}</a></div>
diff --git a/templates/panel_group_edit.html b/templates/panel_group_edit.html
index 9ab98c70..2c243380 100644
--- a/templates/panel_group_edit.html
+++ b/templates/panel_group_edit.html
@@ -10,7 +10,7 @@
 		<form action="/panel/groups/edit/submit/{{.ID}}?s={{.CurrentUser.Session}}" method="post">
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_group_name"}}</a></div>
-			<div class="formitem"><input name="name" type="text" value="{{.Name}}" placeholder="{{lang "panel_group_name_placeholder"}}" /></div>
+			<div class="formitem"><input name="name" type="text" value="{{.Name}}" placeholder="{{lang "panel_group_name_placeholder"}}"></div>
 		</div>
 		{{if .CurrentUser.Perms.EditGroup}}
 		<div class="formrow">
@@ -27,7 +27,7 @@
 		</div>{{end}}
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_group_tag"}}</a></div>
-			<div class="formitem"><input name="tag" type="text" value="{{.Tag}}" placeholder="{{lang "panel_group_tag_placeholder"}}" /></div>
+			<div class="formitem"><input name="tag" type="text" value="{{.Tag}}" placeholder="{{lang "panel_group_tag_placeholder"}}"></div>
 		</div>
 		<div class="formrow form_button_row">
 			<div class="formitem"><button name="panel-button" class="formbutton">{{lang "panel_group_update_button"}}</button></div>
diff --git a/templates/panel_group_edit_promotions.html b/templates/panel_group_edit_promotions.html
index 3163b364..329e9255 100644
--- a/templates/panel_group_edit_promotions.html
+++ b/templates/panel_group_edit_promotions.html
@@ -57,18 +57,18 @@
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_group_promotions_level"}}</a></div>
-			<div class="formitem"><input name="level" type="number" value="0"/></div>
+			<div class="formitem"><input name="level" type="number" value="0"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_group_promotions_posts"}}</a></div>
-			<div class="formitem"><input name="posts" type="number" value="0"/></div>
+			<div class="formitem"><input name="posts" type="number" value="0"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_group_promotion_registered_for"}}</a></div>
 			<div class="formitem">
-				<input name="registered_months" type="number" value="0"/>{{lang "panel_group_promotion_registered_months_suffix"}}<br>
-				<input name="registered_days" type="number" value="0"/>{{lang "panel_group_promotion_registered_days_suffix"}}<br>
-				<input name="registered_hours" type="number" value="0"/>{{lang "panel_group_promotion_registered_hours_suffix"}}
+				<input name="registered_months" type="number" value="0">{{lang "panel_group_promotion_registered_months_suffix"}}<br>
+				<input name="registered_days" type="number" value="0">{{lang "panel_group_promotion_registered_days_suffix"}}<br>
+				<input name="registered_hours" type="number" value="0">{{lang "panel_group_promotion_registered_hours_suffix"}}
 			</div>
 		</div>
 		<div class="formrow form_button_row">
diff --git a/templates/panel_groups.html b/templates/panel_groups.html
index 41b08a65..9c318553 100644
--- a/templates/panel_groups.html
+++ b/templates/panel_groups.html
@@ -24,7 +24,7 @@
 	<form action="/panel/groups/create/?s={{.CurrentUser.Session}}" method="post">
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_groups_create_name"}}</a></div>
-			<div class="formitem"><input name="name" type="text" placeholder="{{lang "panel_groups_create_name_placeholder"}}" /></div>
+			<div class="formitem"><input name="name" type="text" placeholder="{{lang "panel_groups_create_name_placeholder"}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_groups_create_type"}}</a></div>
@@ -39,7 +39,7 @@
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_groups_create_tag"}}</a></div>
-			<div class="formitem"><input name="tag" type="text" /></div>
+			<div class="formitem"><input name="tag" type="text"></div>
 		</div>
 		<div class="formrow form_button_row">
 			<div class="formitem"><button name="panel-button" class="formbutton">{{lang "panel_groups_create_button"}}</button></div>
diff --git a/templates/panel_pages.html b/templates/panel_pages.html
index 70bd3f9c..fbd169f1 100644
--- a/templates/panel_pages.html
+++ b/templates/panel_pages.html
@@ -24,11 +24,11 @@
 	<form action="/panel/pages/create/submit/?s={{.CurrentUser.Session}}" method="post">
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_pages_create_name"}}</a></div>
-			<div class="formitem"><input name="name" type="text" placeholder="{{lang "panel_pages_create_name_placeholder"}}" /></div>
+			<div class="formitem"><input name="name" type="text" placeholder="{{lang "panel_pages_create_name_placeholder"}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_pages_create_title"}}</a></div>
-			<div class="formitem"><input name="title" type="text" placeholder="{{lang "panel_pages_create_title_placeholder"}}" /></div>
+			<div class="formitem"><input name="title" type="text" placeholder="{{lang "panel_pages_create_title_placeholder"}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem">
diff --git a/templates/panel_pages_edit.html b/templates/panel_pages_edit.html
index c8398b62..d48bbb98 100644
--- a/templates/panel_pages_edit.html
+++ b/templates/panel_pages_edit.html
@@ -5,11 +5,11 @@
 	<div id="panel_page_edit_item" class="colstack_item the_form">
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_pages_name"}}</a></div>
-			<div class="formitem"><input name="name" type="text" value="{{.Page.Name}}" /></div>
+			<div class="formitem"><input name="name" type="text" value="{{.Page.Name}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_pages_title"}}</a></div>
-			<div class="formitem"><input name="title" type="text" value="{{.Page.Title}}" /></div>
+			<div class="formitem"><input name="title" type="text" value="{{.Page.Title}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem">
diff --git a/templates/panel_setting.html b/templates/panel_setting.html
index 5678d552..963cf29c 100644
--- a/templates/panel_setting.html
+++ b/templates/panel_setting.html
@@ -28,7 +28,7 @@
 		</div>
 		{{else}}<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_setting_value"}}</a></div>
-			<div class="formitem"><input name="value" type="text" value="{{.Setting.Content}}"/></div>
+			<div class="formitem"><input name="value" type="text" value="{{.Setting.Content}}"></div>
 		</div>{{end}}
 		<div class="formrow form_button_row">
 			<div class="formitem"><button name="panel-button" class="formbutton">{{lang "panel_setting_update_button"}}</button></div>
diff --git a/templates/panel_themes_menus_item_edit.html b/templates/panel_themes_menus_item_edit.html
index 1d961503..fd20c05a 100644
--- a/templates/panel_themes_menus_item_edit.html
+++ b/templates/panel_themes_menus_item_edit.html
@@ -8,15 +8,15 @@
 		{{/** TODO: Let an admin move a menu item from one menu to another? **/}}
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_name"}}</a></div>
-			<div class="formitem"><input name="item-name" type="text" value="{{.Item.Name}}" /></div>
+			<div class="formitem"><input name="item-name" type="text" value="{{.Item.Name}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_htmlid"}}</a></div>
-			<div class="formitem"><input name="item-htmlid" type="text" value="{{.Item.HTMLID}}" /></div>
+			<div class="formitem"><input name="item-htmlid" type="text" value="{{.Item.HTMLID}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_cssclass"}}</a></div>
-			<div class="formitem"><input name="item-cssclass" type="text" value="{{.Item.CSSClass}}" /></div>
+			<div class="formitem"><input name="item-cssclass" type="text" value="{{.Item.CSSClass}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_position"}}</a></div>
@@ -29,19 +29,19 @@
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_path"}}</a></div>
-			<div class="formitem"><input name="item-path" type="text" value="{{.Item.Path}}" /></div>
+			<div class="formitem"><input name="item-path" type="text" value="{{.Item.Path}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_aria"}}</a></div>
-			<div class="formitem"><input name="item-aria" type="text" value="{{.Item.Aria}}" /></div>
+			<div class="formitem"><input name="item-aria" type="text" value="{{.Item.Aria}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_tooltip"}}</a></div>
-			<div class="formitem"><input name="item-tooltip" type="text" value="{{.Item.Tooltip}}" /></div>
+			<div class="formitem"><input name="item-tooltip" type="text" value="{{.Item.Tooltip}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_tmplname"}}</a></div>
-			<div class="formitem"><input name="item-tmplname" type="text" value="{{.Item.TmplName}}" /></div>
+			<div class="formitem"><input name="item-tmplname" type="text" value="{{.Item.TmplName}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_permissions"}}</a></div>
diff --git a/templates/panel_themes_menus_items.html b/templates/panel_themes_menus_items.html
index 789691aa..710823f0 100644
--- a/templates/panel_themes_menus_items.html
+++ b/templates/panel_themes_menus_items.html
@@ -22,20 +22,20 @@
 	<div class="rowitem"><h1>{{lang "panel_themes_menus_create_head"}}</h1></div>
 </div>
 <form action="/panel/themes/menus/item/create/submit/?s={{.CurrentUser.Session}}" method="post">
-	<input name="mid" value="{{.MenuID}}" type="hidden" />
+	<input name="mid" value="{{.MenuID}}" type="hidden">
 	<div id="panel_themes_menu_item_create" class="colstack_item the_form">
 		{{/** TODO: Let an admin move a menu item from one menu to another? **/}}
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_name"}}</a></div>
-			<div class="formitem"><input name="item-name" type="text" placeholder="{{lang "panel_themes_menus_name_placeholder"}}" /></div>
+			<div class="formitem"><input name="item-name" type="text" placeholder="{{lang "panel_themes_menus_name_placeholder"}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_htmlid"}}</a></div>
-			<div class="formitem"><input name="item-htmlid" type="text" /></div>
+			<div class="formitem"><input name="item-htmlid" type="text"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_cssclass"}}</a></div>
-			<div class="formitem"><input name="item-cssclass" type="text" /></div>
+			<div class="formitem"><input name="item-cssclass" type="text"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_position"}}</a></div>
@@ -48,15 +48,15 @@
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_path"}}</a></div>
-			<div class="formitem"><input name="item-path" type="text" value="/" /></div>
+			<div class="formitem"><input name="item-path" type="text" value="/"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_aria"}}</a></div>
-			<div class="formitem"><input name="item-aria" type="text" placeholder="{{lang "panel_themes_menus_aria_placeholder"}}" /></div>
+			<div class="formitem"><input name="item-aria" type="text" placeholder="{{lang "panel_themes_menus_aria_placeholder"}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_tooltip"}}</a></div>
-			<div class="formitem"><input name="item-tooltip" type="text" placeholder="{{lang "panel_themes_menus_tooltip_placeholder"}}" /></div>
+			<div class="formitem"><input name="item-tooltip" type="text" placeholder="{{lang "panel_themes_menus_tooltip_placeholder"}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_themes_menus_permissions"}}</a></div>
diff --git a/templates/panel_themes_widgets.html b/templates/panel_themes_widgets.html
index 1b4e0be4..ac05dbbd 100644
--- a/templates/panel_themes_widgets.html
+++ b/templates/panel_themes_widgets.html
@@ -25,7 +25,7 @@ type Widget struct {
 		</div>
 		<div class="widget_edit show_on_block_edit">
 			<form action="/panel/themes/widgets/edit/submit/{{$widget.ID}}" method="post">
-			<input class="wside" name="wside" value="{{$name}}" type="hidden" />
+			<input class="wside" name="wside" value="{{$name}}" type="hidden">
 			{{template "panel_themes_widgets_widget.html" $widget }}
 			</form>
 		</div>
@@ -44,8 +44,8 @@ type Widget struct {
 		</div>
 		<div class="widget_edit show_on_block_edit">
 			<form action="/panel/themes/widgets/create/submit/" method="post">
-			<input name="s" value="{{.CurrentUser.Session}}" type="hidden" />
-			<input class="wside" name="wside" value="" type="hidden" />
+			<input name="s" value="{{.CurrentUser.Session}}" type="hidden">
+			<input class="wside" name="wside" value="" type="hidden">
 			{{template "panel_themes_widgets_widget.html" .BlankWidget }}
 			</form>
 		</div>
diff --git a/templates/panel_themes_widgets_widget.html b/templates/panel_themes_widgets_widget.html
index 261a1f33..3b1f684c 100644
--- a/templates/panel_themes_widgets_widget.html
+++ b/templates/panel_themes_widgets_widget.html
@@ -22,14 +22,14 @@
 <div class="formrow">
 	<div class="formitem formlabel"><a>{{lang "panel_themes_widgets_location"}}</a></div>
 	<div class="formitem">
-		<input name="wlocation" value="{{.Location}}" />
+		<input name="wlocation" value="{{.Location}}">
 	</div>
 </div>
 <div class="wtypes wtype_{{.Type}}">
 <div class="formrow w_simple w_about">
 	<div class="formitem formlabel"><a>{{lang "panel_themes_widgets_name"}}</a></div>
 	<div class="formitem">
-		<input name="wname" value="{{index .Data "Name"}}" />
+		<input name="wname" value="{{index .Data "Name"}}">
 	</div>
 </div>
 <div class="formrow w_simple w_about">
diff --git a/templates/panel_user_edit.html b/templates/panel_user_edit.html
index 3dea293d..be10b67a 100644
--- a/templates/panel_user_edit.html
+++ b/templates/panel_user_edit.html
@@ -8,9 +8,9 @@
 	<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_user_avatar"}}</a></div>
 		<div class="formitem avataritem">
-			{{if .User.RawAvatar}}<img src="{{.User.Avatar}}" height=56 width=56>{{end}}
+			{{if .User.RawAvatar}}<img src="{{.User.Avatar}}"height=56 width=56>{{end}}
 			<div class="avatarbuttons">
-				<input form="avatar_form" id="select_avatar" name="avatar_file" type="file" required class="auto_hide"/>
+				<input form="avatar_form" id="select_avatar" name="avatar_file" type="file" required class="auto_hide">
 				<label for="select_avatar" class="formbutton">{{lang "panel_user_avatar_select"}}</label>
 				<button form="avatar_form" name="avatar_action" value=0>{{lang "panel_user_avatar_upload"}}</button>
 				{{if .User.RawAvatar}}<button form="remove_avatar_form" name="avatar_action" value=1>{{lang "panel_user_avatar_remove"}}</button>{{end}}
@@ -19,17 +19,17 @@
 	</div>
 	<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_user_name"}}</a></div>
-		<div class="formitem"><input form="user_form" name="name" type="text" value="{{.User.Name}}" placeholder="{{lang "panel_user_name_placeholder"}}" autocomplete="off"/></div>
+		<div class="formitem"><input form="user_form" name="name" type="text" value="{{.User.Name}}" placeholder="{{lang "panel_user_name_placeholder"}}" autocomplete="off"></div>
 	</div>
 	{{if .CurrentUser.Perms.EditUserPassword}}<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_user_password"}}</a></div>
-		<div class="formitem"><input form="user_form" name="password" type="password" placeholder="*****" autocomplete="off"/></div>
+		<div class="formitem"><input form="user_form" name="password" type="password" placeholder="*****" autocomplete="off"></div>
 	</div>{{end}}
 	{{if .CurrentUser.Perms.EditUserEmail}}<div class="formrow">
 		<div class="formitem formlabel"><a>{{lang "panel_user_email"}}</a></div>
 		<div class="formitem">
-			{{if .ShowEmail}}<input form="user_form" name="show-email" value=1 type="hidden" />
-			<input form="user_form" name="email" type="email" value="{{.User.Email}}" placeholder="example@localhost"/>{{else}}<input form="user_form" name="email" value="-1" type="hidden"/><a href="/panel/users/edit/{{.User.ID}}?show-email=1"><button>{{lang "panel_user_show_email"}}</button></a>{{end}}
+			{{if .ShowEmail}}<input form="user_form" name="show-email" value=1 type="hidden">
+			<input form="user_form" name="email" type="email" value="{{.User.Email}}" placeholder="example@localhost">{{else}}<input form="user_form" name="email" value="-1" type="hidden"><a href="/panel/users/edit/{{.User.ID}}?show-email=1"><button>{{lang "panel_user_show_email"}}</button></a>{{end}}
 		</div>
 	</div>{{end}}
 	{{if .CurrentUser.Perms.EditUserGroup}}
diff --git a/templates/panel_word_filters.html b/templates/panel_word_filters.html
index abd98515..4bd3246b 100644
--- a/templates/panel_word_filters.html
+++ b/templates/panel_word_filters.html
@@ -27,11 +27,11 @@
 	<form action="/panel/settings/word-filters/create/?s={{.CurrentUser.Session}}" method="post">
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_word_filters_create_find"}}</a></div>
-			<div class="formitem"><input name="find" type="text" placeholder="{{lang "panel_word_filters_create_find_placeholder"}}" /></div>
+			<div class="formitem"><input name="find" type="text" placeholder="{{lang "panel_word_filters_create_find_placeholder"}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>{{lang "panel_word_filters_create_replacement"}}</a></div>
-			<div class="formitem"><input name="replace" type="text" placeholder="{{lang "panel_word_filters_create_replacement_placeholder"}}" /></div>
+			<div class="formitem"><input name="replace" type="text" placeholder="{{lang "panel_word_filters_create_replacement_placeholder"}}"></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem"><button name="panel-button" class="formbutton form_middle_button">{{lang "panel_word_filters_create_button"}}</button></div>
diff --git a/templates/password_reset.html b/templates/password_reset.html
index 109a04ab..e0389b76 100644
--- a/templates/password_reset.html
+++ b/templates/password_reset.html
@@ -7,7 +7,7 @@
 		<form action="/accounts/password-reset/submit/" method="post">
 			<div class="formrow login_name_row">
 				<div class="formitem formlabel"><a id="login_name_label">{{lang "password_reset_username"}}</a></div>
-				<div class="formitem"><input name="username" type="text" aria-labelledby="login_name_label" required /></div>
+				<div class="formitem"><input name="username" type="text" aria-labelledby="login_name_label" required></div>
 			</div>
 			<div class="formrow login_button_row form_button_row">
 				<div class="formitem"><button name="login-button" class="formbutton">{{lang "password_reset_button"}}</button></div>
diff --git a/templates/password_reset_token.html b/templates/password_reset_token.html
index 31575673..687ae41a 100644
--- a/templates/password_reset_token.html
+++ b/templates/password_reset_token.html
@@ -5,20 +5,20 @@
 	</div>
 	<div class="rowblock the_form">
 		<form action="/accounts/password-reset/token/submit/" method="post">
-			<input name="uid" value="{{.UID}}" type="hidden" />
-			<input name="token" value="{{.Token}}" type="hidden" />
+			<input name="uid" value="{{.UID}}" type="hidden">
+			<input name="token" value="{{.Token}}" type="hidden">
 			<div class="formrow">
 				<div class="formitem formlabel"><a id="password_label">{{lang "password_reset_token_password"}}</a></div>
-				<div class="formitem"><input name="password" type="password" autocomplete="new-password" placeholder="*****" aria-labelledby="password_label" required /></div>
+				<div class="formitem"><input name="password" type="password" autocomplete="new-password" placeholder="*****" aria-labelledby="password_label" required></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a id="confirm_password_label">{{lang "password_reset_token_confirm_password"}}</a></div>
-				<div class="formitem"><input name="confirm_password" type="password" placeholder="*****" autocomplete="new-password" aria-labelledby="confirm_password_label" required /></div>
+				<div class="formitem"><input name="confirm_password" type="password" placeholder="*****" autocomplete="new-password" aria-labelledby="confirm_password_label" required></div>
 			</div>
 			{{if .MFA}}
 			<div class="formrow mfa_token_row">
 				<div class="formitem formlabel"><a id="mfa_token_label">{{lang "password_reset_mfa_token"}}</a></div>
-				<div class="formitem"><input name="mfa_token" type="text" autocomplete="off" placeholder="*****" aria-labelledby="mfa_token_label" required /></div>
+				<div class="formitem"><input name="mfa_token" type="text" autocomplete="off" placeholder="*****" aria-labelledby="mfa_token_label" required></div>
 			</div>
 			{{end}}
 			<div class="formrow login_button_row form_button_row">
diff --git a/templates/profile.html b/templates/profile.html
index f7abe014..04abd694 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -69,19 +69,19 @@
 			<div class="formrow real_first_child">
 				<div class="formitem formlabel"><a>{{lang "profile.ban_user_days"}}</a></div>
 				<div class="formitem">
-					<input name="dur-days" type="number" value=0 min=0/>
+					<input name="dur-days" type="number" value=0 min=0>
 				</div>
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a>{{lang "profile.ban_user_weeks"}}</a></div>
 				<div class="formitem">
-					<input name="dur-weeks" type="number" value=0 min=0/>
+					<input name="dur-weeks" type="number" value=0 min=0>
 				</div>
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a>{{lang "profile.ban_user_months"}}</a></div>
 				<div class="formitem">
-					<input name="dur-months" type="number" value=0 min=0/>
+					<input name="dur-months" type="number" value=0 min=0>
 				</div>
 			</div>
 			<div class="formrow">
@@ -126,7 +126,7 @@
 {{if .CurrentUser.Loggedin}}
 {{if .CanComment}}
 	<form id="profile_comments_form" class="hash_hide" action="/profile/reply/create/?s={{.CurrentUser.Session}}" method="post">
-		<input name="uid" value='{{.ProfileOwner.ID}}' type="hidden" />
+		<input name="uid"value='{{.ProfileOwner.ID}}'type="hidden">
 		<div class="colstack_item topic_reply_form" style="border-top:none;">
 			<div class="formrow">
 				<div class="formitem"><textarea class="input_content" name="content" placeholder="{{lang "profile.comments_form_content"}}"></textarea></div>
diff --git a/templates/register.html b/templates/register.html
index 87aa1e82..e5525c8a 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -7,19 +7,19 @@
 		<form action="/accounts/create/submit/" method="post">
 			<div class="formrow">
 				<div class="formitem formlabel"><a id="name_label">{{lang "register_account_name"}}</a></div>
-				<div class="formitem"><input name="name" type="text" placeholder="{{lang "register_account_name"}}" aria-labelledby="name_label" required /></div>
+				<div class="formitem"><input name="name" type="text" placeholder="{{lang "register_account_name"}}" aria-labelledby="name_label" required></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a id="email_label">{{if not .Something}}{{lang "register_account_email"}}{{else}}{{lang "register_account_email_optional"}}{{end}}</a></div>
-				<div class="formitem"><input name="email" type="email" placeholder="joe.doe@example.com" aria-labelledby="email_label"{{if not .Something}} required{{end}} /></div>
+				<div class="formitem"><input name="email" type="email" placeholder="joe.doe@example.com" aria-labelledby="email_label"{{if not .Something}} required{{end}}></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a id="password_label">{{lang "register_account_password"}}</a></div>
-				<div class="formitem"><input name="password" type="password" autocomplete="new-password" placeholder="*****" aria-labelledby="password_label" required /></div>
+				<div class="formitem"><input name="password" type="password" autocomplete="new-password" placeholder="*****" aria-labelledby="password_label" required></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a id="confirm_password_label">{{lang "register_account_confirm_password"}}</a></div>
-				<div class="formitem"><input name="confirm_password" type="password" placeholder="*****" autocomplete="new-password" aria-labelledby="confirm_password_label" required /></div>
+				<div class="formitem"><input name="confirm_password" type="password" placeholder="*****" autocomplete="new-password" aria-labelledby="confirm_password_label" required></div>
 			</div>
 			<div class="formrow">{{/** This is not a TOS, that text is there to fool the spambots **/}}
 				<div class="formitem formlabel"><a id="accept_tos_label">{{lang "register_account_anti_spam"}}</a></div>
@@ -31,7 +31,7 @@
 			<div class="formrow register_button_row form_button_row">
 				<div class="formitem"><button name="register-button" class="formbutton">{{lang "register_submit_button"}}</button></div>
 			</div>
-			<input id="golden-watch" name="golden-watch" value="$500" type="hidden" />
+			<input id="golden-watch" name="golden-watch" value="$500" type="hidden">
 		</form>
 	</div>
 </main>
diff --git a/templates/topic_alt_inner.html b/templates/topic_alt_inner.html
index 83027a39..444423cd 100644
--- a/templates/topic_alt_inner.html
+++ b/templates/topic_alt_inner.html
@@ -14,7 +14,7 @@
 		{{if not .Topic.IsClosed or .CurrentUser.Perms.CloseTopic}}
 		{{if .CurrentUser.Perms.EditTopic}}
 		<form id="edit_topic_form" action='/topic/edit/submit/{{.Topic.ID}}?s={{.CurrentUser.Session}}' method="post"></form>
-		<input form="edit_topic_form" class='show_on_edit topic_name_input' name="topic_name" value='{{.Topic.Title}}' type="text" aria-label="{{lang "topic.title_input_aria"}}"/>
+		<input form="edit_topic_form" class='show_on_edit topic_name_input' name="topic_name" value='{{.Topic.Title}}' type="text" aria-label="{{lang "topic.title_input_aria"}}">
 		<button form="edit_topic_form" name="topic-button" class="formbutton show_on_edit submit_edit">{{lang "topic.update_button"}}</button>
 		{{end}}
 		{{end}}
@@ -33,7 +33,7 @@
 			<div class="topic_content user_content">
 				{{range .Poll.QuickOptions}}
 				<div class="poll_option">
-					<input form="poll_{{$.Poll.ID}}_form" id="poll_option_{{.ID}}" name="poll_option_input" type="checkbox" value="{{.ID}}"/>
+					<input form="poll_{{$.Poll.ID}}_form" id="poll_option_{{.ID}}" name="poll_option_input" type="checkbox" value="{{.ID}}">
 					<label class="poll_option_label" for="poll_option_{{.ID}}"><div class="sel"></div></label>
 					<span id="poll_option_text_{{.ID}}" class="poll_option_text">{{.Value}}</span>
 				</div>
@@ -70,7 +70,7 @@
 				{{end}}
 				<div class="attach_item attach_item_buttons">
 					{{if .CurrentUser.Perms.UploadFiles}}
-					<input name="upload_files" id="upload_files_op" multiple type="file" class="auto_hide"/>
+					<input name="upload_files" id="upload_files_op" multiple type="file" class="auto_hide">
 					<label for="upload_files_op" class="formbutton add_file_button">{{lang "topic.upload_button_text"}}</label>{{end}}
 					<button class="attach_item_delete formbutton">{{lang "topic.delete_button_text"}}</button>
 				</div>
diff --git a/templates/topic_alt_posts.html b/templates/topic_alt_posts.html
index 1d003aac..c0e9f407 100644
--- a/templates/topic_alt_posts.html
+++ b/templates/topic_alt_posts.html
@@ -20,7 +20,7 @@
 			{{end}}
 			<div class="attach_item attach_item_buttons">
 				{{if $.CurrentUser.Perms.UploadFiles}}
-				<input name="upload_files" class="upload_files_post auto_hide" id="upload_files_post_{{.ID}}" multiple type="file"/>
+				<input name="upload_files" class="upload_files_post auto_hide" id="upload_files_post_{{.ID}}" multiple type="file">
 				<label for="upload_files_post_{{.ID}}" class="formbutton add_file_button">{{lang "topic.upload_button_text"}}</label>{{end}}
 				<button class="attach_item_delete formbutton">{{lang "topic.delete_button_text"}}</button>
 			</div>
diff --git a/templates/topic_alt_quick_reply.html b/templates/topic_alt_quick_reply.html
index 74fc82b6..0e1ad1c4 100644
--- a/templates/topic_alt_quick_reply.html
+++ b/templates/topic_alt_quick_reply.html
@@ -12,8 +12,8 @@
 	</div>
 	<div class="rowblock topic_reply_form quick_create_form"  aria-label="{{lang "topic.reply_aria"}}">
 		<form id="quick_post_form" enctype="multipart/form-data" action="/reply/create/?s={{.CurrentUser.Session}}" method="post"></form>
-		<input form="quick_post_form" name="tid" value='{{.Topic.ID}}' type="hidden"/>
-		<input form="quick_post_form" id="has_poll_input" name="has_poll" value=0 type="hidden"/>
+		<input form="quick_post_form" name="tid" value='{{.Topic.ID}}' type="hidden">
+		<input form="quick_post_form" id="has_poll_input" name="has_poll" value=0 type="hidden">
 		<div class="formrow real_first_child">
 			<div class="formitem">
 				<textarea id="input_content" form="quick_post_form" name="content" placeholder="{{lang "topic.reply_content_alt"}}" required></textarea>
@@ -22,9 +22,9 @@
 		<div class="formrow poll_content_row auto_hide">
 			<div class="formitem">
 				<div class="pollinput" data-pollinput=0>
-					<input type="checkbox" disabled/>
+					<input type="checkbox" disabled>
 					<label class="pollinputlabel"></label>
-					<input form="quick_post_form" name="pollinputitem[0]" class="pollinputinput" type="text" placeholder="{{lang "topic.reply_add_poll_option_first"}}"/>
+					<input form="quick_post_form" name="pollinputitem[0]" class="pollinputinput" type="text" placeholder="{{lang "topic.reply_add_poll_option_first"}}">
 				</div>
 			</div>
 		</div>
@@ -33,7 +33,7 @@
 				<button form="quick_post_form" name="reply-button" class="formbutton">{{lang "topic.reply_button"}}</button>
 				<button form="quick_post_form" class="formbutton" id="add_poll_button">{{lang "topic.reply_add_poll_button"}}</button>
 				{{if .CurrentUser.Perms.UploadFiles}}
-				<input name="upload_files" form="quick_post_form" id="upload_files" multiple type="file" class="auto_hide"/>
+				<input name="upload_files" form="quick_post_form" id="upload_files" multiple type="file" class="auto_hide">
 				<label for="upload_files" class="formbutton add_file_button">{{lang "topic.reply_add_file_button"}}</label>
 				<div id="upload_file_dock"></div>{{end}}
 			</div>
diff --git a/templates/topic_c_poll_input.html b/templates/topic_c_poll_input.html
index e3444a2e..f6fa2041 100644
--- a/templates/topic_c_poll_input.html
+++ b/templates/topic_c_poll_input.html
@@ -1,5 +1,5 @@
-<div class='pollinput' data-pollinput={{.Index}}>
-	<input type='checkbox' disabled />
+<div class='pollinput'data-pollinput={{.Index}}>
+	<input type='checkbox' disabled>
 	<label class='pollinputlabel'></label>
-	<input form='quick_post_form' name='pollinputitem[{{.Index}}]' class='pollinputinput' type='text' placeholder='{{.Place}}'/>
+	<input form='quick_post_form'name='pollinputitem[{{.Index}}]'class='pollinputinput'type='text'placeholder='{{.Place}}'>
 </div>
\ No newline at end of file
diff --git a/templates/topic_poll.html b/templates/topic_poll.html
index 991b42df..62199acb 100644
--- a/templates/topic_poll.html
+++ b/templates/topic_poll.html
@@ -3,7 +3,7 @@
 		<div class="topic_content user_content">
 			{{range .Poll.QuickOptions}}
 			<div class="poll_option">
-				<input form="poll_{{$.Poll.ID}}_form" id="poll_option_{{.ID}}" name="poll_option_input" type="checkbox" value="{{.ID}}" />
+				<input form="poll_{{$.Poll.ID}}_form" id="poll_option_{{.ID}}" name="poll_option_input" type="checkbox" value="{{.ID}}">
 				<label class="poll_option_label" for="poll_option_{{.ID}}">
 					<div class="sel"></div>
 				</label>
diff --git a/templates/topics.html b/templates/topics.html
index 69baaadd..57c6c481 100644
--- a/templates/topics.html
+++ b/templates/topics.html
@@ -38,7 +38,7 @@
 {{/** TODO: Add ARIA attributes for this **/}}
 <div id="mod_topic_mover" class="modal_pane auto_hide">
 	<form action="/topic/move/submit/?s={{.CurrentUser.Session}}" method="post">
-		<input id="mover_fid"name="fid" value=0 type="hidden"/>
+		<input id="mover_fid"name="fid"value=0 type="hidden">
 		<div class="pane_header">
 			<h3>{{lang "topic_list.move_head"}}</h3>
 		</div>
diff --git a/templates/topics_quick_topic.html b/templates/topics_quick_topic.html
index ba35e7d2..eb3b71d2 100644
--- a/templates/topics_quick_topic.html
+++ b/templates/topics_quick_topic.html
@@ -1,4 +1,4 @@
-<input form="quick_post_form" id="has_poll_input" name="has_poll" value=0 type="hidden" />
+<input form="quick_post_form" id="has_poll_input" name="has_poll" value=0 type="hidden">
 <div class="formrow topic_content_row">
 	<div class="formitem">
 		<textarea form="quick_post_form" id="input_content" name="content" placeholder="{{lang "quick_topic.content_placeholder"}}" required></textarea>
@@ -7,9 +7,9 @@
 <div class="formrow poll_content_row auto_hide">
 	<div class="formitem">
 		<div class="pollinput" data-pollinput=0>
-			<input type="checkbox" disabled />
+			<input type="checkbox" disabled>
 			<label class="pollinputlabel"></label>
-			<input form="quick_post_form" name="pollinputitem[0]" class="pollinputinput" type="text" placeholder="{{lang "quick_topic.add_poll_option_first"}}" />
+			<input form="quick_post_form" name="pollinputitem[0]" class="pollinputinput" type="text" placeholder="{{lang "quick_topic.add_poll_option_first"}}">
 		</div>
 	</div>
 </div>
@@ -18,7 +18,7 @@
 		<button form="quick_post_form" class="formbutton">{{lang "quick_topic.create_button"}}</button>
 		<button form="quick_post_form" class="formbutton" id="add_poll_button">{{lang "quick_topic.add_poll_button"}}</button>
 		{{if .CurrentUser.Perms.UploadFiles}}
-		<input name="upload_files" form="quick_post_form" id="upload_files" multiple type="file" class="auto_hide" />
+		<input name="upload_files"form="quick_post_form" id="upload_files" multiple type="file" class="auto_hide">
 		<label for="upload_files" class="formbutton add_file_button">{{lang "quick_topic.add_file_button"}}</label>
 		<div id="upload_file_dock"></div>{{end}}
 		<button class="formbutton close_form">{{lang "quick_topic.cancel_button"}}</button>
diff --git a/templates/widget_search_and_filter.html b/templates/widget_search_and_filter.html
index a394c6ad..4ae82708 100644
--- a/templates/widget_search_and_filter.html
+++ b/templates/widget_search_and_filter.html
@@ -1,7 +1,7 @@
 <div class="search widget_search">
-	<input class="widget_search_input" name="widget_search" placeholder="Search" type="search"/>
+	<input class="widget_search_input"name="widget_search"placeholder="Search"type="search">
 </div>
 <div class="rowblock filter_list widget_filter">
-{{range .Forums}}	<div class="rowitem filter_item{{if .Selected}} filter_selected{{end}}" data-fid={{.ID}}><a href="/topics/?fids={{.ID}}" rel="nofollow">{{.Name}} ({{.TopicCount}})</a></div>
+{{range .Forums}}	<div class="rowitem filter_item{{if .Selected}} filter_selected{{end}}"data-fid={{.ID}}><a href="/topics/?fids={{.ID}}"rel="nofollow">{{.Name}} ({{.TopicCount}})</a></div>
 {{end}}
 </div>
\ No newline at end of file
diff --git a/themes/nox/overrides/login.html b/themes/nox/overrides/login.html
index 32ca68aa..663f68ab 100644
--- a/themes/nox/overrides/login.html
+++ b/themes/nox/overrides/login.html
@@ -7,11 +7,11 @@
 		<form action="/accounts/login/submit/" method="post">
 			<div class="formrow login_name_row">
 				<div class="formitem formlabel"><a id="login_name_label">{{lang "login_account_name"}}</a></div>
-				<div class="formitem"><input name="username" type="text" placeholder="{{lang "login_account_name"}}" aria-labelledby="login_name_label" required /></div>
+				<div class="formitem"><input name="username" type="text" placeholder="{{lang "login_account_name"}}" aria-labelledby="login_name_label" required></div>
 			</div>
 			<div class="formrow login_password_row">
 				<div class="formitem formlabel"><a id="login_password_label">{{lang "login_account_password"}}</a></div>
-				<div class="formitem"><input name="password" type="password" autocomplete="current-password" placeholder="*****" aria-labelledby="login_password_label" required /></div>
+				<div class="formitem"><input name="password" type="password" autocomplete="current-password" placeholder="*****" aria-labelledby="login_password_label" required></div>
 			</div>
 			<div class="formrow login_button_row form_button_row">
 				<div class="formitem"><button name="login-button" class="formbutton">{{lang "login_submit_button"}}</button></div>
diff --git a/themes/shadow/overrides/login.html b/themes/shadow/overrides/login.html
index 32ca68aa..663f68ab 100644
--- a/themes/shadow/overrides/login.html
+++ b/themes/shadow/overrides/login.html
@@ -7,11 +7,11 @@
 		<form action="/accounts/login/submit/" method="post">
 			<div class="formrow login_name_row">
 				<div class="formitem formlabel"><a id="login_name_label">{{lang "login_account_name"}}</a></div>
-				<div class="formitem"><input name="username" type="text" placeholder="{{lang "login_account_name"}}" aria-labelledby="login_name_label" required /></div>
+				<div class="formitem"><input name="username" type="text" placeholder="{{lang "login_account_name"}}" aria-labelledby="login_name_label" required></div>
 			</div>
 			<div class="formrow login_password_row">
 				<div class="formitem formlabel"><a id="login_password_label">{{lang "login_account_password"}}</a></div>
-				<div class="formitem"><input name="password" type="password" autocomplete="current-password" placeholder="*****" aria-labelledby="login_password_label" required /></div>
+				<div class="formitem"><input name="password" type="password" autocomplete="current-password" placeholder="*****" aria-labelledby="login_password_label" required></div>
 			</div>
 			<div class="formrow login_button_row form_button_row">
 				<div class="formitem"><button name="login-button" class="formbutton">{{lang "login_submit_button"}}</button></div>