diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html
index 2bc0050e3..59175d1de 100644
--- a/files/templates/admin/admin_home.html
+++ b/files/templates/admin/admin_home.html
@@ -100,7 +100,7 @@
 <h4>Configuration</h4>
 <ul>
 	{% if v.admin_level >= PERMS['HOLE_CREATE'] %}
-		<li><a href="/create_hole">Create {{ HOLE_NAME | capitalize }}</a></li>
+		<li><a href="/create_hole">Create {{HOLE_NAME | capitalize}}</a></li>
 	{% endif %}
 	{% if v.admin_level >= PERMS['APPS_MODERATION'] %}
 		<li><a href="/admin/apps">Apps</a></li>
@@ -150,7 +150,7 @@
 
 <h4>Server Status</h4>
 <div>
-	Live Revision: <code>{{ gitref }}</code> <br>
+	Live Revision: <code>{{gitref}}</code> <br>
 </div>
 
 {% endblock %}
diff --git a/files/templates/badges.html b/files/templates/badges.html
index b426a0232..49ef5fc52 100644
--- a/files/templates/badges.html
+++ b/files/templates/badges.html
@@ -32,8 +32,8 @@
 				</td>
 				<td>{{badge.description}}</td>
 				{%- set ct = counts[badge.id] if badge.id in counts else (0, 0) %}
-				<td class="badges-rarity-qty"><a href="/badge_owners/{{badge.id}}">{{ ct[0] }}</a></td>
-				<td class="badges-rarity-ratio">{{ "{:0.3f}".format(ct[1]) }}%</td>
+				<td class="badges-rarity-qty"><a href="/badge_owners/{{badge.id}}">{{ct[0]}}</a></td>
+				<td class="badges-rarity-ratio">{{"{:0.3f}".format(ct[1])}}%</td>
 			</tr>
 		{% endfor %}
 	</table>
@@ -41,4 +41,4 @@
 
 <script defer src="{{'js/sort_table.js' | asset}}"></script>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 6b6ae7803..020529251 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -138,7 +138,7 @@
 				{% if c.bannedfor %}
 					<i class="fas fa-hammer-crash text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="User was banned for this comment {{c.bannedfor}}"></i>
 				{% endif %}
-				{% if c.active_flags(v) %}<a class="btn btn-primary" style="padding:1px 5px; font-size:10px"role="button" onclick="document.getElementById('flaggers-{{c.id}}').classList.toggle('d-none')">{{c.active_flags(v)}} Report{{ help.plural(c.active_flags(v)) }}</a>{% endif %}
+				{% if c.active_flags(v) %}<a class="btn btn-primary" style="padding:1px 5px; font-size:10px"role="button" onclick="document.getElementById('flaggers-{{c.id}}').classList.toggle('d-none')">{{c.active_flags(v)}} Report{{help.plural(c.active_flags(v))}}</a>{% endif %}
 				{% if c.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
 				{% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] and c.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title='Shadowbanned by @{{c.author.shadowbanned}} for "{{c.author.ban_reason}}"'></i>{% endif %}
 				{% if c.stickied %}
diff --git a/files/templates/header.html b/files/templates/header.html
index 0d1e5043c..2bc475223 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -40,7 +40,7 @@
 					' throwing shade right now',
 				]
 				-%}
-				{{g.loggedin_counter+g.loggedout_counter}} {{ VISITORS_HERE_FLAVOR|random|safe }} ({{ g.loggedin_counter }} logged in)
+				{{g.loggedin_counter+g.loggedout_counter}} {{VISITORS_HERE_FLAVOR|random|safe}} ({{g.loggedin_counter}} logged in)
 			{% endif %}
 		{% else %}
 			{{g.loggedin_counter+g.loggedout_counter}} people here now ({{g.loggedin_counter}} logged in)
@@ -225,7 +225,7 @@
 							</div>
 							<div class="text-left pl-2">
 								<div style="color: #{{v.name_color}}" class="text-small font-weight-bold"><span id="header--username" {% if v.patron %}class="patron" style="background-color:#{{v.name_color}}"{% endif %}>{{v.user_name}}</span></div>
