From 5502715122fd2aad5e14d8cfa3d9d03a80d1658c Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Tue, 24 Jan 2023 07:10:16 +0200
Subject: [PATCH] replace type="hidden" with hidden

---
 files/templates/admin/app.html            |  2 +-
 files/templates/admin/badge_admin.html    |  2 +-
 files/templates/admin/banned_domains.html |  2 +-
 files/templates/admin/edit_rules.html     |  2 +-
 files/templates/chat.html                 |  7 ++++---
 files/templates/comments.html             |  4 ++--
 files/templates/contact.html              |  2 +-
 files/templates/errors/nsfw.html          |  2 +-
 files/templates/login/login.html          |  2 +-
 files/templates/login/login_2fa.html      |  8 ++++----
 files/templates/login/reset_password.html |  6 +++---
 files/templates/login/sign_up.html        |  8 ++++----
 files/templates/modals/ban.html           |  6 +++---
 files/templates/oauth.html                | 12 ++++++------
 files/templates/post_actions.html         |  2 +-
 files/templates/post_actions_mobile.html  |  2 +-
 files/templates/settings/advanced.html    |  2 +-
 files/templates/settings/apps.html        |  8 ++++----
 files/templates/settings/common.html      |  8 ++++----
 files/templates/settings/css.html         |  4 ++--
 files/templates/settings/personal.html    | 18 +++++++++---------
 files/templates/settings/security.html    | 16 ++++++++--------
 files/templates/sub/create_hole.html      |  2 +-
 files/templates/sub/exilees.html          |  2 +-
 files/templates/sub/mods.html             |  6 +++---
 files/templates/sub/settings.html         | 10 +++++-----
 files/templates/submission.html           |  4 ++--
 files/templates/submit.html               |  4 ++--
 files/templates/submit_hats.html          |  4 ++--
 files/templates/submit_marseys.html       |  4 ++--
 files/templates/update_assets.html        |  2 +-
 files/templates/userpage/admintools.html  | 16 ++++++++--------
 files/templates/userpage/banner.html      |  8 ++++----
 files/templates/util/macros.html          |  4 ++--
 34 files changed, 96 insertions(+), 95 deletions(-)

diff --git a/files/templates/admin/app.html b/files/templates/admin/app.html
index 8d6bc76a0..9266c7eff 100644
--- a/files/templates/admin/app.html
+++ b/files/templates/admin/app.html
@@ -13,7 +13,7 @@
 				<div class="body w-lg-100">
 			<label for="edit-{{app.id}}-author" class="mb-0 w-lg-25">User</label>
 			<input autocomplete="off" id="edit-{{app.id}}-author" class="form-control" type="text" name="name" value="{{app.author.username}}" readonly=readonly>
-			<input type="hidden" name="formkey" value="{{v|formkey}}">
+			<input hidden name="formkey" value="{{v|formkey}}">
 			<label for="edit-{{app.id}}-name" class="mb-0 w-lg-25">App Name</label>
 			<input autocomplete="off" id="edit-{{app.id}}-name" class="form-control" type="text" name="name" value="{{app.app_name}}" readonly=readonly>
 
diff --git a/files/templates/admin/badge_admin.html b/files/templates/admin/badge_admin.html
index 1a6349938..34bac5cc4 100644
--- a/files/templates/admin/badge_admin.html
+++ b/files/templates/admin/badge_admin.html
@@ -12,7 +12,7 @@
 {% set form_action = "/admin/badge_grant" if grant else "/admin/badge_remove" %}
 
 <form action="{{form_action}}" method="post">
-<input type="hidden" name="formkey" value="{{v|formkey}}">
+<input hidden name="formkey" value="{{v|formkey}}">
 
 <label for="input-username">Username</label>
 <input autocomplete="off" id="input-username" class="form-control" type="text" name="username" required>
diff --git a/files/templates/admin/banned_domains.html b/files/templates/admin/banned_domains.html
index 13f45b42a..6c39f53c6 100644
--- a/files/templates/admin/banned_domains.html
+++ b/files/templates/admin/banned_domains.html
@@ -30,7 +30,7 @@
 
 
 	<form action="/admin/ban_domain" method="post">
-		<input type="hidden" name="formkey" value="{{v|formkey}}">
+		<input hidden name="formkey" value="{{v|formkey}}">
 		<input autocomplete="off" name="domain" placeholder="Enter domain here.." class="form-control" required>
 		<input autocomplete="off" name="reason" placeholder="Enter ban reason here.." data-nonce="{{g.nonce}}" data-undisable_element="ban-submit" class="form-control mt-2">
 		<input autocomplete="off" id="ban-submit" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-primary mt-2" value="Ban domain" disabled>
diff --git a/files/templates/admin/edit_rules.html b/files/templates/admin/edit_rules.html
index ed38184f9..67cf917c2 100644
--- a/files/templates/admin/edit_rules.html
+++ b/files/templates/admin/edit_rules.html
@@ -14,7 +14,7 @@
 			<div class="body d-lg-flex">
 				<div class="w-lg-100">
 					<form id="edit_rules" action="/admin/edit_rules" method="post">
-						<input type="hidden" name="formkey" value="{{v|formkey}}">
+						<input hidden name="formkey" value="{{v|formkey}}">
 						<textarea autocomplete="off" maxlength="10000" class="form-control rounded" placeholder="Enter rules here..." rows="50" name="rules" form="edit_rules">{% if rules %}{{rules}}{% endif %}</textarea>
 
 						<div class="d-flex mt-2">
diff --git a/files/templates/chat.html b/files/templates/chat.html
index 66a891467..802f2856b 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -142,9 +142,10 @@
 		</div>
 	</div>
 
-	<input id="vid" type="hidden" value="{{v.id}}">
-	<input id="site_name" type="hidden" value="{{SITE_NAME}}">
-	<input id="slurreplacer" type="hidden" value="{{v.slurreplacer}}">
+	<input id="vid" hidden value="{{v.id}}">
+	<input id="site_name" hidden value="{{SITE_NAME}}">
+	<input id="slurreplacer" hidden value="{{v.slurreplacer}}">
+	<input id="slurreplacer" hidden value="{{v.slurreplacer}}">
 	<script defer src="{{'js/vendor/socketio.js' | asset}}"></script>
 	<script defer src="{{'js/chat.js' | asset}}"></script>
 	<script defer src="{{'js/vendor/lozad.js' | asset}}"></script>
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 13159bef0..b15a1ad94 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -253,7 +253,7 @@
 				{% if v and v.id==c.author_id %}
 
 				<div id="comment-edit-{{c.id}}" class="d-none comment-write collapsed child">
