diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html
index b5be26570..a75cd5291 100644
--- a/files/templates/award_modal.html
+++ b/files/templates/award_modal.html
@@ -36,7 +36,7 @@
 	</div>
 </div>
 
-<script src="/assets/js/award_modal.js?v=57"></script>
+<script defer src="/assets/js/award_modal.js?v=57"></script>
 
 <style>
 	.awards-wrapper input[type="radio"] {
diff --git a/files/templates/changelog.html b/files/templates/changelog.html
index 5d7122a88..3e0583711 100644
--- a/files/templates/changelog.html
+++ b/files/templates/changelog.html
@@ -105,6 +105,6 @@
 </nav>
 {% endif %}
 
-<script src="/assets/js/changelog.js?v=54"></script>
+<script defer src="/assets/js/changelog.js?v=54"></script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/comments.html b/files/templates/comments.html
index cfb6e8b46..44772aa1c 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -784,20 +784,19 @@ window.addEventListener('DOMContentLoaded', function() {
 
 {% if v %}
 	{% include "award_modal.html" %}
-	<script src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
-	<script src="/assets/js/comments_v.js?v=73"></script>
+	<script defer src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
+	<script defer src="/assets/js/comments_v.js?v=73"></script>
 {% endif %}
 
 <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
 
-<script src="/assets/js/popover.js?v=2"></script>
+<script defer src="/assets/js/popover.js?v=2"></script>
 
 {% if v and v.admin_level > 1 %}
-	<script src="/assets/js/comments_admin.js?v=53"></script>
+	<script defer src="/assets/js/comments_admin.js?v=54"></script>
 {% endif %}
 
 <script>
-window.addEventListener('DOMContentLoaded', function() {
 	function collapse_comment(comment_id) {
 		const comment = "comment-" + comment_id
 		const element = document.getElementById(comment)
@@ -812,11 +811,9 @@ window.addEventListener('DOMContentLoaded', function() {
 
 	var clipboard = new ClipboardJS('.copy-link');
 	clipboard.on('success', function(e) {
-			var myToast = new bootstrap.Toast(document.getElementById('toast-success'));
-			myToast.show();
+		var myToast = new bootstrap.Toast(document.getElementById('toast-success'));
+		myToast.show();
 	});
-
-});
 </script>
 
 {% include "expanded_image_modal.html" %}
diff --git a/files/templates/default.html b/files/templates/default.html
index 830b3b2dd..ac3989afe 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -288,7 +288,7 @@
 	</div>
 </div>
 
-<script src="/assets/js/lozad.js?v=53"></script>
+<script defer src="/assets/js/lozad.js?v=53"></script>
 <script>
 window.addEventListener('DOMContentLoaded', function() {
 	const observer = lozad();
@@ -366,7 +366,7 @@ window.addEventListener('DOMContentLoaded', function() {
 	<script>
 		function formkey() {return '{{v.formkey}}';}
 	</script>
-	<script src="/assets/js/default.js?v=55"></script>
+	<script defer src="/assets/js/default.js?v=55"></script>
 {% endif %}
 
 
diff --git a/files/templates/embeds/twitter.html b/files/templates/embeds/twitter.html
index bb7617144..0b71cfcc8 100644
--- a/files/templates/embeds/twitter.html
+++ b/files/templates/embeds/twitter.html
@@ -1,5 +1,5 @@
 {{p.embed_url | safe}}
-<script src="/assets/js/twitter.js" charset="utf-8">
+<script defer src="/assets/js/twitter.js" charset="utf-8">
 </script>
 <script>
 window.addEventListener('DOMContentLoaded', function() {
diff --git a/files/templates/embeds/twitterlight.html b/files/templates/embeds/twitterlight.html
index a3310f6a5..07583f4aa 100644
--- a/files/templates/embeds/twitterlight.html
+++ b/files/templates/embeds/twitterlight.html
@@ -1,5 +1,5 @@
 {{p.embed_url | safe}}
-<script src="https://platform.twitter.com/widgets.js" charset="utf-8">
+<script defer src="https://platform.twitter.com/widgets.js" charset="utf-8">
 </script>
 <script>
 window.addEventListener('DOMContentLoaded', function() {
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index 6e469665c..d59c594ba 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -84,7 +84,7 @@
 	</div>
 </div>
 
-<script src="/assets/js/emoji_modal.js?v=122"></script>
+<script defer src="/assets/js/emoji_modal.js?v=122"></script>
 
 <style>
 	a.emojitab {
diff --git a/files/templates/gif_modal.html b/files/templates/gif_modal.html
index 321b725ba..451a166a1 100644
--- a/files/templates/gif_modal.html
+++ b/files/templates/gif_modal.html
@@ -26,4 +26,4 @@
 	</div>
 </div>
 
-<script src="/assets/js/gif_modal.js?v=54"></script>
+<script defer src="/assets/js/gif_modal.js?v=54"></script>
diff --git a/files/templates/header.html b/files/templates/header.html
index f9b5f2f58..434fd5916 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -218,7 +218,7 @@
 		function formkey() {return '{{v.formkey}}';}
 	</script>
 {% endif %}
-<script src="/assets/js/header.js?v=54"></script>
+<script defer src="/assets/js/header.js?v=54"></script>
 
 <style>
 	.notif-count {
diff --git a/files/templates/home.html b/files/templates/home.html
index 8dddf8623..25f25640f 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -193,7 +193,7 @@ window.addEventListener('DOMContentLoaded', function() {
 {% endif %}
 
 {% if v %}
-	<script src="https://js.pusher.com/beams/1.0/push-notifications-cdn.js"></script>
+	<script defer src="https://js.pusher.com/beams/1.0/push-notifications-cdn.js"></script>
 	<script>
 window.addEventListener('DOMContentLoaded', function() {
 		const beamsClient = new PusherPushNotifications.Client({
diff --git a/files/templates/log.html b/files/templates/log.html
index 7b92be086..5433d082f 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -125,14 +125,12 @@
 <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
 
 <script>
-window.addEventListener('DOMContentLoaded', function() {
 	var clipboard = new ClipboardJS('.copy-link');
 	clipboard.on('success', function(e) {
 			var myToast = new bootstrap.Toast(document.getElementById('toast-success'));
 			myToast.show();
 	});
 
-});
 </script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/mobile_navigation_bar.html b/files/templates/mobile_navigation_bar.html
index c1aa5434b..505aa63b9 100644
--- a/files/templates/mobile_navigation_bar.html
+++ b/files/templates/mobile_navigation_bar.html
@@ -68,7 +68,7 @@
 		</div>
 </div>
 
-<script src="/assets/js/mobile_navigation_bar.js?v=53"></script>
+<script defer src="/assets/js/mobile_navigation_bar.js?v=53"></script>
 
 <style>
 	.btn-dead:hover, .active.btn-dead:hover, .active.btn-dead {
diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html
index 33ed1350c..fddef3ce0 100644
--- a/files/templates/report_post_modal.html
+++ b/files/templates/report_post_modal.html
@@ -32,4 +32,4 @@
 	</div>
 </div>
 
-<script src="/assets/js/report_post_modal.js?v=54"></script>
\ No newline at end of file
+<script defer src="/assets/js/report_post_modal.js?v=54"></script>
\ No newline at end of file
diff --git a/files/templates/settings.html b/files/templates/settings.html
index d95fb79d2..eb5528a22 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -242,7 +242,6 @@
 <script>
 function formkey() {return '{{v.formkey}}';}
 
-window.addEventListener('DOMContentLoaded', function() {
 	var clipboard = new ClipboardJS('.copy-link');
 	clipboard.on('success', function(e) {
 			var myToast = new bootstrap.Toast(document.getElementById('toast-success'));
@@ -252,7 +251,6 @@ window.addEventListener('DOMContentLoaded', function() {
 	function emailVerifyText() {
 		document.getElementById("email-verify-text").innerHTML = "Verification email sent! Please check your inbox.";
 	}
-});
 </script>
 
 <style>
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index e31ee92e7..3514bc370 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -682,7 +682,7 @@
 </div>
 
 
-<script src="/assets/js/settings_profile.js?v=58"></script>
+<script defer src="/assets/js/settings_profile.js?v=58"></script>
 
 <script>
 window.addEventListener('DOMContentLoaded', function() {
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 5f3cd3e52..65b558936 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -148,10 +148,10 @@
 
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 
-<script src="/assets/js/signup.js?v=63"></script>
+<script defer src="/assets/js/signup.js?v=63"></script>
 
 {% if hcaptcha %}
-	<script src="https://hcaptcha.com/1/api.js"></script>
+	<script defer src="https://hcaptcha.com/1/api.js"></script>
 {% endif %}
 
 </body>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 3f185897d..c60150e0a 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -13,7 +13,7 @@
 
 {% block title %}
 
-<script src="/assets/js/new_comments_count.js?v=53"></script>
+<script defer src="/assets/js/new_comments_count.js?v=53"></script>
 
 {% if p.award_count("train") %}
 	<style>
@@ -897,7 +897,7 @@ window.addEventListener('DOMContentLoaded', function() {
 </script>
 
 	{% if v %}
-		<script src="/assets/js/comments_v.js?v=73"></script>
+		<script defer src="/assets/js/comments_v.js?v=73"></script>
 		{% include "award_modal.html" %}
 		{% include "emoji_modal.html" %}
 		{% include "gif_modal.html" %}
@@ -909,7 +909,7 @@ window.addEventListener('DOMContentLoaded', function() {
 {% endif %}
 
 {% if p.award_count("shit") %}
-	<script src="/assets/js/bugs.js?v=55"></script>
+	<script defer src="/assets/js/bugs.js?v=55"></script>
 	{% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %}
 	{% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %}
 	<script>
@@ -928,7 +928,7 @@ window.addEventListener('DOMContentLoaded', function() {
 
 
 {% if p.award_count("fireflies") %}
-	<script src="/assets/js/fireflies.js?v=55"></script>
+	<script defer src="/assets/js/fireflies.js?v=55"></script>
 	{% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %}
 	{% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %}
 	<script>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 7868944c3..7c447bd02 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -4,7 +4,7 @@
 	{% set cc='COUNTRY CLUB' %}
 {% endif %}
 
-<script src="/assets/js/new_comments_count.js?v=53"></script>
+<script defer src="/assets/js/new_comments_count.js?v=53"></script>
 
 {% for p in listing %}
 
@@ -659,10 +659,9 @@ window.addEventListener('DOMContentLoaded', function() {
 
 <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
 
-<script src="/assets/js/popover.js?v=2"></script>
+<script defer src="/assets/js/popover.js?v=2"></script>
 
 <script>
-window.addEventListener('DOMContentLoaded', function() {
 	function expandText(id) {
 		document.getElementById('post-text-'+id).classList.toggle('d-none');
 		document.getElementsByClassName('text-expand-icon-'+id)[0].classList.toggle('fa-expand-alt');
@@ -685,8 +684,6 @@ window.addEventListener('DOMContentLoaded', function() {
 			html: true,
 		});
 	})
-
-});
 </script>
 
 {% if v %}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 1756798e5..96b5cc63c 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -169,9 +169,9 @@
 		{% endblock %}
 
 		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
-		<script src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
+		<script defer src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
 
-		<script src="/assets/js/submit.js?v=72"></script>
+		<script defer src="/assets/js/submit.js?v=72"></script>
 
 
 		{% include "emoji_modal.html" %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 181caa3a5..b70022347 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -783,7 +783,7 @@ window.addEventListener('DOMContentLoaded', function() {
 	}
 </style>
 
-<script src="/assets/js/userpage.js?v=72"></script>
+<script defer src="/assets/js/userpage.js?v=72"></script>
 
 
 {% if v %}