-								<div class="header--currency"><img alt="coins" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" src="{{'coins.webp' | asset_siteimg}}" title="coins" aria-label="coins"><span id="user-coins-amount">{{v.coins}}</span>{% if not FEATURES['PROCOINS'] %} Coin{{ help.plural(v.coins) }}{% endif %}</div>
+								<div class="header--currency"><img alt="coins" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" src="{{'coins.webp' | asset_siteimg}}" title="coins" aria-label="coins"><span id="user-coins-amount">{{v.coins}}</span>{% if not FEATURES['PROCOINS'] %} Coin{{help.plural(v.coins)}}{% endif %}</div>
 								{% if FEATURES['PROCOINS'] %}
 									<div class="header--currency"><img alt="marseybux" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" src="/i/marseybux.webp?v=2000" title="Marseybux" aria-label="Marseybux"><span id="user-bux-amount">{{v.procoins}}</span></div>
 								{% endif %}
diff --git a/files/templates/journoid_banner.html b/files/templates/journoid_banner.html
index 313a9b006..81c41bb0c 100644
--- a/files/templates/journoid_banner.html
+++ b/files/templates/journoid_banner.html
@@ -29,6 +29,6 @@ set JOURNOID_BANNERS = [
 -%}
 {% set journoid = JOURNOID_BANNERS|random %}
 
-<a rel="nofollow noopener noreferrer" id="srd-link" href="{{journoid[1]}}">{{ journoid[0] }}</a>
+<a rel="nofollow noopener noreferrer" id="srd-link" href="{{journoid[1]}}">{{journoid[0]}}</a>
 <span id="srd-separator">&mdash;</span>
 <a id="srd-discuss" href="{{journoid[2]}}">(discuss)</a>
diff --git a/files/templates/patrons.html b/files/templates/patrons.html
index 27075e99c..137859737 100644
--- a/files/templates/patrons.html
+++ b/files/templates/patrons.html
@@ -16,7 +16,7 @@
 		<td>
 			<img class="contain" alt="2{{user.patron}}" loading="lazy" width=29.33 height=32 src="/i/{{SITE_NAME}}/patron_badges/2{{user.patron}}.webp?v=1">
 			{% if user.patron_utc %}
-				<i class="{{ benefactor_def['icon'] }} {{ benefactor_def['color'] }} px-1"></i>
+				<i class="{{benefactor_def['icon']}} {{benefactor_def['color']}} px-1"></i>
 			{% endif %}
 		</td>
 	</tr>
diff --git a/files/templates/sub/create_hole.html b/files/templates/sub/create_hole.html
index 06897ad5c..199e30623 100644
--- a/files/templates/sub/create_hole.html
+++ b/files/templates/sub/create_hole.html
@@ -39,7 +39,7 @@
 	
 							{% if error %}
 							<p class="mb-0">
-								<span class="text-danger text-small" style="vertical-align: sub;">{{ error }}</span>
+								<span class="text-danger text-small" style="vertical-align: sub;">{{error}}</span>
 							</p>
 							{% endif %}
 							