-						<input type="hidden" name="formkey" value="{{v|formkey}}">
+						<input hidden name="formkey" value="{{v|formkey}}">
 						<textarea autocomplete="off" {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" data-preview="preview-edit-{{c.id}}" data-nonce="{{g.nonce}}" data-oninput="markdown(this);charLimit('comment-edit-body-{{c.id}}','charcount-edit-{{c.id}}')" id="comment-edit-body-{{c.id}}" data-id="{{c.id}}" name="body" form="comment-edit-form-{{c.id}}" class="comment-box form-control rounded" placeholder="Add your comment..." rows="3">{{c.body}}</textarea>
 
 						<div class="text-small font-weight-bold mt-1" id="charcount-edit-{{c.id}}" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></div>
@@ -519,7 +519,7 @@
 			<div id="reply-message-{{c.fullname}}" class="d-none">
 				<div id="comment-form-space-{{c.id}}" class="comment-write collapsed child">
 					<div class="input-group">
-						<input type="hidden" name="formkey" value="{{v|formkey}}">
+						<input hidden name="formkey" value="{{v|formkey}}">
 						<textarea data-fullname="{{c.fullname}}" required autocomplete="off" minlength="1" maxlength="10000" name="body" form="reply-to-c_{{c.id}}" data-id="{{c.id}}" class="comment-box form-control rounded" id="reply-form-body-{{c.id}}" rows="3" data-preview="message-reply-{{c.id}}" data-nonce="{{g.nonce}}" data-oninput="markdown(this)"></textarea>
 						<div class="comment-format" id="comment-format-bar-{{c.id}}">
 							<button type="button" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('reply-form-body-{{c.id}}')" class="btn btn-secondary m-0 mt-3 mr-1" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>
diff --git a/files/templates/contact.html b/files/templates/contact.html
index d0e163d20..863d52ec5 100644
--- a/files/templates/contact.html
+++ b/files/templates/contact.html
@@ -9,7 +9,7 @@
 		<form id="contactform" action="/send_admin" method="post" enctype="multipart/form-data">
 
 			<label for="input-message" class="mt-3">Your message</label>
-			<input type="hidden" name="formkey" value="{{v|formkey}}">
+			<input hidden name="formkey" value="{{v|formkey}}">
 			<textarea autocomplete="off" maxlength="10000" id="input-message" form="contactform" name="message" class="form-control" required></textarea>
 			<label class="btn btn-secondary m-0 mt-3" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('input-message')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji">
 				<i class="fas fa-smile-beam"></i>
diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html
index 6abb38b3e..1376f28cf 100644
--- a/files/templates/errors/nsfw.html
+++ b/files/templates/errors/nsfw.html
@@ -11,7 +11,7 @@
 			<div class="btn-toolbar justify-content-center mb-4">
 
 				<form action="/allow_nsfw" method="post">
-					<input type="hidden" name="redir" value="{{request.full_path}}">
+					<input hidden name="redir" value="{{request.full_path}}">
 					<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-danger mr-2" value="Yes, I am +18">
 				</form>
 				<div class="mt-3"><a href="/" class="btn btn-secondary">No</a></div>
diff --git a/files/templates/login/login.html b/files/templates/login/login.html
index 7208d35ad..6efa9a606 100644
--- a/files/templates/login/login.html
+++ b/files/templates/login/login.html
@@ -20,7 +20,7 @@
 			<label for="username" class="mt-3">Username or Email Address</label>
 			<input autocomplete="off" class="form-control" id="username"
 			type="text" name="username" required>
-			<input type="hidden" name="redirect" value="{{redirect}}">
+			<input hidden name="redirect" value="{{redirect}}">
 			<label for="password" class="mt-3">Password</label>
 			<input autocomplete="off" class="form-control" id="password"
 			type="password" name="password" required>
diff --git a/files/templates/login/login_2fa.html b/files/templates/login/login_2fa.html
index 2bb32168d..abba9fd20 100644
--- a/files/templates/login/login_2fa.html
+++ b/files/templates/login/login_2fa.html
@@ -14,10 +14,10 @@
 	{% if failed %}{{macros.alert('Invalid verification code. Please try again.', true)}}{% endif %}
 </div>
 <form action="/login" method="post" class="mt-md-3" id="login">
-	<input type="hidden" name="username" value="{{v.username}}">
-	<input type="hidden" name="redirect" value="{{redirect}}">
-	<input type="hidden" name="time" value="{{time}}">
-	<input type="hidden" name="hash" value="{{hash}}">
+	<input hidden name="username" value="{{v.username}}">
+	<input hidden name="redirect" value="{{redirect}}">
+	<input hidden name="time" value="{{time}}">
+	<input hidden name="hash" value="{{hash}}">
 	<label for="2fa_token" class="mt-3">Your verification code</label>
 	<input autocomplete="off" class="form-control" id="2fa_token" name="2fa_token" type="text" placeholder="6-digit code">
 	<small><a href="/lost_2fa">Lost your 2FA device?</a></small>
diff --git a/files/templates/login/reset_password.html b/files/templates/login/reset_password.html
index 56d518525..0ffee1808 100644
--- a/files/templates/login/reset_password.html
+++ b/files/templates/login/reset_password.html
@@ -4,9 +4,9 @@
 {% block content %}
 <div id="login-form">
 	<form action="/reset" method="post" class="mt-3">
-		<input type="hidden" name="time" value="{{time}}">
-		<input type="hidden" name="user_id" value="{{v.id}}">
-		<input type="hidden" name="token" value="{{token}}">
+		<input hidden name="time" value="{{time}}">
+		<input hidden name="user_id" value="{{v.id}}">
+		<input hidden name="token" value="{{token}}">
 		<label for="passentry" class="mt-3">New Password</label>
 		<input autocomplete="off" class="form-control" id="passentry" type="password" name="password" required>
 		<label for="confentry" class="mt-3">Confirm New Password</label>
diff --git a/files/templates/login/sign_up.html b/files/templates/login/sign_up.html
index 460150c36..f1e5b2c8f 100644
--- a/files/templates/login/sign_up.html
+++ b/files/templates/login/sign_up.html
@@ -60,10 +60,10 @@
 	{% endif %}
 	<form action="/signup" method="post" class="mt-md-3" id="signup">
 
-	<input type="hidden" name="formkey" value="{{formkey}}">
-	<input type="hidden" name="now" value="{{now}}">
-	{% if redirect %}<input type="hidden" name="redirect" value="{{redirect}}">{% endif %}
-	{% if ref_user %}<input type="hidden" name="referred_by" value="{{ref_user.id}}">{% endif %}
+	<input hidden name="formkey" value="{{formkey}}">
+	<input hidden name="now" value="{{now}}">
+	{% if redirect %}<input hidden name="redirect" value="{{redirect}}">{% endif %}
+	{% if ref_user %}<input hidden name="referred_by" value="{{ref_user.id}}">{% endif %}
 
 	<label for="username-register" class="mt-3">Username</label>
 
diff --git a/files/templates/modals/ban.html b/files/templates/modals/ban.html
index 6c728a5da..032a9272a 100644
--- a/files/templates/modals/ban.html
+++ b/files/templates/modals/ban.html
@@ -11,7 +11,7 @@
 
 				<form id="banModalForm">
 
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
+					<input hidden name="formkey" value="{{v|formkey}}">
 
 					<label for="ban-modal-link">Public ban reason (optional)</label>
 					<textarea autocomplete="off" maxlength="256" name="reason" form="banModalForm" class="form-control" id="ban-modal-link" placeholder="Enter reason"></textarea>
@@ -46,8 +46,8 @@
 			<div class="modal-body pt-0" id="chud-modal-body">
 
 				<form id="chudModalForm">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
-					<input type="hidden" name="reason" id="chud-modal-link">
+					<input hidden name="formkey" value="{{v|formkey}}">
+					<input hidden name="reason" id="chud-modal-link">
 
 					<label for="days">Days</label>
 					<input autocomplete="off" type="number" step="any" name="days" id="days" class="form-control" placeholder="leave blank for permanent">
diff --git a/files/templates/oauth.html b/files/templates/oauth.html
index 048454ba6..147c7090c 100644
--- a/files/templates/oauth.html
+++ b/files/templates/oauth.html
@@ -6,12 +6,12 @@
 		<p class="mb-md-5">wants to access your @{{v.username}} account.</p>
 		<p class="mb-md-5">It will not be able to see your password, or change your account settings.</p>
 		<form action="/authorize" method="post" class="mt-md-3" id="login">
-				<input type="hidden" name="formkey" value="{{v|formkey}}">
-				<input type="hidden" name="scopes" value="{{scopes_txt}}">
-				<input type="hidden" name="redirect_uri" value="{{redirect_uri}}">
-				<input type="hidden" name="permanent" value="{{permanent}}">
-				<input type="hidden" name="client_id" value="{{application.client_id}}">
-				<input type="hidden" name="state" value="{{state}}">
+				<input hidden name="formkey" value="{{v|formkey}}">
+				<input hidden name="scopes" value="{{scopes_txt}}">
+				<input hidden name="redirect_uri" value="{{redirect_uri}}">
+				<input hidden name="permanent" value="{{permanent}}">
+				<input hidden name="client_id" value="{{application.client_id}}">
+				<input hidden name="state" value="{{state}}">
 				<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-primary" id="auth_button" value="Authorize {{application.app_name}}">
 				<a href="/" class="btn btn-secondary">No, back to {{SITE_NAME}}</a>
 		</form>
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index 0233b91a5..2c889beef 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -1,6 +1,6 @@
 {% if v and v.id==p.author_id and p.private %}
 	<form action="/publish/{{p.id}}" method="post" class="d-flex mb-0">
-		<input type="hidden" name="formkey", value="{{v|formkey}}">
+		<input hidden name="formkey", value="{{v|formkey}}">
 		<button type="submit" class="list-inline-item text-small p-0 m-0 mr-3 border-0 nobackground font-weight-bold" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)"><i class="fas fa-globe"></i>Publish</button>
 	</form>
 {% endif %}
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index cd00fc806..918178b19 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -1,6 +1,6 @@
 {% if v and v.id==p.author_id and p.private %}
 	<form class="btn-block mb-0" action="/publish/{{p.id}}" method="post">
