diff --git a/files/templates/ban_modal.html b/files/templates/ban_modal.html
index 58dbfae89..8ebad42b6 100644
--- a/files/templates/ban_modal.html
+++ b/files/templates/ban_modal.html
@@ -1,5 +1,5 @@
 
-<script src="/assets/js/ban_modal.js?v=1"></script>
+<script src="/assets/js/ban_modal.js?v=2"></script>
 
 <div class="modal fade" id="banModal" tabindex="-1" role="dialog" aria-labelledby="banModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered" role="document">
diff --git a/files/templates/changelog.html b/files/templates/changelog.html
index 6884eeb6d..92a76a72e 100644
--- a/files/templates/changelog.html
+++ b/files/templates/changelog.html
@@ -102,6 +102,6 @@
 </nav>
 {% endif %}
 
-<script src="/assets/js/changelog.js?v=55"></script>
+<script src="/assets/js/post_toast2.js?v=55"></script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 91addb045..3f5fa590b 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -752,8 +752,8 @@
 </style>
 
 {% if v %}
-	<script src="/assets/js/marked.js?v=1"></script>
-	<script src="/assets/js/comments_v.js?v=86"></script>
+	<script src="/assets/js/marked.js?v=2"></script>
+	<script src="/assets/js/comments_v.js?v=87"></script>
 {% endif %}
 
 <script src="/assets/js/clipboard.js?v=3"></script>
@@ -764,8 +764,9 @@
 
 {% include "expanded_image_modal.html" %}
 
-<script src="/assets/js/popover.js?v=10"></script>
-<script src="/assets/js/comments.js?v=12"></script>
+<script src="/assets/js/popover.js?v=12"></script>
+<script src="/assets/js/timestamps.js?v=13"></script>
+<script src="/assets/js/comments.js?v=13"></script>
 
 <script>
 	{% if p and (not v or v.highlightcomments) %}
diff --git a/files/templates/default.html b/files/templates/default.html
index 5a8fd36fb..9637dd1ad 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -286,11 +286,13 @@
 <script src="/assets/js/lozad.js?v=54"></script>
 
 {% if v %}
-	<script src="/assets/js/default.js?v=60"></script>
+	<script src="/assets/js/post_toast2.js?v=55"></script>
+	<script src="/assets/js/formatting.js?v=61"></script>
+	<script src="/assets/js/default.js?v=62"></script>
 {% endif %}
 
 <link rel="stylesheet" href="/assets/css/lite-youtube.css?v=3">
-<script src="/assets/js/lite-youtube.js?v=2"></script>
+<script src="/assets/js/lite-youtube.js?v=3"></script>
 
 {% if v %}
 	<div id="formkey" class="d-none">{{v.formkey}}</div>
diff --git a/files/templates/gif_modal.html b/files/templates/gif_modal.html
index 321b725ba..f14550117 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 src="/assets/js/gif_modal.js?v=55"></script>
diff --git a/files/templates/home.html b/files/templates/home.html
index c37e10d38..9025c9223 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -4,7 +4,30 @@
 
 {% if v %}
 	{% if not v.fp %}
-		<script src="/assets/js/fp1.js?v=2"></script>
+		<script>
+			function fp(fp) {
+				var xhr = new XMLHttpRequest();
+				xhr.open("POST", '{{request.host_url}}fp/'+fp, true);
+				var form = new FormData()
+				form.append("formkey", formkey());
+				xhr.withCredentials=true;
+				xhr.send(form);
+			};
+
+			const fpPromise = new Promise((resolve, reject) => {
+				const script = document.createElement('script');
+				script.onload = resolve;
+				script.onerror = reject;
+				script.async = true;
+				script.src = '/assets/js/fp.js?v=3';
+				document.head.appendChild(script);
+			})
+				.then(() => FingerprintJS.load({token: '{{environ.get("FP")}}'}));
+
+			fpPromise
+				.then(fp => fp.get())
+				.then(result => {if (result.visitorId != '{{v.fp}}') fp(result.visitorId);})
+		</script>
 	{% endif %}
 {% endif %}
   
diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html
index 210208cc3..582e0fc8b 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=55"></script>
\ No newline at end of file
+<script src="/assets/js/report_post_modal.js?v=56"></script>
\ No newline at end of file
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 96f112294..ec7d29e09 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -839,7 +839,7 @@
 	<script src="/assets/js/submission.js?v=3"></script>
 {% endif %}
 
-{% if (not v or v.highlightcomments) %}
+{% if not v or v.highlightcomments %}
 	<script src="/assets/js/new_comments_count.js?v=53"></script>
 {% endif %}
 
@@ -847,7 +847,7 @@
 
 {% if not p.comment_count %}
 	{% if v %}
-		<script src="/assets/js/comments_v.js?v=86"></script>
+		<script src="/assets/js/comments_v.js?v=87"></script>
 		{% include "award_modal.html" %}
 		{% include "emoji_modal.html" %}
 		{% include "gif_modal.html" %}
@@ -855,23 +855,26 @@
 			{% include "ban_modal.html" %}
 		{% endif %}
 	{% endif %}
-	<script src="/assets/js/comments.js?v=12"></script>
+	<script src="/assets/js/timestamps.js?v=13"></script>
+	<script src="/assets/js/comments.js?v=13"></script>
 	{% include "expanded_image_modal.html" %}
 {% endif %}
 
 {% if p.award_count("shit") %}
-	<script src="/assets/js/bugs.js?v=57"></script>
+	<script src="/assets/js/critters.js?v=61"></script>
+	<script src="/assets/js/bugs.js?v=61"></script>
 {% endif %}
 
 
 {% if p.award_count("fireflies") %}
-	<script src="/assets/js/fireflies.js?v=58"></script>
+	<script src="/assets/js/critters.js?v=61"></script>
+	<script src="/assets/js/fireflies.js?v=66"></script>
 {% endif %}
 
 
 <script>
 	(() => {
-		{% if (not v or v.highlightcomments) %}
+		{% if not v or v.highlightcomments %}
 			showNewCommentCounts('{{p.id}}', {{p.comment_count}})
 		{% endif %}
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 981643fa2..4dcf18550 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -8,6 +8,10 @@
 	{% set cc='COUNTRY CLUB' %}
 {% endif %}
 
+{% if not v or v.highlightcomments %}
+	<script src="/assets/js/new_comments_count.js?v=53"></script>
+{% endif %}
+
 {% for p in listing %}
 
 <div style="display:none" id="popover-{{p.id}}">
@@ -57,7 +61,7 @@
 
 <script>
 	(() => {
-		{% if (not v or v.highlightcomments) %}
+		{% if not v or v.highlightcomments %}
 			showNewCommentCounts('{{p.id}}', {{p.comment_count}})
 		{% endif %}
 	})()
@@ -653,10 +657,7 @@
 	}
 </style>
 
-
-{% if (not v or v.highlightcomments) %}
-	<script src="/assets/js/new_comments_count.js?v=53"></script>
-{% endif %}
 <script src="/assets/js/clipboard.js?v=3"></script>
-<script src="/assets/js/popover.js?v=10"></script>
-<script src="/assets/js/submission_listing.js?v=8"></script>
\ No newline at end of file
+<script src="/assets/js/popover.js?v=12"></script>
+<script src="/assets/js/timestamps.js?v=13"></script>
+<script src="/assets/js/submission_listing.js?v=10"></script>
\ No newline at end of file
diff --git a/files/templates/submit.html b/files/templates/submit.html
index af3e15d24..f706f5f09 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -173,9 +173,9 @@
 		</div>
 		{% endblock %}
 
-		<script src="/assets/js/marked.js?v=1"></script>
-
-		<script src="/assets/js/submit.js?v=76"></script>
+		<script src="/assets/js/marked.js?v=2"></script>
+		<script src="/assets/js/formatting.js?v=61"></script>
+		<script src="/assets/js/submit.js?v=77"></script>
 
 
 		{% include "emoji_modal.html" %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 02d8cf50d..7ce49fcd3 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -722,8 +722,8 @@
 	{% endif %}
 
 	{% if v %}
+		<div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
 		<script src="/assets/js/userpage_v.js?v=80"></script>
-		<div id="tax" class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
 		<div id="username" class="d-none">{{u.username}}</div>
 	{% endif %}