@@ -59,4 +59,4 @@
 
 </form>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 20375cd14..4d6ffdb18 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -655,7 +655,7 @@
 						{% if p.is_bot %} <i class="fas fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom"	title="Bot"></i>{% endif %}
 						{% if p.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
 						{% if p.private %}<span class="badge border-warning border-1 text-small-extra">Draft</span>{% endif %}
-						{% if p.active_flags(v) %}<a class="btn btn-primary" role="button" style="padding:1px 5px; font-size:10px"onclick="document.getElementById('flaggers').classList.toggle('d-none')">{{p.active_flags(v)}} Report{{ help.plural(p.active_flags(v)) }}</a>{% endif %}
+						{% if p.active_flags(v) %}<a class="btn btn-primary" role="button" style="padding:1px 5px; font-size:10px"onclick="document.getElementById('flaggers').classList.toggle('d-none')">{{p.active_flags(v)}} Report{{help.plural(p.active_flags(v))}}</a>{% endif %}
 
 						{% if p.ghost %}
 							<span {% if p.distinguish_level %}class="mod"{% endif %}>👻</span>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 14829df24..2abc7804d 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -152,7 +152,7 @@
 				{% if p.is_blocking and not p.ghost %}<i class="fas fa-user-minus text-warning" data-bs-toggle="tooltip" data-bs-placement="bottom" title="You're blocking this user, but you can see this post because you're an admin."></i>{% endif %}
 				{% if p.is_blocked %}<i class="fas fa-user-minus text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="This user is blocking you."></i>{% endif %}
 				{% if p.private %}<span class="badge border-warning border-1 text-small-extra">Draft</span>{% endif %}
-				{% if p.active_flags(v) %}<a class="btn btn-primary" role="button" style="padding:1px 5px; font-size:10px"onclick="document.getElementById('flaggers-{{p.id}}').classList.toggle('d-none')">{{p.active_flags(v)}} Report{{ help.plural(p.active_flags(v)) }}</a>{% endif %}
+				{% if p.active_flags(v) %}<a class="btn btn-primary" role="button" style="padding:1px 5px; font-size:10px"onclick="document.getElementById('flaggers-{{p.id}}').classList.toggle('d-none')">{{p.active_flags(v)}} Report{{help.plural(p.active_flags(v))}}</a>{% endif %}
 				
 				{% if p.ghost %}
 					<span {% if p.distinguish_level %}class="mod"{% endif %}>👻</span>
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index f24e6a6ce..8fbabfb52 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -51,7 +51,7 @@
 							</a>
 						</div>
 						<div id="profilestuff" class="ml-3 w-100">
-							{{ userpage_admintools.userBanBlock('desktop') }}
+							{{userpage_admintools.userBanBlock('desktop')}}
 							<div class="d-flex align-items-center mt-1 mb-2">
 								<h1 class="font-weight-bolder h3 my-0 mr-2" id="profile--name" style="color: #{{u.name_color}}"><span {% if u.patron %}class="patron" style="background-color:#{{u.name_color}}"{% endif %}>{{u.user_name}}</span></h1>
 
@@ -204,7 +204,7 @@
 
 							<a class="btn btn-primary" role="button" onclick="post_toast(this,'/settings/block?username={{u.username}}',true)">Block</a>
 
-							{{ userpage_admintools.userAdminToolsUpper('desktop') }}
+							{{userpage_admintools.userAdminToolsUpper('desktop')}}
 						</div>
 						<form class="d-none toggleable" id="message" action="/@{{u.username}}/message" onsubmit="submitFormAjax(event)">
 							<input type="hidden" name="formkey" value="{{v.formkey}}"> 
@@ -247,7 +247,7 @@
 						<a class="btn btn-secondary" role="button" onclick="toggle()">Toggle anthem</a>
 					{% endif %}
 					
-					{{ userpage_admintools.userAdminToolsLower('desktop') }}
+					{{userpage_admintools.userAdminToolsLower('desktop')}}
 
 					<pre></pre>
 					<div id="profile--info">
@@ -313,7 +313,7 @@
 				</a>
 			</div>
 			<div class="mt-n3 py-3">
-				{{ userpage_admintools.userBanBlock('mobile') }}
+				{{userpage_admintools.userBanBlock('mobile')}}
 				<h1 class="h5 d-inline-block" id="profile-mobile--name" style="color: #{{u.name_color}}"><span {% if u.patron %}class="patron" style="background-color:#{{u.name_color}}"{% endif %}>{{u.user_name}}</span></h1>
 
 				{% if u.username != u.original_username %}
@@ -457,7 +457,7 @@
 
 					<a class="btn btn-primary" role="button" onclick="post_toast(this,'/settings/block?username={{u.username}}',true)">Block</a>
 
-					{{ userpage_admintools.userAdminToolsUpper('mobile') }}
+					{{userpage_admintools.userAdminToolsUpper('mobile')}}
 					<form class="d-none toggleable" id='message-mobile' action="/@{{u.username}}/message" onsubmit="submitFormAjax(event)">
 						<pre></pre>
 						<input type="hidden" name="formkey" value="{{v.formkey}}"> 
@@ -490,7 +490,7 @@
 						<button class="btn btn-primary mt-2 mb-3" onclick="transferBux(true)">Gift</button>
 					</div>
 
-					{{ userpage_admintools.userAdminToolsLower('mobile') }}
+					{{userpage_admintools.userAdminToolsLower('mobile')}}
 					
 				{% endif %}
 				<pre></pre>
diff --git a/files/templates/util/helpers.html b/files/templates/util/helpers.html
index fca4709ed..fa5e86802 100644
--- a/files/templates/util/helpers.html
+++ b/files/templates/util/helpers.html
@@ -1,5 +1,5 @@
 {%- macro plural(value, suffix='s') -%}
 	{%- if value != 1 -%}
-		{{ suffix }}
+		{{suffix}}
 	{%- endif -%}
-{%- endmacro -%}
\ No newline at end of file
+{%- endmacro -%}