-		<input type="hidden" name="formkey", value="{{v|formkey}}">
+		<input hidden name="formkey", value="{{v|formkey}}">
 		<button type="submit" class="nobackground btn btn-link btn-lg text-left text-muted" data-bs-dismiss="modal" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)"><i class="fas fa-globe text-center mr-2"></i>Publish</button>
 	</form>
 {% endif %}
diff --git a/files/templates/settings/advanced.html b/files/templates/settings/advanced.html
index 72b20d53d..227a7de15 100644
--- a/files/templates/settings/advanced.html
+++ b/files/templates/settings/advanced.html
@@ -138,7 +138,7 @@
 						</div>
 						<div class="body w-lg-100">
 							<form id="custom-filter" action="/settings/filters" method="post">
-								<input type="hidden" name="formkey" value="{{v|formkey}}">
+								<input hidden name="formkey" value="{{v|formkey}}">
 									<small>Hides matching posts from the frontpage and collapses matching comments.</small>
 								<textarea autocomplete="off" class="form-control rounded" id="filters-text"
 								placeholder="Add your own custom content filters."
diff --git a/files/templates/settings/apps.html b/files/templates/settings/apps.html
index 69afea5e4..2a19b6f1c 100644
--- a/files/templates/settings/apps.html
+++ b/files/templates/settings/apps.html
@@ -14,7 +14,7 @@
 					<label for="name-{{app.id}}">{{app.app_name}}</label>
 					</div>
 				<div class="body w-lg-100">
-				<input type="hidden" name="formkey" value="{{v|formkey}}">
+				<input hidden name="formkey" value="{{v|formkey}}">
 				<label for="edit-{{app.id}}-name" class="mb-0 w-lg-25">App Name</label>
 				<input autocomplete="off" id="edit-{{app.id}}-name" class="form-control" type="text" name="name" value="{{app.app_name}}">
 
@@ -50,7 +50,7 @@
 					<label for="name-{{app.id}}">{{app.app_name}}</label>
 				</div>
 				<div class="body w-lg-100">
-				<input type="hidden" name="formkey" value="{{v|formkey}}">
+				<input hidden name="formkey" value="{{v|formkey}}">
 				<label for="edit-{{app.id}}-name" class="mb-0 w-lg-25">App Name</label>
 				<input autocomplete="off" id="edit-{{app.id}}-name" class="form-control" type="text" name="name" value="{{app.app_name}}" maxlength="50" required>
 
@@ -84,7 +84,7 @@
 					<label for="name-{{auth.application.id}}">{{auth.application.app_name}}</label>
 				</div>
 				<div class="body w-lg-100">
-				<input type="hidden" name="formkey" value="{{v|formkey}}">
+				<input hidden name="formkey" value="{{v|formkey}}">
 				<label class="mb-0 w-lg-25">Description</label>
 				<textarea autocomplete="off" class="form-control" name="description" maxlength="256" readonly="readonly">{{auth.application.description}}</textarea>
 			</div>
