diff --git a/files/templates/comments.html b/files/templates/comments.html
index 92d355749..e0c8037c1 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -87,7 +87,7 @@
 
 		};
 
-		document.getElementById('reportCommentModal').on('hidden.bs.modal', function () {
+		document.getElementById('reportCommentModal').addEventListener('hidden.bs.modal', function () {
 
 		var button = document.getElementById("reportCommentButton");
 
@@ -465,14 +465,14 @@
 	};
 
 	var clipboard = new ClipboardJS('.copy-link');
-		clipboard.on('success', function(e) {
+		clipboard.addEventListener('success', function(e) {
 
 				jQuery(function($) {
 						document.getElementById('toast-success').toast('show');
 				})
 				console.log(e);
 		});
-		clipboard.on('error', function(e) {
+		clipboard.addEventListener('error', function(e) {
 
 				jQuery(function($) {
 						document.getElementById('toast-error').toast('show');
diff --git a/files/templates/gif_modal.html b/files/templates/gif_modal.html
index 6a785d501..a5855e48c 100644
--- a/files/templates/gif_modal.html
+++ b/files/templates/gif_modal.html
@@ -98,7 +98,7 @@
 
 		// When GIF keyboard is hidden, hide all GIFs
 
-		document.getElementById('gifModal').on('hidden.bs.modal', function (e) {
+		document.getElementById('gifModal').addEventListener('hidden.bs.modal', function (e) {
 
 		document.getElementById('gifSearch').value = null;
 
diff --git a/files/templates/log.html b/files/templates/log.html
index 79b57319c..e6bbfcf1a 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -18,14 +18,14 @@
 
 <script>
 	var clipboard = new ClipboardJS('.copy-link');
-		clipboard.on('success', function(e) {
+		clipboard.addEventListener('success', function(e) {
 
 				jQuery(function($) {
 						document.getElementById('toast-success').toast('show');
 				})
 				console.log(e);
 		});
-		clipboard.on('error', function(e) {
+		clipboard.addEventListener('error', function(e) {
 
 				jQuery(function($) {
 						document.getElementById('toast-error').toast('show');
diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html
index 95ce776c4..6cba89fbf 100644
--- a/files/templates/report_post_modal.html
+++ b/files/templates/report_post_modal.html
@@ -31,7 +31,7 @@
         }
     };
 
-    document.getElementById('reportPostModal').on('hidden.bs.modal', function () {
+    document.getElementById('reportPostModal').addEventListener('hidden.bs.modal', function () {
 
         var button = document.getElementById("reportPostButton");
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index fc5752b0c..deafaf055 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -18,14 +18,14 @@
 	<script>
 
 		var clipboard = new ClipboardJS('.copy-link');
-			clipboard.on('success', function(e) {
+			clipboard.addEventListener('success', function(e) {
 
 					jQuery(function($) {
 							document.getElementById('toast-success').toast('show');
 					})
 					console.log(e);
 			});
-			clipboard.on('error', function(e) {
+			clipboard.addEventListener('error', function(e) {
 
 					jQuery(function($) {
 							document.getElementById('toast-error').toast('show');
@@ -38,7 +38,7 @@
 
 		// Show confirm password field when user clicks email box
 
-		document.getElementById('new_email').on('input', function () {
+		document.getElementById('new_email').addEventListener('input', function () {
 
 			var id = document.getElementById("email-password");
 			var id2 = document.getElementById("email-password-label");
@@ -52,7 +52,7 @@
 	
 		// 2FA toggle modal
 
-		document.getElementById('2faModal').on('hidden.bs.modal', function () {
+		document.getElementById('2faModal').addEventListener('hidden.bs.modal', function () {
 
 			var box = document.getElementById("2faToggle");
 			
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 3516edffd..19fce1d65 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -12,7 +12,7 @@
 			//Signup js
 			// Display username and password requirements on input
 
-			document.getElementById('password-register').on('input', function () {
+			document.getElementById('password-register').addEventListener('input', function () {
 
 				var charCount = document.getElementById("password-register").value;
 				var id = document.getElementById("passwordHelpRegister");
@@ -31,7 +31,7 @@
 		
 			// Check username length, special chars
 
-			document.getElementById('username-register').on('input', function () {
+			document.getElementById('username-register').addEventListener('input', function () {
 
 				var charCount = document.getElementById("username-register").value;
 				var id = document.getElementById("usernameHelpRegister");
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 718435bff..275fe5080 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -3,14 +3,14 @@
 
 <script>
 	var clipboard = new ClipboardJS('.copy-link');
-		clipboard.on('success', function(e) {
+		clipboard.addEventListener('success', function(e) {
 
 				jQuery(function($) {
 						document.getElementById('toast-success').toast('show');
 				})
 				console.log(e);
 		});
-		clipboard.on('error', function(e) {
+		clipboard.addEventListener('error', function(e) {
 
 				jQuery(function($) {
 						document.getElementById('toast-error').toast('show');
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 28d44730b..f582a41f1 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -446,7 +446,7 @@
 				}
 			}
 
-			document.getElementById('file-upload').on('change', function(e){
+			document.getElementById('file-upload').addEventListener('change', function(e){
 				f=document.getElementById('file-upload');
 				document.getElementById('urlblock').addClass('d-none');
 				document.getElementById('filename-show').text(document.getElementById('file-upload')[0].files[0].name);