@@ -105,7 +105,7 @@
 	<div class="settings-section rounded">
 		<div class="d-lg-flex">
 			<div class="body w-lg-100">
-				<input type="hidden" name="formkey" value="{{v|formkey}}">
+				<input hidden name="formkey" value="{{v|formkey}}">
 				<label for="form-username">Username</label>
 				<input autocomplete="off" type="text" id="form-username" class="form-control" name="username" value="{{v.username}}" readonly>
 				<label for="form-appname">Application Name</label>
diff --git a/files/templates/settings/common.html b/files/templates/settings/common.html
index 787af6948..28e486880 100644
--- a/files/templates/settings/common.html
+++ b/files/templates/settings/common.html
@@ -23,7 +23,7 @@
 	<div class="body w-lg-100 d-lg-flex">
 		<div class="d-flex">
 			<form action="{{form_action}}" id="{{id}}-form" method="post" class="color-picker" style="line-height: 0">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
+					<input hidden name="formkey" value="{{v|formkey}}">
 					{% for themecolor in COLORS %}
 					<input autocomplete="off" type="radio" name="{{form_name}}" id="{{id}}-{{themecolor}}" value="{{themecolor}}" {% if current_color == themecolor %}checked{% endif %} data-nonce="{{g.nonce}}" onclick_submit>
 					<label class="color-radio" for="{{id}}-{{themecolor}}">
@@ -41,7 +41,7 @@
 		<p class="text-small mb-2">Or type a color hex code:</p>
 		<div class="d-flex">
 			<form action="{{form_action}}" id="{{id}}-color-code-form" method="post">
-				<input type="hidden" name="formkey" value="{{v|formkey}}">
+				<input hidden name="formkey" value="{{v|formkey}}">
 				<input autocomplete="off" class="form-control" type="text" name="{{form_name}}" id="{{id}}-color-code" minlength="6" maxlength="6" value="{% if current_color %}{{current_color}}{% endif %}">
 				<label class="btn btn-secondary text-capitalize mr-2 mt-2 mb-0">Update<input type="submit" for="{{id}}-color-code" hidden></label>
 			</form>
@@ -56,7 +56,7 @@
 		<label class="text-black w-lg-25">{{section_title}}</label>
 		<div class="w-lg-100">
 			<form id="{{id}}-form" action="{{form_action}}" method="post">
-				<input type="hidden" name="formkey" value="{{v|formkey}}">
+				<input hidden name="formkey" value="{{v|formkey}}">
 				<input minlength={{minlength}} maxlength={{maxlength}} pattern="{{pattern}}" autocomplete="off" id="{{id}}-body" type="text" name="{{form_name}}" class="form-control" placeholder='{{placeholder_text}}' value="{% if contents %}{{contents}}{% endif %}" {% if disabled %}disabled{% endif %}>
 				<div class="d-flex mt-2">
 					{% if show_marseys %}
@@ -77,7 +77,7 @@
 	<label class="text-black w-lg-25">{{section_title}}</label>
 	<div class="w-lg-100">
 		<form id="{{id}}-form" action="{{form_action}}" method="post" enctype="multipart/form-data">
-			<input type="hidden" name="formkey" value="{{v|formkey}}">
+			<input hidden name="formkey" value="{{v|formkey}}">
 			<textarea autocomplete="off" id="{{id}}-text" class="form-control rounded" placeholder="{{placeholder_text}}" rows="3" name="{{form_name}}" form="{{id}}-form" maxlength="{{maxlength}}">{% if contents %}{{contents}}{% endif %}</textarea>
 			{% if show_extras %}
 				<div class="d-flex mt-2">
diff --git a/files/templates/settings/css.html b/files/templates/settings/css.html
index 4fa601a7b..3e28a6c60 100644
--- a/files/templates/settings/css.html
+++ b/files/templates/settings/css.html
@@ -10,7 +10,7 @@
 				<div class="body d-lg-flex border-bottom">
 					<div class="w-lg-100">
 						<form id="profile-settings-css" action="/settings/css" method="post">
-							<input type="hidden" name="formkey" value="{{v|formkey}}">
+							<input hidden name="formkey" value="{{v|formkey}}">
 							<textarea autocomplete="off" class="form-control rounded" id="css-textarea" placeholder="Custom CSS" rows="3" name="css" form="profile-settings-css" maxlength="{{CSS_LENGTH_LIMIT}}">{% if v.css %}{{v.csslazy}}{% endif %}</textarea>
 							<small>Limit of {{CSS_LENGTH_LIMIT}} characters</small>
 							<div class="d-flex mt-2">
@@ -28,7 +28,7 @@
 				<div class="body d-lg-flex border-bottom">
 					<div class="w-lg-100">
 						<form id="profile-settings-profilecss" action="/settings/profilecss" method="post">
-							<input type="hidden" name="formkey" value="{{v|formkey}}">
+							<input hidden name="formkey" value="{{v|formkey}}">
 							<textarea autocomplete="off" class="form-control rounded" id="profilecss-textarea" placeholder="Custom profile CSS" rows="3" name="profilecss" form="profile-settings-profilecss" maxlength="{{CSS_LENGTH_LIMIT}}">{% if v.profilecss %}{{v.profilecss}}{% endif %}</textarea>
 							<small>Limit of {{CSS_LENGTH_LIMIT}} characters</small>
 							<div class="d-flex mt-2">
diff --git a/files/templates/settings/personal.html b/files/templates/settings/personal.html
index 87686d7f3..4ffd73607 100644
--- a/files/templates/settings/personal.html
+++ b/files/templates/settings/personal.html
@@ -56,7 +56,7 @@
 									</select>
 								</div>
 							<form class="d-flex mt-3 mb-2" id="upload-custom-background" action="/settings/custom_background" method="post" enctype="multipart/form-data">
-								<input type="hidden" name="formkey" value="{{v|formkey}}">
+								<input hidden name="formkey" value="{{v|formkey}}">
 								<label class="btn btn-primary" for="upload-custom-background-file">
 									<i class="fas fa-image mr-1"></i>
 									{% if v.background and v.background.startswith('/images/') %}
@@ -122,7 +122,7 @@
 							<div class="d-flex">
 								<div>
 									<form action="/settings/images/profile" method="post" enctype="multipart/form-data">
-										<input type="hidden" name="formkey" value="{{v|formkey}}">
+										<input hidden name="formkey" value="{{v|formkey}}">
 										<label class="btn btn-secondary text-capitalize mr-2 mb-0">
 											Update<input autocomplete="off" type="file" accept="image/*" {% if g.is_tor %}disabled{% endif %} hidden name="profile" data-nonce="{{g.nonce}}" onchange_submit>
 										</label>
@@ -144,7 +144,7 @@
 								<div class="d-flex">
 									<div>
 										<form action="/settings/images/banner" method="post" enctype="multipart/form-data">
-											<input type="hidden" name="formkey" value="{{v|formkey}}">
+											<input hidden name="formkey" value="{{v|formkey}}">
 											<label class="btn btn-secondary text-capitalize mr-2 mb-0">
 												Update<input autocomplete="off" type="file" {% if g.is_tor %}disabled{% endif %} accept="image/*" hidden name="banner" data-nonce="{{g.nonce}}" onchange_submit>
 											</label>
@@ -162,7 +162,7 @@
 						<div class="body w-lg-100">
 							<p>Your original username will always stay reserved for you: <code>{{v.original_username}}</code></p>
 							<form action="/settings/name_change" method="post">
-								<input type="hidden" name="formkey" value="{{v|formkey}}">
+								<input hidden name="formkey" value="{{v|formkey}}">
 								<input autocomplete="off" type="text" name="name" class="form-control" value="{{v.username}}">
 								<small>3-25 characters, including letters, numbers, _ , and -</small>
 								<div class="d-flex mt-2">
@@ -188,7 +188,7 @@
 							<div class="body w-lg-100">
 								<p>You can use an MP3 file or a YouTube video.</p>
 								<form action="/settings/song_change_mp3" method="post" enctype="multipart/form-data">
-									<input type="hidden" name="formkey" value="{{v|formkey}}">
+									<input hidden name="formkey" value="{{v|formkey}}">
 									<label class="btn btn-secondary d-inline-block m-0 mb-3">
 										<div id="filename-show2"><i class="fas fa-file"></i>
 											{% if v.song and v.song|length in (1,2,3,4,5,17) %}
@@ -201,7 +201,7 @@
 									</label>
 								</form>
 								<form action="/settings/song_change" method="post">
-									<input type="hidden" name="formkey" value="{{v|formkey}}">
+									<input hidden name="formkey" value="{{v|formkey}}">
 									<input class="form-control" style="display:inline;max-width:75%;font-size: min(3.5vw,16px)!important" autocomplete="off" type="text" name="song" class="form-control" value="{% if v.song and v.song|length not in (1,2,3,4,5,17) %}https://youtu.be/{{v.song}}{% endif %}" placeholder='Enter a YouTube video link here'>
 									<input class="btn btn-primary" style="margin-top:-6px;font-size: min(3.5vw,16px)!important" autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Submit">
 								</form>
@@ -285,9 +285,9 @@
 					</button>
 				</div>
 				<div class="modal-body">
-					<input type="hidden" name="{{field}}" value="true">
-					<input type="hidden" name="permanent" value="true">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
+					<input hidden name="{{field}}" value="true">
+					<input hidden name="permanent" value="true">
+					<input hidden name="formkey" value="{{v|formkey}}">
 					<p>This form will permanently enable the filter for you. You will receive the {{badge_name}} badge and <strong>will not</strong> be able to disable the filter.<br>Type your username to continue.</p>
 					<input autocomplete="off" type="text" name="username" placeholder="Enter your username to confirm" id="username-{{id}}" class="form-control" pattern="{{v.username}}" required>
 				</div>
diff --git a/files/templates/settings/security.html b/files/templates/settings/security.html
index 5fc0bb216..6ae65e214 100644
--- a/files/templates/settings/security.html
+++ b/files/templates/settings/security.html
@@ -9,8 +9,8 @@
 			<h5>Email</h5>
 			<div class="settings-section rounded">
 				<form action="/settings/security" method="post">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
-					<input type="hidden" name="now" value="{{now}}">
+					<input hidden name="formkey" value="{{v|formkey}}">
+					<input hidden name="now" value="{{now}}">
 					<div class="body">
 						<div class="d-lg-flex">
 							<label for="new-email" class="w-lg-25">Email</label>
@@ -86,8 +86,8 @@
 						</div>
 					</div>
 					<div class="footer">
-						<input type="hidden" name="formkey" value="{{v|formkey}}">
-						<input type="hidden" name="now" value="{{now}}">
+						<input hidden name="formkey" value="{{v|formkey}}">
+						<input hidden name="now" value="{{now}}">
 						<div class="d-flex">
 							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Change Password">
 						</div>
@@ -115,7 +115,7 @@
 		<section id="site-settings-logout-everywhere-section" class="settings-section-section">
 			<h5>Log Out Everywhere</h5>
 			<form action="/settings/log_out_all_others" method="post">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
+					<input hidden name="formkey" value="{{v|formkey}}">
 				<div class="body">
 					<div class="d-lg-flex">
 						<label for="forcelog-password" class="w-lg-25" id="email-password-label">Password</label>
@@ -198,8 +198,8 @@
 				</button>
 			</div>
 			<form action="/settings/security" method="post">
-				<input type="hidden" name="formkey" value="{{v|formkey}}">
-				<input type="hidden" name="2fa_secret" value="{{mfa_secret}}">
+				<input hidden name="formkey" value="{{v|formkey}}">
+				<input hidden name="2fa_secret" value="{{mfa_secret}}">
 				<div class="modal-body">
 					{% if mfa_secret %}
 						<p><span class="font-weight-bold">Step 1:</span> Scan this QR code (or enter the code) using a two-factor authentication app such as Google Authenticator or Authy.</p>
@@ -247,7 +247,7 @@
 				</button>
 			</div>
 			<div class="modal-body">
-				<input type="hidden" name="formkey" value="{{v|formkey}}">
+				<input hidden name="formkey" value="{{v|formkey}}">
 				<input autocomplete="off" type="text" name="username" placeholder="Enter username..." id="block-username" class="form-control" maxlength=25 required>
 			</div>
 			<div class="modal-footer">
diff --git a/files/templates/sub/create_hole.html b/files/templates/sub/create_hole.html
index c5595cad6..7b490bf3b 100644
--- a/files/templates/sub/create_hole.html
+++ b/files/templates/sub/create_hole.html
@@ -8,7 +8,7 @@
 				<h1 class="d-mob-none">Create a {{HOLE_NAME}}</h1>
 				<h3 class=" d-md-none">Create a {{HOLE_NAME}}</h3>
 				<div class="body">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
+					<input hidden name="formkey" value="{{v|formkey}}">
 					<label for="title">Sub Name</label>
 					<input minlength="3" maxlength="25" pattern='[a-zA-Z0-9_\-]*' class="form-control" id="title-register" type="text" name="name" required>
 					<small class="form-text text-muted">3-25 characters, including letters, numbers, _ , and -</small>
diff --git a/files/templates/sub/exilees.html b/files/templates/sub/exilees.html
index 6914dcaa1..f7e955e68 100644
--- a/files/templates/sub/exilees.html
+++ b/files/templates/sub/exilees.html
@@ -25,7 +25,7 @@
 		<td>
 			{% if v.mods(sub.name) %}
 				<form action="/h/{{sub}}/unexile/{{user.id}}" method="post">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
+					<input hidden name="formkey" value="{{v|formkey}}">
 					<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Unexile">
 				</form>
 			{% endif %}
diff --git a/files/templates/sub/mods.html b/files/templates/sub/mods.html
index 4f194602d..fec35649c 100644
--- a/files/templates/sub/mods.html
+++ b/files/templates/sub/mods.html
@@ -22,8 +22,8 @@
 		<td>
 			{% if v.id == user.id or v.mod_date(sub.name) and v.mod_date(sub.name) < mod.created_utc %}
 				<form action="/h/{{sub}}/remove_mod" method="post" data-nonce="{{g.nonce}}" data-onsubmit="removeMod(this)">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
-					<input type="hidden" name="uid" value="{{user.id}}">
+					<input hidden name="formkey" value="{{v|formkey}}">
+					<input hidden name="uid" value="{{user.id}}">
 					<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="{% if v.id == user.id %}Resign{% else %}Remove Mod{% endif %}">
 				</form>
 			{% endif %}
@@ -35,7 +35,7 @@
 
 {% if v.mods(sub.name) %}
 	<form action="/h/{{sub}}/add_mod" method="post">
-		<input type="hidden" name="formkey" value="{{v|formkey}}">
+		<input hidden name="formkey" value="{{v|formkey}}">
 		<input class="form-control" style="display:inline;width:250px" autocomplete="off" type="text" name="user" class="form-control" placeholder="Enter username..">
 		<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Add Mod" style="margin-bottom: 5px">
 	</form>
diff --git a/files/templates/sub/settings.html b/files/templates/sub/settings.html
index 0467dfa23..aa370ed48 100644
--- a/files/templates/sub/settings.html
+++ b/files/templates/sub/settings.html
@@ -26,7 +26,7 @@
 			<div class="d-flex">
 				<div>
 					<form action="/h/{{sub}}/marsey_image" method="post" enctype="multipart/form-data">
-						<input type="hidden" name="formkey" value="{{v|formkey}}">
+						<input hidden name="formkey" value="{{v|formkey}}">
 						<label class="btn btn-secondary text-capitalize mr-2 mb-0">
 							Update<input autocomplete="off" type="file" accept="image/*" {% if g.is_tor %}disabled{% endif %} hidden name="marsey" data-nonce="{{g.nonce}}" onchange_submit>
 						</label>
@@ -48,7 +48,7 @@
 			<div class="d-flex">
 				<div>
 					<form action="/h/{{sub}}/sidebar_image" method="post" enctype="multipart/form-data">
-						<input type="hidden" name="formkey" value="{{v|formkey}}">
+						<input hidden name="formkey" value="{{v|formkey}}">
 						<label class="btn btn-secondary text-capitalize mr-2 mb-0">
 							Update<input autocomplete="off" type="file" accept="image/*" {% if g.is_tor %}disabled{% endif %} hidden name="sidebar" data-nonce="{{g.nonce}}" onchange_submit>
 						</label>
@@ -84,7 +84,7 @@
 			<div class="d-flex">
 				<div>
 					<form action="/h/{{sub.name}}/settings/banners/" method="post" enctype="multipart/form-data">
-						<input type="hidden" name="formkey" value="{{v|formkey}}">
+						<input hidden name="formkey" value="{{v|formkey}}">
 						<label class="btn btn-secondary text-capitalize mr-2 mb-0">
 							Upload New Banner<input autocomplete="off" type="file" accept="image/*" hidden name="banner" data-nonce="{{g.nonce}}" onchange_submit>
 						</label>
@@ -107,7 +107,7 @@
 			<div class="body d-lg-flex">
 				<div class="w-lg-100">
 					<form id="sidebar" action="/h/{{sub}}/sidebar" method="post">
-						<input type="hidden" name="formkey" value="{{v|formkey}}">
+						<input hidden name="formkey" value="{{v|formkey}}">
 						<textarea autocomplete="off" maxlength="10000" class="form-control rounded" id="bio-text" placeholder="Enter sidebar here..." rows="10" name="sidebar" form="sidebar">{% if sub.sidebar %}{{sub.sidebar}}{% endif %}</textarea>
 						<div class="d-flex mt-2">
 							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Save">
@@ -128,7 +128,7 @@
 			<div class="body d-lg-flex">
 				<div class="w-lg-100">
 					<form id="css" action="/h/{{sub}}/css" method="post">
-						<input type="hidden" name="formkey" value="{{v|formkey}}">
+						<input hidden name="formkey" value="{{v|formkey}}">
 						<textarea autocomplete="off" maxlength="6000" class="form-control rounded" id="bio-text" placeholder="Enter css here..." rows="10" name="css" form="css">{% if sub.css %}{{sub.css}}{% endif %}</textarea>
 						<div class="d-flex mt-2">
 							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Save">
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 6ceb01e1c..0f69ee19b 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -166,8 +166,8 @@
 					{% if v and v.can_edit(p) and not v.is_suspended %}
 						<div id="edit-post-body-{{p.id}}" class="d-none comment-write collapsed child">
 							<form id="post-edit-form-{{p.id}}" action="/edit_post/{{p.id}}" method="post" enctype="multipart/form-data">
-									<input type="hidden" name="formkey" value="{{v|formkey}}">
-									<input type="hidden" name="current_page" value="{{request.path}}">
+									<input hidden name="formkey" value="{{v|formkey}}">
+									<input hidden name="current_page" value="{{request.path}}">
 									<textarea id="post-edit-title" autocomplete="off" max-length="500" name="title" class="comment-box form-control rounded" required placeholder="title">{{p.title}}</textarea>
 									<textarea autocomplete="off" name="body" {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}20000{% endif %}" data-preview="post-edit-{{p.id}}" data-nonce="{{g.nonce}}" data-oninput="markdown(this);charLimit('post-edit-box-{{p.id}}','charcount-post-edit')" id="post-edit-box-{{p.id}}" form="post-edit-form-{{p.id}}" class="comment-box form-control rounded" placeholder="Add text to your post..." rows="10" data-id="{{p.id}}">{{p.body}}</textarea>
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 667cd09e3..5863131c1 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -18,7 +18,7 @@
 								<div class="col p-3 py-md-0">
 										<h2 class="mt-3">Create a post</h2>
 										<div class="body">
-												<input type="hidden" name="formkey" value="{{v|formkey}}">
+												<input hidden name="formkey" value="{{v|formkey}}">
 												<label class='mt-4' for="title">{{HOLE_NAME|capitalize}}</label>
 												<div class="input-group mb2">
 													{%- set hole_placeholder = 'Required' if HOLE_REQUIRED else 'Optional' -%}
@@ -68,7 +68,7 @@
 												<div class="form-text text-small my-1"><a href="/formatting" {% if v and v.newtab %}data-target="t" target="_blank"{% endif %}>Formatting help</a></div>
 												<div class="custom-control custom-checkbox">
 													<input autocomplete="off" type="checkbox" class="custom-control-input" id="post-notify" name="notify" data-nonce="{{g.nonce}}" data-onchange="savetext()" checked>
-													<input type="hidden" name="notify" value="off">
+													<input hidden name="notify" value="off">
 													<label class="custom-control-label" for="post-notify">Notify followers</label>
 												</div>
 												<div class="custom-control custom-checkbox">
diff --git a/files/templates/submit_hats.html b/files/templates/submit_hats.html
index 564bd3178..edc1555cf 100644
--- a/files/templates/submit_hats.html
+++ b/files/templates/submit_hats.html
@@ -11,7 +11,7 @@
 				<div class="d-lg-flex">
 					<div class="body w-lg-100">
 						<form action="/submit/hats" method="post" enctype="multipart/form-data">
-							<input type="hidden" name="formkey" value="{{v|formkey}}">
+							<input hidden name="formkey" value="{{v|formkey}}">
 
 							<div id="image-upload-block">
 								<div><label class="mt-3">Image</label></div>
@@ -59,7 +59,7 @@
 					<div id="{{hat.name}}-hat" class="settings-section rounded">
 						<div class="d-lg-flex">
 							<div class="body w-lg-100">
-								<input type="hidden" name="formkey" value="{{v|formkey}}">
+								<input hidden name="formkey" value="{{v|formkey}}">
 
 								<div><label class="mt-3">Image</label></div>
 								<img loading="lazy" src="/asset_submissions/hats/{{hat.name}}.webp?s={{range(1, 10000000)|random}}" style="max-width:50%;border:5px white solid">
diff --git a/files/templates/submit_marseys.html b/files/templates/submit_marseys.html
index 090723405..2056924ab 100644
--- a/files/templates/submit_marseys.html
+++ b/files/templates/submit_marseys.html
@@ -10,7 +10,7 @@
 				<div class="d-lg-flex">
 					<div class="body w-lg-100">
 						<form action="/submit/marseys" method="post" enctype="multipart/form-data">
-							<input type="hidden" name="formkey" value="{{v|formkey}}">
+							<input hidden name="formkey" value="{{v|formkey}}">
 
 							<div id="image-upload-block">
 								<div><label class="mt-3">Image</label></div>
@@ -54,7 +54,7 @@
 					<div id="{{marsey.name}}-marsey" class="settings-section rounded">
 						<div class="d-lg-flex">
 							<div class="body w-lg-100">
-								<input type="hidden" name="formkey" value="{{v|formkey}}">
+								<input hidden name="formkey" value="{{v|formkey}}">
 
 								<div><label class="mt-3">Image</label></div>
 								<img loading="lazy" src="/asset_submissions/marseys/{{marsey.name}}.webp?s={{range(1, 10000000)|random}}" style="max-width:50%;border:5px white solid">
diff --git a/files/templates/update_assets.html b/files/templates/update_assets.html
index 719efeec6..946e479e3 100644
--- a/files/templates/update_assets.html
+++ b/files/templates/update_assets.html
@@ -11,7 +11,7 @@
 				<div class="d-lg-flex">
 					<div class="body w-lg-100">
 						<form action="{{request.path}}" method="post" enctype="multipart/form-data">
-							<input type="hidden" name="formkey" value="{{v|formkey}}">
+							<input hidden name="formkey" value="{{v|formkey}}">
 
 							<div id="image-upload-block">
 								<div><label class="mt-3">Image</label></div>
diff --git a/files/templates/userpage/admintools.html b/files/templates/userpage/admintools.html
index b07dc9fa0..24d155f03 100644
--- a/files/templates/userpage/admintools.html
+++ b/files/templates/userpage/admintools.html
@@ -27,7 +27,7 @@
 				<div class="body d-lg-flex border-bottom mb-2">
 					<div class="w-lg-100">
 						<form action="/admin/title_change/{{u.id}}" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHR(this)">
-							<input type="hidden" name="formkey" value="{{v|formkey}}">
+							<input hidden name="formkey" value="{{v|formkey}}">
 							<input maxlength=100 autocomplete="off" id="customtitlebody-{{deviceType}}" type="text" name="title" class="form-control" placeholder='Enter a flair here' value="{% if u.customtitleplain %}{{u.customtitleplain}}{% endif %}">
 							<div class="d-flex mt-2">
 								<div class="format"><i class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('customtitlebody-{{deviceType}}')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></i></div>
@@ -45,7 +45,7 @@
 				<button type="button" id="unban-{{deviceType}}" class="mt-1 {% if not u.is_suspended %}d-none{% endif %} btn btn-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unban_user/{{u.id}}','ban-{{deviceType}}','unban-{{deviceType}}','d-none')">Unban user</button>
 
 				<form id="ban-{{deviceType}}" class="my-3 {% if u.is_suspended %}d-none{% endif %}" action="/ban_user/{{u.id}}" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHRSwitch(this)">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
+					<input hidden name="formkey" value="{{v|formkey}}">
 					<input autocomplete="off" style="font-size:11px" type="text" class="form-control" maxlength="256" name="reason" placeholder="Ban Reason" data-nonce="{{g.nonce}}" data-undisable_element="user-ban-submit-{{deviceType}}" required>
 					<input autocomplete="off" style="font-size:11px" type="number" step="any" class="form-control" name="days" placeholder="Days (blank = permanent)">
 					<div class="custom-control custom-checkbox mb-1">
@@ -59,7 +59,7 @@
 				<button type="button" id="unshadowban-{{deviceType}}" class="mt-1 {% if not u.shadowbanned %}d-none{% endif %} btn btn-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unshadowban/{{u.id}}','shadowban-{{deviceType}}','unshadowban-{{deviceType}}','d-none')">Unshadowban user</button>
 
 				<form id="shadowban-{{deviceType}}" class="my-3 {% if u.shadowbanned %}d-none{% endif %}" action="/shadowban/{{u.id}}" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHRSwitch(this)">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
+					<input hidden name="formkey" value="{{v|formkey}}">
 					<input autocomplete="off" style="font-size:11px" type="text" class="form-control" maxlength="256" name="reason" placeholder="Shadowban Reason" data-nonce="{{g.nonce}}" data-undisable_element="user-shadowban-submit-{{deviceType}}" required>
 					<input autocomplete="off" id="user-shadowban-submit-{{deviceType}}" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-danger" value="Shadowban user" disabled>
 				</form>
@@ -68,7 +68,7 @@
 				<button type="button" id="unagendaposter-{{deviceType}}" class="mt-1 {% if not u.agendaposter %}d-none{% endif %} btn btn-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unagendaposter/{{u.id}}','agendaposter-{{deviceType}}','unagendaposter-{{deviceType}}','d-none')">Unchud</button>
 
 				<form id="agendaposter-{{deviceType}}" class="my-3 {% if u.agendaposter %}d-none{% endif %}" action="/agendaposter/{{u.id}}" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHRSwitch(this)">
-					<input type="hidden" name="formkey" value="{{v|formkey}}">
+					<input hidden name="formkey" value="{{v|formkey}}">
 					<input autocomplete="off" type="number" step="any" name="days" class="form-control" placeholder="Days (0 or blank = permanent)">
 					<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-danger" value="Chud">
 				</form>
@@ -91,13 +91,13 @@
 				{% endif %}
 				{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
 					<form action="/admin/unnuke_user" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHR(this)">
-						<input type="hidden" name="formkey", value="{{v|formkey}}">
-						<input type="hidden" name="user" value="{{u.username}}">
+						<input hidden name="formkey", value="{{v|formkey}}">
+						<input hidden name="user" value="{{u.username}}">
 						<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-success" value="Approve User's Content">
 					</form>
 					<form class="mt-1" action="/admin/nuke_user" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHR(this)">
-						<input type="hidden" name="formkey", value="{{v|formkey}}">
-						<input type="hidden" name="user" value="{{u.username}}">
+						<input hidden name="formkey", value="{{v|formkey}}">
+						<input hidden name="user" value="{{u.username}}">
 						<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-danger" value="Remove User's Content">
 					</form>
 				{% endif %}
diff --git a/files/templates/userpage/banner.html b/files/templates/userpage/banner.html
index f68180964..a1485462f 100644
--- a/files/templates/userpage/banner.html
+++ b/files/templates/userpage/banner.html
@@ -152,7 +152,7 @@
 							</div>
 						</div>
 						<form class="d-none toggleable" id="message" action="/@{{u.username}}/message" data-nonce="{{g.nonce}}" data-onsubmit="sendMessage(this)">
-							<input type="hidden" name="formkey" value="{{v|formkey}}">
+							<input hidden name="formkey" value="{{v|formkey}}">
 							<textarea autocomplete="off" id="input-message" form="message" name="message" rows="3" minlength="1" maxlength="10000" class="form-control b2 mt-1" data-preview="message-preview" data-nonce="{{g.nonce}}" data-oninput="markdown(this)"></textarea>
 
 							<button type="button" class="btn btn-secondary format d-inline-block m-0 py-2 fas fa-smile-beam" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('input-message')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></button>
@@ -198,7 +198,7 @@
 
 						{% if v and v.id == u.id %}
 							<form id="upload-profile-background" action="/settings/profile_background" method="post" enctype="multipart/form-data">
-								<input type="hidden" name="formkey" value="{{v|formkey}}">
+								<input hidden name="formkey" value="{{v|formkey}}">
 								<label class="btn btn-primary" for="upload-profile-background-file" style="margin-bottom:0!important">
 									<i class="fas fa-image mr-1"></i>
 									{% if v.profile_background -%}
@@ -417,7 +417,7 @@
 					{% if v and v.id == u.id %}
 						<div>
 							<form class="mt-3" id="upload-profile-background-mobile" action="/settings/profile_background" method="post" enctype="multipart/form-data">
-								<input type="hidden" name="formkey" value="{{v|formkey}}">
+								<input hidden name="formkey" value="{{v|formkey}}">
 								<label class="btn btn-primary" for="upload-profile-background-file-mobile" style="margin-bottom:0!important">
 									<i class="fas fa-image mr-1"></i>
 									{% if v.profile_background %}
@@ -462,7 +462,7 @@
 
 				{% if v and v.id != u.id %}
 					<form class="d-none toggleable" id='message-mobile' action="/@{{u.username}}/message" data-nonce="{{g.nonce}}" data-onsubmit="sendMessage(this)">
-						<input class="mt-1" type="hidden" name="formkey" value="{{v|formkey}}">
+						<input class="mt-1" hidden name="formkey" value="{{v|formkey}}">
 						<textarea autocomplete="off" id="input-message-mobile" form="message-mobile" name="message" rows="3" minlength="1" maxlength="10000" class="form-control" data-preview="message-preview-mobile" data-nonce="{{g.nonce}}" data-oninput="markdown(this)" required></textarea>
 						<button type="button" class="mt-1 btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('input-message-mobile')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></button>
 						&nbsp;
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index cef4c0954..529f77ad0 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -115,8 +115,8 @@
 	<div class="comment-box-wrapper{% if wrapper_css_classes %} {{wrapper_css_classes}}{% endif %}" id="{{html_id}}">
 	{% if v %}
 		<div id="comment-form-space-{{target_fullname}}" class="comment-write {{subwrapper_css_classes}}">
-			<input type="hidden" name="formkey" value="{{v|formkey}}">
-			<input type="hidden" name="parent_fullname" value="{target_fullname}}">
+			<input hidden name="formkey" value="{{v|formkey}}">
+			<input hidden name="parent_fullname" value="{target_fullname}}">
 			<textarea required autocomplete="off" {% if not (p and p.id in ADMIGGER_THREADS) %}{% if v.longpost %}minlength="280"{% elif v.bird %}maxlength="140"{% endif %}{% endif %} minlength="1" maxlength="10000" data-preview="form-preview-{{target_fullname}}" data-nonce="{{g.nonce}}" data-oninput="markdown(this);charLimit('reply-form-body-{{target_fullname}}','charcount-{{target_fullname}}')" id="reply-form-body-{{target_fullname}}" data-fullname="{{target_fullname}}" class="comment-box form-control rounded" name="body" form="reply-to-{{target_fullname}}" placeholder="Add your comment..." rows="3"></textarea>
 
 			<div class="text-small font-weight-bold mt-1" id="charcount-{{target_fullname}}" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></div>