From efc793292a7f19a8565f310a10e3e74b2fa82ddb Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Sat, 25 Sep 2021 23:13:52 +0200
Subject: [PATCH] sdf

---
 compilecss.py                                 |    4 +-
 files/templates/2fa_modal.html                |   68 -
 files/templates/authforms.html                |    9 +-
 files/templates/award_modal.html              |  183 ++-
 files/templates/ban_modal.html                |   25 +
 files/templates/comments.html                 |  533 ++++++-
 files/templates/default.html                  | 1240 +++--------------
 files/templates/delete_comment_modal.html     |   28 -
 files/templates/delete_post_modal.html        |   27 +
 files/templates/emoji_modal.html              |  109 ++
 files/templates/expanded_image_modal.html     |   33 +
 files/templates/flag_comment_modal.html       |   38 -
 files/templates/gif_modal.html                |  142 ++
 files/templates/log.html                      |    6 +-
 files/templates/login.html                    |   13 +-
 files/templates/login_2fa.html                |    8 +-
 files/templates/mobile_navigation_bar.html    |   53 +
 files/templates/notifications.html            |    3 -
 ...post_modal.html => report_post_modal.html} |   52 +
 files/templates/search.html                   |    4 +-
 files/templates/settings.html                 |   82 +-
 files/templates/settings2.html                |   17 +-
 files/templates/sign_up.html                  |   14 +-
 files/templates/submission.html               |   22 +
 files/templates/submission_listing.html       |    4 +-
 files/templates/submit.html                   |   13 +-
 files/templates/userpage.html                 |   67 +-
 push.sh                                       |   16 +-
 28 files changed, 1549 insertions(+), 1264 deletions(-)
 delete mode 100644 files/templates/2fa_modal.html
 delete mode 100644 files/templates/delete_comment_modal.html
 delete mode 100644 files/templates/flag_comment_modal.html
 rename files/templates/{flag_post_modal.html => report_post_modal.html} (50%)

diff --git a/compilecss.py b/compilecss.py
index e54852d29..923a70f22 100644
--- a/compilecss.py
+++ b/compilecss.py
@@ -1,7 +1,7 @@
 for theme in ['transparent', 'win98', 'midnight', 'dark', 'light', 'coffee', 'tron', '4chan']:
-	with open(f"./files/assets/style/{theme}_ff66ac.css", encoding='utf-8') as t:
+	with open(f"./files/assets/css/{theme}_ff66ac.css", encoding='utf-8') as t:
 		text = t.read()
 		for color in ['ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','62ca56','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58']:
 			newtext = text.replace("ff66ac", color).replace("ff4097", color).replace("ff1a83", color).replace("ff3390", color).replace("rgba(255, 102, 172, 0.25)", color)
-			with open(f"./files/assets/style/{theme}_{color}.css", encoding='utf-8', mode='w') as nt:
+			with open(f"./files/assets/css/{theme}_{color}.css", encoding='utf-8', mode='w') as nt:
 				nt.write(newtext)
\ No newline at end of file
diff --git a/files/templates/2fa_modal.html b/files/templates/2fa_modal.html
deleted file mode 100644
index 3b9afaccc..000000000
--- a/files/templates/2fa_modal.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!-- 2FA Modal -->
-
-<div class="modal fade" id="2faModal" tabindex="-1" role="dialog" aria-labelledby="2faModalTitle" aria-hidden="true">
-	<div class="modal-dialog modal-dialog-centered" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h5 class="modal-title">{% if mfa_secret %}Setup two-step login{% elif mfa_secret and not v.email %}Email required for two-step login{% else %}Disable two-step login{% endif %}</h5>
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="far fa-times"></i></span>
-				</button>
-			</div>
-			{% if mfa_secret %}
-			<div>
-				<form action="/settings/security" method="post">
-					<input type="hidden" name="formkey" value="{{v.formkey}}">
-					<input type="hidden" name="2fa_secret" value="{{mfa_secret}}">
-					<div class="modal-body">
-						<p>
-							<span class="font-weight-bold">Step 1:</span> Scan this barcode (or enter the code) using a two-factor authentication app such as Google Authenticator or Authy.
-						</p>
-						<div class="text-center mb-3">
-							<img loading="lazy" class="img-fluid" style="width: 175px;" src="/2faqr/{{mfa_secret}}">
-							<pre></pre>
-							<div class="text-small text-muted">Or enter this code: {{mfa_secret}}</div>
-						</div>
-						<p>
-							<span class="font-weight-bold">Step 2:</span> Enter the six-digit code generated in the authenticator app and your {{'SITE_NAME' | app_config}} account password.
-						</p>
-						<label for="2fa_input">6-digit code</label>
-						<input type="text" class="form-control mb-2" id="2fa_input" name="2fa_token" placeholder="# # # # # #" required>
-
-						<label for="2fa_input_password">Password</label>
-						<input type="password" autocomplete="new-password" class="form-control mb-2" id="2fa_input_password" name="password" oninput="document.getElementById('enable2faButton').disabled=false" autocomplete="off" required>
-					</div>
-					<div class="modal-footer">
-						<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
-						<input id="enable2faButton" class="btn btn-primary" type="submit" value="Enable 2-step login" disabled>
-					</div>
-				</form>
-			</div>
-			{% else %}
-			<div>
-				<form action="/settings/security" method="post">
-					<input type="hidden" name="formkey" value="{{v.formkey}}">
-					<input type="hidden" name="2fa_secret" value="{{mfa_secret}}">
-					<div class="modal-body">
-
-						<div class="alert alert-warning" role="alert">
-							<i class="fas fa-info-circle"></i>
-							To disable two-step login, please enter your {{'SITE_NAME' | app_config}} account password and the 6-digit code generated in your authentication app. If you no longer have your two-step device, <a href="/lost_2fa">click here</a>.
-						</div>
-
-						<label for="2fa_input_password">Password</label>
-						<input type="password" autocomplete="new-password" class="form-control mb-2" id="2fa_input_password" name="password" autocomplete="off" required>
-
-						<label for="2fa_input">6-digit code</label>
-						<input type="text" class="form-control mb-2" id="2fa_input" name="2fa_remove" placeholder="# # # # # #" oninput="document.getElementById('disable2faButton').disabled=false" required>
-					</div>
-					<div class="modal-footer">
-						<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
-						<input id="disable2faButton" class="btn btn-primary" type="submit" value="Disable 2-step login" disabled>
-					</div>
-				</form>
-			</div>
-			{% endif %}
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index b352c22e2..e37e7cb09 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -12,19 +12,16 @@
 
 		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
 
-		<!-- Bootstrap core CSS -->
-		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
-				integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
 
 		<!-- Font Awesome -->
 		<link href="/assets/fontawesome/css/all.css" rel="stylesheet"> <!--load all styles -->
 
 		<!-- {{'SITE_NAME' | app_config}} CSS -->
 		{% if v %}
-			<link rel="stylesheet" href="/assets/style/{{v.theme}}_{{v.themecolor}}.css">
-			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/style/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
+			<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css">
+			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
-			<link rel="stylesheet" href="/assets/style/{{'DEFAULT_THEME' | app_config}}.css">
+			<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css">
 		{% endif %}
 
 </head>
diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html
index 3c638d503..2d0f860a7 100644
--- a/files/templates/award_modal.html
+++ b/files/templates/award_modal.html
@@ -1,10 +1,181 @@
 <script>
-function bruh(kind) {
-	document.getElementById('giveaward').disabled=false;
-	document.getElementById('kind').value=kind;
-	try {document.getElementsByClassName('picked')[0].classList.toggle('picked');} catch(e) {}
-	document.getElementById(kind).classList.toggle('picked')
-}
+	// Voting
+
+	function post_vote(url, callback) {
+	var xhr = new XMLHttpRequest();
+	xhr.open("POST", url, true);
+	var form = new FormData()
+	form.append("formkey", formkey());
+	xhr.withCredentials=true;
+
+	xhr.onload = function() {
+		if (xhr.status==204) {}
+			else if (xhr.status >= 200 && xhr.status < 300) {
+				$('#toast-post-success').toast('dispose');
+				$('#toast-post-success').toast('show');
+				document.getElementById('toast-post-success-text').innerText = JSON.parse(xhr.response)["message"];
+				callback(xhr)
+				return true
+
+			} else if (xhr.status >= 300 && xhr.status < 400) {
+				window.location.href = JSON.parse(xhr.response)["redirect"]
+			} else {
+				data=JSON.parse(xhr.response);
+				
+				$('#toast-post-error').toast('dispose');
+				$('#toast-post-error').toast('show');
+				document.getElementById('toast-post-error-text').innerText = data["error"];
+				return false
+				
+			}
+		};
+
+		xhr.send(form);
+
+	}
+
+	var upvote = function(event) {
+
+		var type = event.target.dataset.contentType;
+		var id = event.target.dataset.idUp;
+
+		var downvoteButton = document.getElementsByClassName(type + '-' + id + '-down');
+		var upvoteButton = document.getElementsByClassName(type + '-' + id + '-up');
+		var scoreText = document.getElementsByClassName(type + '-score-' + id);
+
+		for (var j = 0; j < upvoteButton.length && j < downvoteButton.length && j < scoreText.length; j++) {
+
+			var thisUpvoteButton = upvoteButton[j];
+			var thisDownvoteButton = downvoteButton[j];
+			var thisScoreText = scoreText[j];
+			var thisScore = Number(thisScoreText.textContent);
+
+			if (thisUpvoteButton.classList.contains('active')) {
+				thisUpvoteButton.classList.remove('active')
+				thisScoreText.textContent = thisScore - 1
+				voteDirection = "0"
+			} else if (thisDownvoteButton.classList.contains('active')) {
+				thisUpvoteButton.classList.add('active')
+				thisDownvoteButton.classList.remove('active')
+				thisScoreText.textContent = thisScore + 2
+				voteDirection = "1"
+			} else {
+				thisUpvoteButton.classList.add('active')
+				thisScoreText.textContent = thisScore + 1
+				voteDirection = "1"
+			}
+
+			if (thisUpvoteButton.classList.contains('active')) {
+				thisScoreText.classList.add('score-up')
+				thisScoreText.classList.remove('score-down')
+				thisScoreText.classList.remove('score')
+			} else if (thisDownvoteButton.classList.contains('active')) {
+				thisScoreText.classList.add('score-down')
+				thisScoreText.classList.remove('score-up')
+				thisScoreText.classList.remove('score')
+			} else {
+				thisScoreText.classList.add('score')
+				thisScoreText.classList.remove('score-up')
+				thisScoreText.classList.remove('score-down')
+			}
+		}
+
+		post_vote("/vote/" + type + "/" + id + "/" + voteDirection);
+		
+	}
+
+	var downvote = function(event) {
+
+		var type = event.target.dataset.contentType;
+		var id = event.target.dataset.idDown;
+
+		var downvoteButton = document.getElementsByClassName(type + '-' + id + '-down');
+		var upvoteButton = document.getElementsByClassName(type + '-' + id + '-up');
+		var scoreText = document.getElementsByClassName(type + '-score-' + id);
+
+		for (var j = 0; j < upvoteButton.length && j < downvoteButton.length && j < scoreText.length; j++) {
+
+			var thisUpvoteButton = upvoteButton[j];
+			var thisDownvoteButton = downvoteButton[j];
+			var thisScoreText = scoreText[j];
+			var thisScore = Number(thisScoreText.textContent);
+
+			if (thisDownvoteButton.classList.contains('active')) {
+				thisDownvoteButton.classList.remove('active')
+				thisScoreText.textContent = thisScore + 1
+				voteDirection = "0"
+			} else if (thisUpvoteButton.classList.contains('active')) {
+				thisDownvoteButton.classList.add('active')
+				thisUpvoteButton.classList.remove('active')
+				thisScoreText.textContent = thisScore - 2
+				voteDirection = "-1"
+			} else {
+				thisDownvoteButton.classList.add('active')
+				thisScoreText.textContent = thisScore - 1
+				voteDirection = "-1"
+			}
+
+			if (thisUpvoteButton.classList.contains('active')) {
+				thisScoreText.classList.add('score-up')
+				thisScoreText.classList.remove('score-down')
+				thisScoreText.classList.remove('score')
+			} else if (thisDownvoteButton.classList.contains('active')) {
+				thisScoreText.classList.add('score-down')
+				thisScoreText.classList.remove('score-up')
+				thisScoreText.classList.remove('score')
+			} else {
+				thisScoreText.classList.add('score')
+				thisScoreText.classList.remove('score-up')
+				thisScoreText.classList.remove('score-down')
+			}
+		}
+
+		post_vote("/vote/" + type + "/" + id + "/" + voteDirection);
+		
+	}
+
+
+	var register_votes = function() {
+		var upvoteButtons = document.getElementsByClassName('upvote-button')
+
+		var downvoteButtons = document.getElementsByClassName('downvote-button')
+
+		var voteDirection = 0
+
+		for (var i = 0; i < upvoteButtons.length; i++) {
+			upvoteButtons[i].addEventListener('click', upvote, false);
+			upvoteButtons[i].addEventListener('keydown', function(event) {
+				if (event.keyCode === 13) {
+					upvote(event)
+				}
+			}, false)
+		};
+
+		for (var i = 0; i < downvoteButtons.length; i++) {
+			downvoteButtons[i].addEventListener('click', downvote, false);
+			downvoteButtons[i].addEventListener('keydown', function(event) {
+				if (event.keyCode === 13) {
+					downvote(event)
+				}
+			}, false)
+		};
+	}
+
+	register_votes()
+
+	// award modal
+
+	function awardModal(link) {
+		var target = document.getElementById("awardTarget");
+		target.action = link;
+	}
+
+	function bruh(kind) {
+		document.getElementById('giveaward').disabled=false;
+		document.getElementById('kind').value=kind;
+		try {document.getElementsByClassName('picked')[0].classList.toggle('picked');} catch(e) {}
+		document.getElementById(kind).classList.toggle('picked')
+	}
 </script>
 
 <div class="modal fade" id="awardModal" tabindex="-1" role="dialog" aria-labelledby="awardModalTitle" aria-hidden="true">
diff --git a/files/templates/ban_modal.html b/files/templates/ban_modal.html
index c420645ad..c4e9e191a 100644
--- a/files/templates/ban_modal.html
+++ b/files/templates/ban_modal.html
@@ -1,4 +1,29 @@
 
+<script>
+		const banModal = function(link, id, name) {
+			document.getElementById("banModalTitle").innerHTML = `Ban @${name}`;
+			document.getElementById("ban-modal-link").value = link;
+			document.getElementById("banUserButton").innerHTML = `Ban @${name}`;
+
+			document.getElementById("banUserButton").onclick = function() {
+				let fd = new FormData(document.getElementById("banModalForm"));
+				fd.append("formkey", formkey());
+
+				let xhr = new XMLHttpRequest();
+				xhr.open("POST", `/ban_user/${id}?form`, true);
+				xhr.withCredentials = true;
+
+				xhr.onload = function(){
+					$('#toast-post-success').toast('dispose');
+					$('#toast-post-success').toast('show');
+					document.getElementById('toast-post-success-text').innerHTML = `@${name} banned`;
+				}
+
+				xhr.send(fd);
+			}
+		};
+</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">
 		<div class="modal-content">
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 6c00eb5d0..1c0c35842 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -1,7 +1,469 @@
 
 <script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script>
 
+{% if v %}
+	<script>
+		function post_toast3(url, button1, button2) {
+			var xhr = new XMLHttpRequest();
+			xhr.open("POST", url, true);
+			var form = new FormData()
+
+			if(typeof data === 'object' && data !== null) {
+				for(let k of Object.keys(data)) {
+						form.append(k, data[k]);
+				}
+			}
+
+
+			form.append("formkey", formkey());
+			xhr.withCredentials=true;
+
+			xhr.onload = function() {
+				if (xhr.status >= 200 && xhr.status < 300) {
+					$('#toast-post-success').toast('dispose');
+					$('#toast-post-success').toast('show');
+					try {
+						document.getElementById('toast-post-success-text').innerText = JSON.parse(xhr.response)["message"];
+					} catch(e) {
+						document.getElementById('toast-post-success-text').innerText = "Action successful!";
+					}
+					return true
+
+				} else if (xhr.status >= 300 && xhr.status < 400) {
+					window.location.href = JSON.parse(xhr.response)["redirect"]
+				} else {
+					try {
+						data=JSON.parse(xhr.response);
+
+						$('#toast-post-error').toast('dispose');
+						$('#toast-post-error').toast('show');
+						document.getElementById('toast-post-error-text').innerText = data["error"];
+						return false
+					} catch(e) {
+						$('#toast-post-success').toast('dispose');
+						$('#toast-post-error').toast('dispose');
+						$('#toast-post-error').toast('show');
+						document.getElementById('toast-post-error-text').innerText = "Error. Try again later.";
+						return false
+					}
+				}
+			};
+
+			xhr.send(form);
+
+			document.getElementById(button1).classList.toggle("d-md-inline-block");
+			document.getElementById(button2).classList.toggle("d-md-inline-block");
+		}
+
+		//reporting
+		// Report Comment
+
+		report_commentModal = function(id, author) {
+
+		document.getElementById("comment-author").textContent = author;
+
+		//offtopic.disabled=true;
+
+		document.getElementById("reportCommentButton").onclick = function() {
+
+			this.innerHTML='<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Reporting comment';
+			this.disabled = true;
+			var xhr = new XMLHttpRequest();
+			xhr.open("POST", '/flag/comment/'+id, true);
+			var form = new FormData()
+			form.append("formkey", formkey());
+			form.append("reason", document.getElementById("reason-comment").value);
+
+			xhr.withCredentials=true;
+
+			xhr.onload=function() {
+				document.getElementById("reportCommentFormBefore").classList.add('d-none');
+				document.getElementById("reportCommentFormAfter").classList.remove('d-none');
+			};
+
+			xhr.onerror=function(){alert(errortext)};
+			xhr.send(form);
+		}
+
+		};
+
+		$('#reportCommentModal').on('hidden.bs.modal', function () {
+
+		var button = document.getElementById("reportCommentButton");
+
+		var beforeModal = document.getElementById("reportCommentFormBefore");
+		var afterModal = document.getElementById("reportCommentFormAfter");
+
+		button.innerHTML='Report comment';
+		button.disabled= false;
+		afterModal.classList.add('d-none');
+
+		if ( beforeModal.classList.contains('d-none') ) {
+			beforeModal.classList.remove('d-none');
+		}
+
+		});
+
+		//Commenting form
+
+		// Expand comment box on focus, hide otherwise
+
+		$('.comment-box').focus(function (event) {
+			event.preventDefault();
+
+			$(this).parent().parent().addClass("collapsed");
+
+		});
+
+		// Open comment reply box
+
+		function openReplyBox(id) {
+			const element = document.getElementById(`reply-to-${id}`);
+			element.classList.remove('d-none')
+
+			element.getElementsByTagName('textarea')[0].focus()
+		}
+
+		// Comment edit form
+
+		toggleEdit=function(id){
+			comment=document.getElementById("comment-text-"+id);
+			form=document.getElementById("comment-edit-"+id);
+			box=document.getElementById('edit-box-comment-'+id);
+			actions = document.getElementById('comment-' + id +'-actions');
+
+			comment.classList.toggle("d-none");
+			form.classList.toggle("d-none");
+			actions.classList.toggle("d-none");
+			autoExpand(box);
+		};
+
+
+		// Delete Comment
+
+		function delete_commentModal(id,button1,button2) {
+
+			// Passed data for modal
+
+			document.getElementById("deleteCommentButton").onclick = function() {	
+
+				this.innerHTML='<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Deleting comment';	
+				this.disabled = true; 
+				post('/delete/comment/' + id,
+					callback = function() {
+
+						location.reload();
+					}
+					)
+			}
+
+			document.getElementById(button1).classList.toggle("d-md-inline-block");
+			document.getElementById(button2).classList.toggle("d-md-inline-block");
+
+			};
+
+		function delete_commentModal2(id,button1,button2) {
+
+			// Passed data for modal
+
+			document.getElementById("deleteCommentButton").onclick = function() {	
+
+				this.innerHTML='<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Deleting comment';	
+				this.disabled = true; 
+				post('/delete/comment/' + id,
+					callback = function() {
+
+						location.reload();
+					}
+					)
+			}
+
+			document.getElementById(button1).classList.toggle("d-none");
+			document.getElementById(button2).classList.toggle("d-none");
+		};
+
+
+		post_comment=function(fullname){
+
+
+			var form = new FormData();
+
+			form.append('formkey', formkey());
+			form.append('parent_fullname', fullname);
+			form.append('submission', document.getElementById('reply-form-submission-'+fullname).value);
+			form.append('body', document.getElementById('reply-form-body-'+fullname).value);
+			form.append('file', document.getElementById('file-upload-reply-'+fullname).files[0]);
+			var xhr = new XMLHttpRequest();
+			xhr.open("post", "/comment");
+			xhr.withCredentials=true;
+			xhr.onload=function(){
+				if (xhr.status==200) {
+					commentForm=document.getElementById('comment-form-space-'+fullname);
+					commentForm.innerHTML=JSON.parse(xhr.response)["html"];
+					$('#toast-comment-success').toast('dispose');
+					$('#toast-comment-error').toast('dispose');
+					$('#toast-comment-success').toast('show');
+				}
+				else {
+					var commentError = document.getElementById("comment-error-text");
+					$('#toast-comment-success').toast('dispose');
+					$('#toast-comment-error').toast('dispose');
+					$('#toast-comment-error').toast('show');
+					commentError.textContent = JSON.parse(xhr.response)["error"];
+				}
+			}
+			xhr.send(form)
+
+			document.getElementById('save-reply-to-'+fullname).classList.add('disabled');
+
+		}
+
+		post_reply=function(id){
+
+			var form = new FormData();
+
+			form.append('formkey', formkey());
+			form.append('parent_id', id);
+			form.append('body', document.getElementById('reply-form-body-'+id).value);
+			var xhr = new XMLHttpRequest();
+			xhr.open("post", "/reply");
+			xhr.withCredentials=true;
+			xhr.onload=function(){
+				if (xhr.status==200) {
+					commentForm=document.getElementById('comment-form-space-'+id);
+					commentForm.innerHTML=JSON.parse(xhr.response)["html"];
+					$('#toast-comment-success').toast('dispose');
+					$('#toast-comment-error').toast('dispose');
+					$('#toast-comment-success').toast('show');
+				}
+				else {
+					var commentError = document.getElementById("comment-error-text");
+					$('#toast-comment-success').toast('dispose');
+					$('#toast-comment-error').toast('dispose');
+					$('#toast-comment-error').toast('show');
+					commentError.textContent = JSON.parse(xhr.response)["error"];
+				}
+			}
+			xhr.send(form)
+
+			document.getElementById('save-reply-to-'+id).classList.add('disabled');
+
+			}
+
+			comment_edit=function(id){
+
+				var commentError = document.getElementById("comment-error-text");
+
+				var form = new FormData();
+
+				form.append('formkey', formkey());
+				form.append('body', document.getElementById('comment-edit-body-'+id).value);
+				form.append('file', document.getElementById('file-edit-reply-'+id).files[0]);
+
+				var xhr = new XMLHttpRequest();
+				xhr.open("post", "/edit_comment/"+id);
+				xhr.withCredentials=true;
+				xhr.onload=function(){
+					if (xhr.status==200) {
+						commentForm=document.getElementById('comment-text-'+id);
+						commentForm.innerHTML=JSON.parse(xhr.response)["html"];
+						document.getElementById('cancel-edit-'+id).click()
+						$('#toast-comment-success').toast('dispose');
+						$('#toast-comment-error').toast('dispose');
+						$('#toast-comment-success').toast('show');
+					}
+					else {
+						$('#toast-comment-success').toast('dispose');
+						$('#toast-comment-error').toast('dispose');
+						$('#toast-comment-error').toast('show');
+						commentError.textContent = JSON.parse(xhr.response)["error"];
+					}
+				}
+				xhr.send(form)
+
+			}
+	</script>
+{% endif %}
+
+
+{% if v and v.admin_level == 6 %}
+	<script>
+		//comment modding
+		function removeComment(post_id,button1,button2) {
+			url="/ban_comment/"+post_id
+
+			callback=function(){
+				document.getElementById("comment-"+post_id+"-only").classList.add("banned");
+
+				button=document.getElementById("moderate-"+post_id);
+				button.onclick=function(){approveComment(post_id)};
+				button.innerHTML='<i class="fas fa-clipboard-check"></i>Approve'
+			}
+			post(url, callback, "Comment has been removed.")
+			
+
+			if (typeof button1 !== 'undefined') {
+				document.getElementById(button1).classList.toggle("d-md-inline-block");
+				document.getElementById(button2).classList.toggle("d-md-inline-block");
+			}
+		};
+
+		function approveComment(post_id,button1,button2) {
+			url="/unban_comment/"+post_id
+
+			callback=function(){
+				document.getElementById("comment-"+post_id+"-only").classList.remove("banned");
+
+				button=document.getElementById("moderate-"+post_id);
+				button.onclick=function(){removeComment(post_id)};
+				button.innerHTML='<i class="fas fa-trash-alt"></i>Remove'
+			}
+
+			post(url, callback, "Comment has been approved.")
+
+			if (typeof button1 !== 'undefined') {
+				document.getElementById(button1).classList.toggle("d-md-inline-block");
+				document.getElementById(button2).classList.toggle("d-md-inline-block");
+			}
+		}
+
+
+		function removeComment2(post_id,button1,button2) {
+			url="/ban_comment/"+post_id
+
+			callback=function(){
+				document.getElementById("comment-"+post_id+"-only").classList.add("banned");
+
+				button=document.getElementById("moderate-"+post_id);
+				button.onclick=function(){approveComment(post_id)};
+				button.innerHTML='<i class="fas fa-clipboard-check"></i>Approve'
+			}
+			post(url, callback, "Comment has been removed.")
+			
+
+			if (typeof button1 !== 'undefined') {
+				document.getElementById(button1).classList.toggle("d-none");
+				document.getElementById(button2).classList.toggle("d-none");
+			}
+		};
+
+		function approveComment2(post_id,button1,button2) {
+			url="/unban_comment/"+post_id
+
+			callback=function(){
+				document.getElementById("comment-"+post_id+"-only").classList.remove("banned");
+
+				button=document.getElementById("moderate-"+post_id);
+				button.onclick=function(){removeComment(post_id)};
+				button.innerHTML='<i class="fas fa-trash-alt"></i>Remove'
+			}
+
+			post(url, callback, "Comment has been approved.")
+
+			if (typeof button1 !== 'undefined') {
+				document.getElementById(button1).classList.toggle("d-none");
+				document.getElementById(button2).classList.toggle("d-none");
+			}
+		}
+
+
+		admin_comment=function(cid,button1,button2,distinguish){
+
+
+			var xhr = new XMLHttpRequest();
+			xhr.open("post", "/distinguish_comment/"+cid);
+
+			var form = new FormData();
+
+			form.append('formkey', formkey());
+
+			xhr.withCredentials=true;
+			xhr.onload=function(){
+				if (xhr.status==200) {
+					comment=document.getElementById('comment-'+cid+'-only');
+					comment.innerHTML=JSON.parse(xhr.response)["html"];
+				}
+				else {
+					var commentError = document.getElementById("comment-error-text");
+					$('#toast-comment-success').toast('dispose');
+					$('#toast-comment-error').toast('dispose');
+					$('#toast-comment-error').toast('show');
+					commentError.textContent = JSON.parse(xhr.response)["error"];
+				}
+			}
+			xhr.send(form)
+
+			document.getElementById(button1).classList.toggle("d-md-inline-block");
+			document.getElementById(button2).classList.toggle("d-md-inline-block");
+
+			$('#toast-post-success').toast('dispose');
+			$('#toast-post-success').toast('show');
+			if (distinguish=='yes') {
+				document.getElementById('toast-post-success-text').innerText = "Comment distinguished!";
+			}
+			else {
+				document.getElementById('toast-post-success-text').innerText = "Comment undistinguished!";
+			}
+		}
+
+			
+		admin_comment2=function(cid,button1,button2,distinguish){
+			var xhr = new XMLHttpRequest();
+			xhr.open("post", "/distinguish_comment/"+cid);
+
+			var form = new FormData();
+
+			form.append('formkey', formkey());
+
+			xhr.withCredentials=true;
+			xhr.onload=function(){
+				if (xhr.status==200) {
+					comment=document.getElementById('comment-'+cid+'-only');
+					comment.innerHTML=JSON.parse(xhr.response)["html"];
+				}
+				else {
+					var commentError = document.getElementById("comment-error-text");
+					$('#toast-comment-success').toast('dispose');
+					$('#toast-comment-error').toast('dispose');
+					$('#toast-comment-error').toast('show');
+					commentError.textContent = JSON.parse(xhr.response)["error"];
+				}
+			}
+			xhr.send(form)
+
+			document.getElementById(button1).classList.toggle("d-none");
+			document.getElementById(button2).classList.toggle("d-none");
+
+			$('#toast-post-success').toast('dispose');
+			$('#toast-post-success').toast('show');
+			if (distinguish=='yes') {
+				document.getElementById('toast-post-success-text').innerText = "Comment distinguished!";
+			}
+			else {
+				document.getElementById('toast-post-success-text').innerText = "Comment undistinguished!";
+			}
+		}
+	</script>
+{% endif %}
+
 <script>
+
+	// comment collapse
+
+	// Toggle comment collapse
+
+	function collapse_comment(comment_id) {
+		const comment = "comment-" + comment_id
+		const element = document.getElementById(comment)
+		const closed = element.classList.toggle("collapsed")
+		const top = element.getBoundingClientRect().y
+
+		if (closed && top < 0) {
+			element.scrollIntoView()
+			window.scrollBy(0, - 100)
+		}
+	};
+
 	var clipboard = new ClipboardJS('.copy-link');
 		clipboard.on('success', function(e) {
 
@@ -302,8 +764,6 @@
 						
 						{% if v %}
 							<li class="list-inline-item text-muted d-none d-md-inline-block"><a href="javascript:void(0)" data-toggle="modal" data-target="#reportCommentModal" onclick="report_commentModal('{{c.id}}','{{c.author.username}}',)"><i class="fas fa-flag fa-fw"></i>Report</a></li>
-						{% else %}
-							<li class="list-inline-item text-muted d-none d-md-inline-block"><a href="javascript:void(0)" data-toggle="modal" data-target="#reportCommentModal" onclick=""><i class="fas fa-flag fa-fw"></i>Report</a></li>
 						{% endif %}
 
 
@@ -548,11 +1008,76 @@
 	{% include "gif_modal.html" %}
 	{% include "emoji_modal.html" %}
 	{% include "award_modal.html" %}
-	{% include "delete_comment_modal.html" %}
 	{% if v.admin_level == 6 %}
 		{% include "ban_modal.html" %}
 	{% endif %}
+
+	<!-- Delete Comment Modal -->
+	<div class="modal fade" id="deleteCommentModal" tabindex="-1" role="dialog" aria-labelledby="deleteCommentModalTitle" aria-hidden="true">
+		<div class="modal-dialog modal-dialog-centered" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title">Delete comment?</h5>
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+						<span aria-hidden="true"><i class="far fa-times"></i></span>
+					</button>
+				</div>
+				
+				<div class="modal-body text-center">
+
+					<div class="py-4">
+						<i class="fad fa-trash-alt text-muted" style="font-size: 3.5rem;"></i>
+					</div>
+
+					<p>Your comment will be removed everywhere on {{'SITE_NAME' | app_config}}. This action can be undone.</p>
+				</div>
+				
+				<div class="modal-footer">
+					<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
+					<button id="deleteCommentButton" class="btn btn-danger">Delete comment</button>
+				</div>
+				
+			</div>
+		</div>
+	</div>
+
+	<div class="modal fade" id="reportCommentModal" tabindex="-1" role="dialog" aria-labelledby="reportCommentModalTitle" aria-hidden="true">
+		<div class="modal-dialog modal-dialog-centered" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title">Report <span id="comment-author"></span>'s comment</h5>
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+						<span aria-hidden="true"><i class="far fa-times"></i></span>
+					</button>
+				</div>
+				<!-- Before report is made, show this -->
+				<div class="" id="reportCommentFormBefore">
+					<form id="report-comment-form" method="post">
+						<div class="modal-body">
+							<div class="h6">We're sorry something here is wrong.</div>
+							<small class="form-text text-muted">Please enter a reason for reporting below.</small>
+							<pre></pre>
+							<input maxlength="100" id="reason-comment" class="form-control"/>
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
+							<button type="button" id="reportCommentButton" class="btn btn-danger">Report comment</button>
+						</div>
+					</form>
+				</div>
+				<!-- After report is made, show this -->
+				<div class="d-none" id="reportCommentFormAfter">
+					<div class="modal-body">
+						<div class="h6">Thank you for reporting this comment!</div>
+						<small class="form-text text-muted">We'll take it from here.</small>
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 {% endif %}
 {% include "expanded_image_modal.html" %}
-{% include "flag_comment_modal.html" %}
 </body>
\ No newline at end of file
diff --git a/files/templates/default.html b/files/templates/default.html
index 0b2d56875..a344af303 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -4,855 +4,212 @@
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
 	<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"></script>
 	<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+	<script src="/assets/js/general39.js"></script>
 
 	{% if v and v.agendaposter %}
-	<script>
-		/*
-		Bug.js - https://github.com/Auz/Bug
-		Released under MIT-style license.
-		Original Screen Bug http://screen-bug.googlecode.com/git/index.html
-		*/
-		var BugDispatch={options:{minDelay:500,maxDelay:1E4,minBugs:2,maxBugs:20,minSpeed:5,maxSpeed:10,maxLargeTurnDeg:150,maxSmallTurnDeg:10,maxWiggleDeg:5,imageSprite:"fly-sprite.webp",bugWidth:13,bugHeight:14,num_frames:5,zoom:10,canFly:!0,canDie:!0,numDeathTypes:3,monitorMouseMovement:!1,eventDistanceToBug:40,minTimeBetweenMultipy:1E3,mouseOver:"random"},initialize:function(a){this.options=mergeOptions(this.options,a);this.options.minBugs>this.options.maxBugs&&(this.options.minBugs=this.options.maxBugs);
-		this.modes=["multiply","nothing"];this.options.canFly&&this.modes.push("fly","flyoff");this.options.canDie&&this.modes.push("die");-1==this.modes.indexOf(this.options.mouseOver)&&(this.options.mouseOver="random");this.transform=null;this.transforms={Moz:function(a){this.bug.style.MozTransform=a},webkit:function(a){this.bug.style.webkitTransform=a},O:function(a){this.bug.style.OTransform=a},ms:function(a){this.bug.style.msTransform=a},Khtml:function(a){this.bug.style.KhtmlTransform=a},w3c:function(a){this.bug.style.transform=
-		a}};if("transform"in document.documentElement.style)this.transform=this.transforms.w3c;else{var b=["Moz","webkit","O","ms","Khtml"],c=0;for(c=0;c<b.length;c++)if(b[c]+"Transform"in document.documentElement.style){this.transform=this.transforms[b[c]];break}}if(this.transform){this.bugs=[];b="multiply"===this.options.mouseOver?this.options.minBugs:this.random(this.options.minBugs,this.options.maxBugs,!0);c=0;var d=this;for(c=0;c<b;c++){a=JSON.parse(JSON.stringify(this.options));var e=SpawnBug();a.wingsOpen=
-		this.options.canFly?.5<Math.random()?!0:!1:!0;a.walkSpeed=this.random(this.options.minSpeed,this.options.maxSpeed);e.initialize(this.transform,a);this.bugs.push(e)}this.spawnDelay=[];for(c=0;c<b;c++)a=this.random(this.options.minDelay,this.options.maxDelay,!0),e=this.bugs[c],this.spawnDelay[c]=setTimeout(function(a){return function(){d.options.canFly?a.flyIn():a.walkIn()}}(e),a),d.add_events_to_bug(e);this.options.monitorMouseMovement&&(window.onmousemove=function(){d.check_if_mouse_close_to_bug()})}},
-		stop:function(){for(var a=0;a<this.bugs.length;a++)this.spawnDelay[a]&&clearTimeout(this.spawnDelay[a]),this.bugs[a].stop()},end:function(){for(var a=0;a<this.bugs.length;a++)this.spawnDelay[a]&&clearTimeout(this.spawnDelay[a]),this.bugs[a].stop(),this.bugs[a].remove()},reset:function(){this.stop();for(var a=0;a<this.bugs.length;a++)this.bugs[a].reset(),this.bugs[a].walkIn()},killAll:function(){for(var a=0;a<this.bugs.length;a++)this.spawnDelay[a]&&clearTimeout(this.spawnDelay[a]),this.bugs[a].die()},
-		add_events_to_bug:function(a){var b=this;a.bug&&(a.bug.addEventListener?a.bug.addEventListener("mouseover",function(c){b.on_bug(a)}):a.bug.attachEvent&&a.bug.attachEvent("onmouseover",function(c){b.on_bug(a)}))},check_if_mouse_close_to_bug:function(a){if(a=a||window.event){var b=0,c=0;a.client&&a.client.x?(b=a.client.x,c=a.client.y):a.clientX?(b=a.clientX,c=a.clientY):a.page&&a.page.x?(b=a.page.x-(document.body.scrollLeft+document.documentElement.scrollLeft),c=a.page.y-(document.body.scrollTop+document.documentElement.scrollTop)):
-		a.pageX&&(b=a.pageX-(document.body.scrollLeft+document.documentElement.scrollLeft),c=a.pageY-(document.body.scrollTop+document.documentElement.scrollTop));a=this.bugs.length;var d;for(d=0;d<a;d++){var e=this.bugs[d].getPos();e&&Math.abs(e.top-c)+Math.abs(e.left-b)<this.options.eventDistanceToBug&&!this.bugs[d].flyperiodical&&this.near_bug(this.bugs[d])}}},near_bug:function(a){this.on_bug(a)},on_bug:function(a){if(a.alive){var b=this.options.mouseOver;"random"===b&&(b=this.modes[this.random(0,this.modes.length-
-		1,!0)]);if("fly"===b)a.stop(),a.flyRand();else if("nothing"!==b)if("flyoff"===b)a.stop(),a.flyOff();else if("die"===b)a.die();else if("multiply"===b&&!this.multiplyDelay&&this.bugs.length<this.options.maxBugs){var c=SpawnBug();b=JSON.parse(JSON.stringify(this.options));var d=a.getPos(),e=this;b.wingsOpen=this.options.canFly?.5<Math.random()?!0:!1:!0;b.walkSpeed=this.random(this.options.minSpeed,this.options.maxSpeed);c.initialize(this.transform,b);c.drawBug(d.top,d.left);b.canFly?(c.flyRand(),a.flyRand()):
-		(c.go(),a.go());this.bugs.push(c);this.multiplyDelay=!0;setTimeout(function(){e.add_events_to_bug(c);e.multiplyDelay=!1},this.options.minTimeBetweenMultipy)}}},random:function(a,b,c){if(a==b)return c?Math.round(a):a;var d=a-.5+Math.random()*(b-a+1);d>b?d=b:d<a&&(d=a);return c?Math.round(d):d}},BugController=function(){this.initialize.apply(this,arguments)};BugController.prototype=BugDispatch;
-		var SpiderController=function(){this.options=mergeOptions(this.options,{imageSprite:"spider-sprite.webp",bugWidth:69,bugHeight:90,num_frames:7,canFly:!1,canDie:!0,numDeathTypes:2,zoom:6,minDelay:200,maxDelay:3E3,minSpeed:6,maxSpeed:13,minBugs:3,maxBugs:10});this.initialize.apply(this,arguments)};SpiderController.prototype=BugDispatch;
-		var Bug={options:{wingsOpen:!1,walkSpeed:2,flySpeed:40,edge_resistance:50,zoom:10},initialize:function(a,b){this.options=mergeOptions(this.options,b);this.NEAR_TOP_EDGE=1;this.NEAR_BOTTOM_EDGE=2;this.NEAR_LEFT_EDGE=4;this.NEAR_RIGHT_EDGE=8;this.directions={};this.directions[this.NEAR_TOP_EDGE]=270;this.directions[this.NEAR_BOTTOM_EDGE]=90;this.directions[this.NEAR_LEFT_EDGE]=0;this.directions[this.NEAR_RIGHT_EDGE]=180;this.directions[this.NEAR_TOP_EDGE+this.NEAR_LEFT_EDGE]=315;this.directions[this.NEAR_TOP_EDGE+
-		this.NEAR_RIGHT_EDGE]=225;this.directions[this.NEAR_BOTTOM_EDGE+this.NEAR_LEFT_EDGE]=45;this.directions[this.NEAR_BOTTOM_EDGE+this.NEAR_RIGHT_EDGE]=135;this.large_turn_angle_deg=this.angle_rad=this.angle_deg=0;this.near_edge=!1;this.edge_test_counter=10;this.fly_counter=this.large_turn_counter=this.small_turn_counter=0;this.toggle_stationary_counter=50*Math.random();this.zoom=this.random(this.options.zoom,10)/10;this.stationary=!1;this.bug=null;this.active=!0;this.wingsOpen=this.options.wingsOpen;
-		this.transform=a;this.flyIndex=this.walkIndex=0;this.alive=!0;this.twitchTimer=null;this.rad2deg_k=180/Math.PI;this.deg2rad_k=Math.PI/180;this.makeBug();this.angle_rad=this.deg2rad(this.angle_deg);this.angle_deg=this.random(0,360,!0)},go:function(){if(this.transform){this.drawBug();var a=this;this.animating=!0;this.going=requestAnimFrame(function(b){a.animate(b)})}},stop:function(){this.animating=!1;this.going&&(clearTimeout(this.going),this.going=null);this.flyperiodical&&(clearTimeout(this.flyperiodical),
-		this.flyperiodical=null);this.twitchTimer&&(clearTimeout(this.twitchTimer),this.twitchTimer=null)},remove:function(){this.active=!1;this.inserted&&this.bug.parentNode&&(this.bug.parentNode.removeChild(this.bug),this.inserted=!1)},reset:function(){this.active=this.alive=!0;this.bug.style.bottom="";this.bug.style.top=0;this.bug.style.left=0;this.bug.classList.remove("bug-dead")},animate:function(a){if(this.animating&&this.alive&&this.active){var b=this;this.going=requestAnimFrame(function(a){b.animate(a)});
-		"_lastTimestamp"in this||(this._lastTimestamp=a);var c=a-this._lastTimestamp;if(!(40>c||(200<c&&(c=200),this._lastTimestamp=a,0>=--this.toggle_stationary_counter&&this.toggleStationary(),this.stationary))){if(0>=--this.edge_test_counter&&this.bug_near_window_edge()&&(this.angle_deg%=360,0>this.angle_deg&&(this.angle_deg+=360),15<Math.abs(this.directions[this.near_edge]-this.angle_deg))){a=this.directions[this.near_edge]-this.angle_deg;var d=360-this.angle_deg+this.directions[this.near_edge];this.large_turn_angle_deg=
-		Math.abs(a)<Math.abs(d)?a:d;this.edge_test_counter=10;this.large_turn_counter=100;this.small_turn_counter=30}0>=--this.large_turn_counter&&(this.large_turn_angle_deg=this.random(1,this.options.maxLargeTurnDeg,!0),this.next_large_turn());if(0>=--this.small_turn_counter)this.angle_deg+=this.random(1,this.options.maxSmallTurnDeg),this.next_small_turn();else{a=this.random(1,this.options.maxWiggleDeg,!0);if(0<this.large_turn_angle_deg&&0>a||0>this.large_turn_angle_deg&&0<a)a=-a;this.large_turn_angle_deg-=
-		a;this.angle_deg+=a}this.angle_rad=this.deg2rad(this.angle_deg);this.moveBug(this.bug.left+c/100*this.options.walkSpeed*Math.cos(this.angle_rad),this.bug.top+c/100*this.options.walkSpeed*-Math.sin(this.angle_rad),90-this.angle_deg);this.walkFrame()}}},makeBug:function(){if(!this.bug&&this.active){var a=this.wingsOpen?"0":"-"+this.options.bugHeight+"px",b=document.createElement("div");b.className="bug";b.style.background="transparent url("+this.options.imageSprite+") no-repeat 0 "+a;b.style.width=
-		this.options.bugWidth+"px";b.style.height=this.options.bugHeight+"px";b.style.position="fixed";b.style.top=0;b.style.left=0;b.style.zIndex="9999999";this.bug=b;this.setPos()}},setPos:function(a,b){this.bug.top=a||this.random(this.options.edge_resistance,document.documentElement.clientHeight-this.options.edge_resistance);this.bug.left=b||this.random(this.options.edge_resistance,document.documentElement.clientWidth-this.options.edge_resistance);this.moveBug(this.bug.left,this.bug.top,90-this.angle_deg)},
-		moveBug:function(a,b,c){this.bug.left=a;this.bug.top=b;a="translate("+parseInt(a)+"px,"+parseInt(b)+"px)";c&&(a+=" rotate("+c+"deg)");a+=" scale("+this.zoom+")";this.transform(a)},drawBug:function(a,b){this.bug||this.makeBug();this.bug&&(a&&b?this.setPos(a,b):this.setPos(this.bug.top,this.bug.left),this.inserted||(this.inserted=!0,document.body.appendChild(this.bug)))},toggleStationary:function(){this.stationary=!this.stationary;this.next_stationary();var a=this.wingsOpen?"0":"-"+this.options.bugHeight+
-		"px";this.bug.style.backgroundPosition=this.stationary?"0 "+a:"-"+this.options.bugWidth+"px "+a},walkFrame:function(){this.bug.style.backgroundPosition=-1*this.walkIndex*this.options.bugWidth+"px "+(this.wingsOpen?"0":"-"+this.options.bugHeight+"px");this.walkIndex++;this.walkIndex>=this.options.num_frames&&(this.walkIndex=0)},fly:function(a){var b=this.bug.top,c=this.bug.left,d=c-a.left,e=b-a.top,f=Math.atan(e/d);50>Math.abs(d)+Math.abs(e)&&(this.bug.style.backgroundPosition=-2*this.options.bugWidth+
-		"px -"+2*this.options.bugHeight+"px");30>Math.abs(d)+Math.abs(e)&&(this.bug.style.backgroundPosition=-1*this.options.bugWidth+"px -"+2*this.options.bugHeight+"px");if(10>Math.abs(d)+Math.abs(e))this.bug.style.backgroundPosition="0 0",this.stop(),this.go();else{var g=Math.cos(f)*this.options.flySpeed;f=Math.sin(f)*this.options.flySpeed;if(c>a.left&&0<g||c>a.left&&0>g)g*=-1,Math.abs(d)<Math.abs(g)&&(g/=4);if(b<a.top&&0>f||b>a.top&&0<f)f*=-1,Math.abs(e)<Math.abs(f)&&(f/=4);this.moveBug(c+g,b+f)}},flyRand:function(){this.stop();
-		var a={};a.top=this.random(this.options.edge_resistance,document.documentElement.clientHeight-this.options.edge_resistance);a.left=this.random(this.options.edge_resistance,document.documentElement.clientWidth-this.options.edge_resistance);this.startFlying(a)},startFlying:function(a){var b=this.bug.top,c=this.bug.left,d=a.left-c,e=a.top-b;this.bug.left=a.left;this.bug.top=a.top;this.angle_rad=Math.atan(e/d);this.angle_deg=this.rad2deg(this.angle_rad);this.angle_deg=0<d?90+this.angle_deg:270+this.angle_deg;
-		this.moveBug(c,b,this.angle_deg);var f=this;this.flyperiodical=setInterval(function(){f.fly(a)},10)},flyIn:function(){this.bug||this.makeBug();if(this.bug){this.stop();var a=Math.round(4*Math.random()-.5),b=document,c=b.documentElement,d=b.getElementsByTagName("body")[0];b=window.innerWidth||c.clientWidth||d.clientWidth;c=window.innerHeight||c.clientHeight||d.clientHeight;3<a&&(a=3);0>a&&(a=0);0===a?(a=-2*this.options.bugHeight,b*=Math.random()):1===a?(a=Math.random()*c,b+=2*this.options.bugWidth):
-		2===a?(a=c+2*this.options.bugHeight,b*=Math.random()):(a=Math.random()*c,b=-3*this.options.bugWidth);this.bug.style.backgroundPosition=-3*this.options.bugWidth+"px "+(this.wingsOpen?"0":"-"+this.options.bugHeight+"px");this.bug.top=a;this.bug.left=b;this.drawBug();a={};a.top=this.random(this.options.edge_resistance,document.documentElement.clientHeight-this.options.edge_resistance);a.left=this.random(this.options.edge_resistance,document.documentElement.clientWidth-this.options.edge_resistance);this.startFlying(a)}},
-		walkIn:function(){this.bug||this.makeBug();if(this.bug){this.stop();var a=Math.round(4*Math.random()-.5),b=document,c=b.documentElement,d=b.getElementsByTagName("body")[0];b=window.innerWidth||c.clientWidth||d.clientWidth;c=window.innerHeight||c.clientHeight||d.clientHeight;3<a&&(a=3);0>a&&(a=0);0===a?(a=-1.3*this.options.bugHeight,b*=Math.random()):1===a?(a=Math.random()*c,b+=.3*this.options.bugWidth):2===a?(a=c+.3*this.options.bugHeight,b*=Math.random()):(a=Math.random()*c,b=-1.3*this.options.bugWidth);
-		this.bug.style.backgroundPosition=-3*this.options.bugWidth+"px "+(this.wingsOpen?"0":"-"+this.options.bugHeight+"px");this.bug.top=a;this.bug.left=b;this.drawBug();this.go()}},flyOff:function(){this.stop();var a=this.random(0,3),b={},c=document,d=c.documentElement,e=c.getElementsByTagName("body")[0];c=window.innerWidth||d.clientWidth||e.clientWidth;d=window.innerHeight||d.clientHeight||e.clientHeight;0===a?(b.top=-200,b.left=Math.random()*c):1===a?(b.top=Math.random()*d,b.left=c+200):2===a?(b.top=
-		d+200,b.left=Math.random()*c):(b.top=Math.random()*d,b.left=-200);this.startFlying(b)},die:function(){this.stop();var a=this.random(0,this.options.numDeathTypes-1);this.alive=!1;this.drop(a)},drop:function(a){var b=this.bug.top,c=document,d=c.documentElement;c=c.getElementsByTagName("body")[0];var e=window.innerHeight||d.clientHeight||c.clientHeight;e-=this.options.bugHeight;var f=this.random(0,20,!0);Date.now();var g=this;this.bug.classList.add("bug-dead");this.dropTimer=requestAnimFrame(function(c){g._lastTimestamp=
-		c;g.dropping(c,b,e,f,a)})},dropping:function(a,b,c,d,e){a-=this._lastTimestamp;var f=b+.002*a*a,g=this;f>=c?(f=c,clearTimeout(this.dropTimer),this.angle_deg=0,this.angle_rad=this.deg2rad(this.angle_deg),this.transform("rotate("+(90-this.angle_deg)+"deg) scale("+this.zoom+")"),this.bug.style.top=null,this.bug.style.bottom=Math.ceil((this.options.bugWidth*this.zoom-this.options.bugHeight*this.zoom)/2-this.options.bugHeight/2*(1-this.zoom))+"px",this.bug.style.left=this.bug.left+"px",this.bug.style.backgroundPosition=
-		"-"+2*e*this.options.bugWidth+"px 100%",this.twitch(e)):(this.dropTimer=requestAnimFrame(function(a){g.dropping(a,b,c,d,e)}),20>a||(this.angle_deg=(this.angle_deg+d)%360,this.angle_rad=this.deg2rad(this.angle_deg),this.moveBug(this.bug.left,f,this.angle_deg)))},twitch:function(a,b){b||(b=0);var c=this;if(0===a||1===a)c.twitchTimer=setTimeout(function(){c.bug.style.backgroundPosition="-"+(2*a+b%2)*c.options.bugWidth+"px 100%";c.twitchTimer=setTimeout(function(){b++;c.bug.style.backgroundPosition="-"+
-		(2*a+b%2)*c.options.bugWidth+"px 100%";c.twitch(a,++b)},c.random(300,800))},this.random(1E3,1E4))},rad2deg:function(a){return a*this.rad2deg_k},deg2rad:function(a){return a*this.deg2rad_k},random:function(a,b,c){if(a==b)return a;a=Math.round(a-.5+Math.random()*(b-a+1));return c?.5<Math.random()?a:-a:a},next_small_turn:function(){this.small_turn_counter=Math.round(10*Math.random())},next_large_turn:function(){this.large_turn_counter=Math.round(40*Math.random())},next_stationary:function(){this.toggle_stationary_counter=
-		this.random(50,300)},bug_near_window_edge:function(){this.near_edge=0;this.bug.top<this.options.edge_resistance?this.near_edge|=this.NEAR_TOP_EDGE:this.bug.top>document.documentElement.clientHeight-this.options.edge_resistance&&(this.near_edge|=this.NEAR_BOTTOM_EDGE);this.bug.left<this.options.edge_resistance?this.near_edge|=this.NEAR_LEFT_EDGE:this.bug.left>document.documentElement.clientWidth-this.options.edge_resistance&&(this.near_edge|=this.NEAR_RIGHT_EDGE);return this.near_edge},getPos:function(){return this.inserted&&
-		this.bug&&this.bug.style?{top:parseInt(this.bug.top,10),left:parseInt(this.bug.left,10)}:null}},SpawnBug=function(){var a={},b;for(b in Bug)Bug.hasOwnProperty(b)&&(a[b]=Bug[b]);return a},mergeOptions=function(a,b,c){"undefined"==typeof c&&(c=!0);a=c?cloneOf(a):a;for(var d in b)b.hasOwnProperty(d)&&(a[d]=b[d]);return a},cloneOf=function(a){if(null==a||"object"!=typeof a)return a;var b=a.constructor(),c;for(c in a)a.hasOwnProperty(c)&&(b[c]=cloneOf(a[c]));return b};
-		window.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a,b){window.setTimeout(a,1E3/60)}}();
-	</script>
-	<script>
-		new BugController({
-			imageSprite: "/assets/images/fly-sprite.webp",
-			canDie: false,
-			minBugs: 5,
-			maxBugs: 30,
-			mouseOver: "fly"
-		});
-		new SpiderController({
-			imageSprite: "/assets/images/spider-sprite.webp",
-			canDie: false,
-			minBugs: 2,
-			maxBugs: 20,
-			mouseOver: "fly"
-		});
-	</script>
-	<noscript>
-		<style>
-			body {
-				-moz-transform: scale(-1, -1);
-				-o-transform: scale(-1, -1);
-				-webkit-transform: scale(-1, -1);
-				transform: scale(-1, -1);
+		<script>
+			/*
+			Bug.js - https://github.com/Auz/Bug
+			Released under MIT-style license.
+			Original Screen Bug http://screen-bug.googlecode.com/git/index.html
+			*/
+			var BugDispatch={options:{minDelay:500,maxDelay:1E4,minBugs:2,maxBugs:20,minSpeed:5,maxSpeed:10,maxLargeTurnDeg:150,maxSmallTurnDeg:10,maxWiggleDeg:5,imageSprite:"fly-sprite.webp",bugWidth:13,bugHeight:14,num_frames:5,zoom:10,canFly:!0,canDie:!0,numDeathTypes:3,monitorMouseMovement:!1,eventDistanceToBug:40,minTimeBetweenMultipy:1E3,mouseOver:"random"},initialize:function(a){this.options=mergeOptions(this.options,a);this.options.minBugs>this.options.maxBugs&&(this.options.minBugs=this.options.maxBugs);
+			this.modes=["multiply","nothing"];this.options.canFly&&this.modes.push("fly","flyoff");this.options.canDie&&this.modes.push("die");-1==this.modes.indexOf(this.options.mouseOver)&&(this.options.mouseOver="random");this.transform=null;this.transforms={Moz:function(a){this.bug.style.MozTransform=a},webkit:function(a){this.bug.style.webkitTransform=a},O:function(a){this.bug.style.OTransform=a},ms:function(a){this.bug.style.msTransform=a},Khtml:function(a){this.bug.style.KhtmlTransform=a},w3c:function(a){this.bug.style.transform=
+			a}};if("transform"in document.documentElement.style)this.transform=this.transforms.w3c;else{var b=["Moz","webkit","O","ms","Khtml"],c=0;for(c=0;c<b.length;c++)if(b[c]+"Transform"in document.documentElement.style){this.transform=this.transforms[b[c]];break}}if(this.transform){this.bugs=[];b="multiply"===this.options.mouseOver?this.options.minBugs:this.random(this.options.minBugs,this.options.maxBugs,!0);c=0;var d=this;for(c=0;c<b;c++){a=JSON.parse(JSON.stringify(this.options));var e=SpawnBug();a.wingsOpen=
+			this.options.canFly?.5<Math.random()?!0:!1:!0;a.walkSpeed=this.random(this.options.minSpeed,this.options.maxSpeed);e.initialize(this.transform,a);this.bugs.push(e)}this.spawnDelay=[];for(c=0;c<b;c++)a=this.random(this.options.minDelay,this.options.maxDelay,!0),e=this.bugs[c],this.spawnDelay[c]=setTimeout(function(a){return function(){d.options.canFly?a.flyIn():a.walkIn()}}(e),a),d.add_events_to_bug(e);this.options.monitorMouseMovement&&(window.onmousemove=function(){d.check_if_mouse_close_to_bug()})}},
+			stop:function(){for(var a=0;a<this.bugs.length;a++)this.spawnDelay[a]&&clearTimeout(this.spawnDelay[a]),this.bugs[a].stop()},end:function(){for(var a=0;a<this.bugs.length;a++)this.spawnDelay[a]&&clearTimeout(this.spawnDelay[a]),this.bugs[a].stop(),this.bugs[a].remove()},reset:function(){this.stop();for(var a=0;a<this.bugs.length;a++)this.bugs[a].reset(),this.bugs[a].walkIn()},killAll:function(){for(var a=0;a<this.bugs.length;a++)this.spawnDelay[a]&&clearTimeout(this.spawnDelay[a]),this.bugs[a].die()},
+			add_events_to_bug:function(a){var b=this;a.bug&&(a.bug.addEventListener?a.bug.addEventListener("mouseover",function(c){b.on_bug(a)}):a.bug.attachEvent&&a.bug.attachEvent("onmouseover",function(c){b.on_bug(a)}))},check_if_mouse_close_to_bug:function(a){if(a=a||window.event){var b=0,c=0;a.client&&a.client.x?(b=a.client.x,c=a.client.y):a.clientX?(b=a.clientX,c=a.clientY):a.page&&a.page.x?(b=a.page.x-(document.body.scrollLeft+document.documentElement.scrollLeft),c=a.page.y-(document.body.scrollTop+document.documentElement.scrollTop)):
+			a.pageX&&(b=a.pageX-(document.body.scrollLeft+document.documentElement.scrollLeft),c=a.pageY-(document.body.scrollTop+document.documentElement.scrollTop));a=this.bugs.length;var d;for(d=0;d<a;d++){var e=this.bugs[d].getPos();e&&Math.abs(e.top-c)+Math.abs(e.left-b)<this.options.eventDistanceToBug&&!this.bugs[d].flyperiodical&&this.near_bug(this.bugs[d])}}},near_bug:function(a){this.on_bug(a)},on_bug:function(a){if(a.alive){var b=this.options.mouseOver;"random"===b&&(b=this.modes[this.random(0,this.modes.length-
+			1,!0)]);if("fly"===b)a.stop(),a.flyRand();else if("nothing"!==b)if("flyoff"===b)a.stop(),a.flyOff();else if("die"===b)a.die();else if("multiply"===b&&!this.multiplyDelay&&this.bugs.length<this.options.maxBugs){var c=SpawnBug();b=JSON.parse(JSON.stringify(this.options));var d=a.getPos(),e=this;b.wingsOpen=this.options.canFly?.5<Math.random()?!0:!1:!0;b.walkSpeed=this.random(this.options.minSpeed,this.options.maxSpeed);c.initialize(this.transform,b);c.drawBug(d.top,d.left);b.canFly?(c.flyRand(),a.flyRand()):
+			(c.go(),a.go());this.bugs.push(c);this.multiplyDelay=!0;setTimeout(function(){e.add_events_to_bug(c);e.multiplyDelay=!1},this.options.minTimeBetweenMultipy)}}},random:function(a,b,c){if(a==b)return c?Math.round(a):a;var d=a-.5+Math.random()*(b-a+1);d>b?d=b:d<a&&(d=a);return c?Math.round(d):d}},BugController=function(){this.initialize.apply(this,arguments)};BugController.prototype=BugDispatch;
+			var SpiderController=function(){this.options=mergeOptions(this.options,{imageSprite:"spider-sprite.webp",bugWidth:69,bugHeight:90,num_frames:7,canFly:!1,canDie:!0,numDeathTypes:2,zoom:6,minDelay:200,maxDelay:3E3,minSpeed:6,maxSpeed:13,minBugs:3,maxBugs:10});this.initialize.apply(this,arguments)};SpiderController.prototype=BugDispatch;
+			var Bug={options:{wingsOpen:!1,walkSpeed:2,flySpeed:40,edge_resistance:50,zoom:10},initialize:function(a,b){this.options=mergeOptions(this.options,b);this.NEAR_TOP_EDGE=1;this.NEAR_BOTTOM_EDGE=2;this.NEAR_LEFT_EDGE=4;this.NEAR_RIGHT_EDGE=8;this.directions={};this.directions[this.NEAR_TOP_EDGE]=270;this.directions[this.NEAR_BOTTOM_EDGE]=90;this.directions[this.NEAR_LEFT_EDGE]=0;this.directions[this.NEAR_RIGHT_EDGE]=180;this.directions[this.NEAR_TOP_EDGE+this.NEAR_LEFT_EDGE]=315;this.directions[this.NEAR_TOP_EDGE+
+			this.NEAR_RIGHT_EDGE]=225;this.directions[this.NEAR_BOTTOM_EDGE+this.NEAR_LEFT_EDGE]=45;this.directions[this.NEAR_BOTTOM_EDGE+this.NEAR_RIGHT_EDGE]=135;this.large_turn_angle_deg=this.angle_rad=this.angle_deg=0;this.near_edge=!1;this.edge_test_counter=10;this.fly_counter=this.large_turn_counter=this.small_turn_counter=0;this.toggle_stationary_counter=50*Math.random();this.zoom=this.random(this.options.zoom,10)/10;this.stationary=!1;this.bug=null;this.active=!0;this.wingsOpen=this.options.wingsOpen;
+			this.transform=a;this.flyIndex=this.walkIndex=0;this.alive=!0;this.twitchTimer=null;this.rad2deg_k=180/Math.PI;this.deg2rad_k=Math.PI/180;this.makeBug();this.angle_rad=this.deg2rad(this.angle_deg);this.angle_deg=this.random(0,360,!0)},go:function(){if(this.transform){this.drawBug();var a=this;this.animating=!0;this.going=requestAnimFrame(function(b){a.animate(b)})}},stop:function(){this.animating=!1;this.going&&(clearTimeout(this.going),this.going=null);this.flyperiodical&&(clearTimeout(this.flyperiodical),
+			this.flyperiodical=null);this.twitchTimer&&(clearTimeout(this.twitchTimer),this.twitchTimer=null)},remove:function(){this.active=!1;this.inserted&&this.bug.parentNode&&(this.bug.parentNode.removeChild(this.bug),this.inserted=!1)},reset:function(){this.active=this.alive=!0;this.bug.style.bottom="";this.bug.style.top=0;this.bug.style.left=0;this.bug.classList.remove("bug-dead")},animate:function(a){if(this.animating&&this.alive&&this.active){var b=this;this.going=requestAnimFrame(function(a){b.animate(a)});
+			"_lastTimestamp"in this||(this._lastTimestamp=a);var c=a-this._lastTimestamp;if(!(40>c||(200<c&&(c=200),this._lastTimestamp=a,0>=--this.toggle_stationary_counter&&this.toggleStationary(),this.stationary))){if(0>=--this.edge_test_counter&&this.bug_near_window_edge()&&(this.angle_deg%=360,0>this.angle_deg&&(this.angle_deg+=360),15<Math.abs(this.directions[this.near_edge]-this.angle_deg))){a=this.directions[this.near_edge]-this.angle_deg;var d=360-this.angle_deg+this.directions[this.near_edge];this.large_turn_angle_deg=
+			Math.abs(a)<Math.abs(d)?a:d;this.edge_test_counter=10;this.large_turn_counter=100;this.small_turn_counter=30}0>=--this.large_turn_counter&&(this.large_turn_angle_deg=this.random(1,this.options.maxLargeTurnDeg,!0),this.next_large_turn());if(0>=--this.small_turn_counter)this.angle_deg+=this.random(1,this.options.maxSmallTurnDeg),this.next_small_turn();else{a=this.random(1,this.options.maxWiggleDeg,!0);if(0<this.large_turn_angle_deg&&0>a||0>this.large_turn_angle_deg&&0<a)a=-a;this.large_turn_angle_deg-=
+			a;this.angle_deg+=a}this.angle_rad=this.deg2rad(this.angle_deg);this.moveBug(this.bug.left+c/100*this.options.walkSpeed*Math.cos(this.angle_rad),this.bug.top+c/100*this.options.walkSpeed*-Math.sin(this.angle_rad),90-this.angle_deg);this.walkFrame()}}},makeBug:function(){if(!this.bug&&this.active){var a=this.wingsOpen?"0":"-"+this.options.bugHeight+"px",b=document.createElement("div");b.className="bug";b.style.background="transparent url("+this.options.imageSprite+") no-repeat 0 "+a;b.style.width=
+			this.options.bugWidth+"px";b.style.height=this.options.bugHeight+"px";b.style.position="fixed";b.style.top=0;b.style.left=0;b.style.zIndex="9999999";this.bug=b;this.setPos()}},setPos:function(a,b){this.bug.top=a||this.random(this.options.edge_resistance,document.documentElement.clientHeight-this.options.edge_resistance);this.bug.left=b||this.random(this.options.edge_resistance,document.documentElement.clientWidth-this.options.edge_resistance);this.moveBug(this.bug.left,this.bug.top,90-this.angle_deg)},
+			moveBug:function(a,b,c){this.bug.left=a;this.bug.top=b;a="translate("+parseInt(a)+"px,"+parseInt(b)+"px)";c&&(a+=" rotate("+c+"deg)");a+=" scale("+this.zoom+")";this.transform(a)},drawBug:function(a,b){this.bug||this.makeBug();this.bug&&(a&&b?this.setPos(a,b):this.setPos(this.bug.top,this.bug.left),this.inserted||(this.inserted=!0,document.body.appendChild(this.bug)))},toggleStationary:function(){this.stationary=!this.stationary;this.next_stationary();var a=this.wingsOpen?"0":"-"+this.options.bugHeight+
+			"px";this.bug.style.backgroundPosition=this.stationary?"0 "+a:"-"+this.options.bugWidth+"px "+a},walkFrame:function(){this.bug.style.backgroundPosition=-1*this.walkIndex*this.options.bugWidth+"px "+(this.wingsOpen?"0":"-"+this.options.bugHeight+"px");this.walkIndex++;this.walkIndex>=this.options.num_frames&&(this.walkIndex=0)},fly:function(a){var b=this.bug.top,c=this.bug.left,d=c-a.left,e=b-a.top,f=Math.atan(e/d);50>Math.abs(d)+Math.abs(e)&&(this.bug.style.backgroundPosition=-2*this.options.bugWidth+
+			"px -"+2*this.options.bugHeight+"px");30>Math.abs(d)+Math.abs(e)&&(this.bug.style.backgroundPosition=-1*this.options.bugWidth+"px -"+2*this.options.bugHeight+"px");if(10>Math.abs(d)+Math.abs(e))this.bug.style.backgroundPosition="0 0",this.stop(),this.go();else{var g=Math.cos(f)*this.options.flySpeed;f=Math.sin(f)*this.options.flySpeed;if(c>a.left&&0<g||c>a.left&&0>g)g*=-1,Math.abs(d)<Math.abs(g)&&(g/=4);if(b<a.top&&0>f||b>a.top&&0<f)f*=-1,Math.abs(e)<Math.abs(f)&&(f/=4);this.moveBug(c+g,b+f)}},flyRand:function(){this.stop();
+			var a={};a.top=this.random(this.options.edge_resistance,document.documentElement.clientHeight-this.options.edge_resistance);a.left=this.random(this.options.edge_resistance,document.documentElement.clientWidth-this.options.edge_resistance);this.startFlying(a)},startFlying:function(a){var b=this.bug.top,c=this.bug.left,d=a.left-c,e=a.top-b;this.bug.left=a.left;this.bug.top=a.top;this.angle_rad=Math.atan(e/d);this.angle_deg=this.rad2deg(this.angle_rad);this.angle_deg=0<d?90+this.angle_deg:270+this.angle_deg;
+			this.moveBug(c,b,this.angle_deg);var f=this;this.flyperiodical=setInterval(function(){f.fly(a)},10)},flyIn:function(){this.bug||this.makeBug();if(this.bug){this.stop();var a=Math.round(4*Math.random()-.5),b=document,c=b.documentElement,d=b.getElementsByTagName("body")[0];b=window.innerWidth||c.clientWidth||d.clientWidth;c=window.innerHeight||c.clientHeight||d.clientHeight;3<a&&(a=3);0>a&&(a=0);0===a?(a=-2*this.options.bugHeight,b*=Math.random()):1===a?(a=Math.random()*c,b+=2*this.options.bugWidth):
+			2===a?(a=c+2*this.options.bugHeight,b*=Math.random()):(a=Math.random()*c,b=-3*this.options.bugWidth);this.bug.style.backgroundPosition=-3*this.options.bugWidth+"px "+(this.wingsOpen?"0":"-"+this.options.bugHeight+"px");this.bug.top=a;this.bug.left=b;this.drawBug();a={};a.top=this.random(this.options.edge_resistance,document.documentElement.clientHeight-this.options.edge_resistance);a.left=this.random(this.options.edge_resistance,document.documentElement.clientWidth-this.options.edge_resistance);this.startFlying(a)}},
+			walkIn:function(){this.bug||this.makeBug();if(this.bug){this.stop();var a=Math.round(4*Math.random()-.5),b=document,c=b.documentElement,d=b.getElementsByTagName("body")[0];b=window.innerWidth||c.clientWidth||d.clientWidth;c=window.innerHeight||c.clientHeight||d.clientHeight;3<a&&(a=3);0>a&&(a=0);0===a?(a=-1.3*this.options.bugHeight,b*=Math.random()):1===a?(a=Math.random()*c,b+=.3*this.options.bugWidth):2===a?(a=c+.3*this.options.bugHeight,b*=Math.random()):(a=Math.random()*c,b=-1.3*this.options.bugWidth);
+			this.bug.style.backgroundPosition=-3*this.options.bugWidth+"px "+(this.wingsOpen?"0":"-"+this.options.bugHeight+"px");this.bug.top=a;this.bug.left=b;this.drawBug();this.go()}},flyOff:function(){this.stop();var a=this.random(0,3),b={},c=document,d=c.documentElement,e=c.getElementsByTagName("body")[0];c=window.innerWidth||d.clientWidth||e.clientWidth;d=window.innerHeight||d.clientHeight||e.clientHeight;0===a?(b.top=-200,b.left=Math.random()*c):1===a?(b.top=Math.random()*d,b.left=c+200):2===a?(b.top=
+			d+200,b.left=Math.random()*c):(b.top=Math.random()*d,b.left=-200);this.startFlying(b)},die:function(){this.stop();var a=this.random(0,this.options.numDeathTypes-1);this.alive=!1;this.drop(a)},drop:function(a){var b=this.bug.top,c=document,d=c.documentElement;c=c.getElementsByTagName("body")[0];var e=window.innerHeight||d.clientHeight||c.clientHeight;e-=this.options.bugHeight;var f=this.random(0,20,!0);Date.now();var g=this;this.bug.classList.add("bug-dead");this.dropTimer=requestAnimFrame(function(c){g._lastTimestamp=
+			c;g.dropping(c,b,e,f,a)})},dropping:function(a,b,c,d,e){a-=this._lastTimestamp;var f=b+.002*a*a,g=this;f>=c?(f=c,clearTimeout(this.dropTimer),this.angle_deg=0,this.angle_rad=this.deg2rad(this.angle_deg),this.transform("rotate("+(90-this.angle_deg)+"deg) scale("+this.zoom+")"),this.bug.style.top=null,this.bug.style.bottom=Math.ceil((this.options.bugWidth*this.zoom-this.options.bugHeight*this.zoom)/2-this.options.bugHeight/2*(1-this.zoom))+"px",this.bug.style.left=this.bug.left+"px",this.bug.style.backgroundPosition=
+			"-"+2*e*this.options.bugWidth+"px 100%",this.twitch(e)):(this.dropTimer=requestAnimFrame(function(a){g.dropping(a,b,c,d,e)}),20>a||(this.angle_deg=(this.angle_deg+d)%360,this.angle_rad=this.deg2rad(this.angle_deg),this.moveBug(this.bug.left,f,this.angle_deg)))},twitch:function(a,b){b||(b=0);var c=this;if(0===a||1===a)c.twitchTimer=setTimeout(function(){c.bug.style.backgroundPosition="-"+(2*a+b%2)*c.options.bugWidth+"px 100%";c.twitchTimer=setTimeout(function(){b++;c.bug.style.backgroundPosition="-"+
+			(2*a+b%2)*c.options.bugWidth+"px 100%";c.twitch(a,++b)},c.random(300,800))},this.random(1E3,1E4))},rad2deg:function(a){return a*this.rad2deg_k},deg2rad:function(a){return a*this.deg2rad_k},random:function(a,b,c){if(a==b)return a;a=Math.round(a-.5+Math.random()*(b-a+1));return c?.5<Math.random()?a:-a:a},next_small_turn:function(){this.small_turn_counter=Math.round(10*Math.random())},next_large_turn:function(){this.large_turn_counter=Math.round(40*Math.random())},next_stationary:function(){this.toggle_stationary_counter=
+			this.random(50,300)},bug_near_window_edge:function(){this.near_edge=0;this.bug.top<this.options.edge_resistance?this.near_edge|=this.NEAR_TOP_EDGE:this.bug.top>document.documentElement.clientHeight-this.options.edge_resistance&&(this.near_edge|=this.NEAR_BOTTOM_EDGE);this.bug.left<this.options.edge_resistance?this.near_edge|=this.NEAR_LEFT_EDGE:this.bug.left>document.documentElement.clientWidth-this.options.edge_resistance&&(this.near_edge|=this.NEAR_RIGHT_EDGE);return this.near_edge},getPos:function(){return this.inserted&&
+			this.bug&&this.bug.style?{top:parseInt(this.bug.top,10),left:parseInt(this.bug.left,10)}:null}},SpawnBug=function(){var a={},b;for(b in Bug)Bug.hasOwnProperty(b)&&(a[b]=Bug[b]);return a},mergeOptions=function(a,b,c){"undefined"==typeof c&&(c=!0);a=c?cloneOf(a):a;for(var d in b)b.hasOwnProperty(d)&&(a[d]=b[d]);return a},cloneOf=function(a){if(null==a||"object"!=typeof a)return a;var b=a.constructor(),c;for(c in a)a.hasOwnProperty(c)&&(b[c]=cloneOf(a[c]));return b};
+			window.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a,b){window.setTimeout(a,1E3/60)}}();
+		</script>
+		<script>
+			new BugController({
+				imageSprite: "/assets/images/fly-sprite.webp",
+				canDie: false,
+				minBugs: 5,
+				maxBugs: 30,
+				mouseOver: "fly"
+			});
+			new SpiderController({
+				imageSprite: "/assets/images/spider-sprite.webp",
+				canDie: false,
+				minBugs: 2,
+				maxBugs: 20,
+				mouseOver: "fly"
+			});
+		</script>
+		<noscript>
+			<style>
+				body {
+					-moz-transform: scale(-1, -1);
+					-o-transform: scale(-1, -1);
+					-webkit-transform: scale(-1, -1);
+					transform: scale(-1, -1);
+				}
+			</style>
+		</noscript>
+	{% endif %}
+
+	{% if v %}
+		<script src="https://js.pusher.com/beams/1.0/push-notifications-cdn.js"></script>
+			
+		<script>
+			const beamsClient = new PusherPushNotifications.Client({
+				instanceId: '02ddcc80-b8db-42be-9022-44c546b4dce6',
+			});		
+			
+			beamsClient
+			.start()
+			.then((beamsClient) => beamsClient.getDeviceId())
+			.then(() => beamsClient.addDeviceInterest('{{v.strid}}'))
+			.then(() => beamsClient.getDeviceInterests())
+			.catch(console.error);
+
+			// Text Formatting
+
+			// Bold Text
+
+			makeBold = function (form) {
+				var text = document.getElementById(form);
+				var startIndex = text.selectionStart,
+				endIndex = text.selectionEnd;
+				var selectedText = text.value.substring(startIndex, endIndex);
+
+				var format = '**'
+
+				if (selectedText.includes('**')) {
+					text.value = selectedText.replace(/\*/g, '');
+					
+				}
+				else if (selectedText.length == 0) {
+					text.value = text.value.substring(0, startIndex) + selectedText + text.value.substring(endIndex);
+				}
+				else {
+					text.value = text.value.substring(0, startIndex) + format + selectedText + format + text.value.substring(endIndex);
+				}
 			}
-		</style>
-	</noscript>
+
+			// Italicize Comment Text
+
+			makeItalics = function (form) {
+				var text = document.getElementById(form);
+				var startIndex = text.selectionStart,
+				endIndex = text.selectionEnd;
+				var selectedText = text.value.substring(startIndex, endIndex);
+
+				var format = '*'
+
+				if (selectedText.includes('*')) {
+					text.value = selectedText.replace(/\*/g, '');
+					
+				}
+				else if (selectedText.length == 0) {
+					text.value = text.value.substring(0, startIndex) + selectedText + text.value.substring(endIndex);
+				}
+				else {
+					text.value = text.value.substring(0, startIndex) + format + selectedText + format + text.value.substring(endIndex);
+				}
+			}
+
+			// Quote Comment Text
+
+			makeQuote = function (form) {
+				var text = document.getElementById(form);
+				var startIndex = text.selectionStart,
+				endIndex = text.selectionEnd;
+				var selectedText = text.value.substring(startIndex, endIndex);
+
+				var format = '>'
+
+				if (selectedText.includes('>')) {
+					text.value = text.value.substring(0, startIndex) + selectedText.replace(/\>/g, '') + text.value.substring(endIndex);
+					
+				}
+				else if (selectedText.length == 0) {
+					text.value = text.value.substring(0, startIndex) + selectedText + text.value.substring(endIndex);
+				}
+				else {
+					text.value = text.value.substring(0, startIndex) + format + selectedText + text.value.substring(endIndex);
+				}
+			}
+
+			function autoExpand (field) {
+
+				//get current scroll position
+				xpos=window.scrollX;
+				ypos=window.scrollY;
+
+				// Reset field height
+				field.style.height = 'inherit';
+
+				// Get the computed styles for the element
+				var computed = window.getComputedStyle(field);
+
+				// Calculate the height
+				var height = parseInt(computed.getPropertyValue('border-top-width'), 10)
+				+ parseInt(computed.getPropertyValue('padding-top'), 10)
+				+ field.scrollHeight
+				+ parseInt(computed.getPropertyValue('padding-bottom'), 10)
+				+ parseInt(computed.getPropertyValue('border-bottom-width'), 10)
+				+ 32;
+
+				field.style.height = height + 'px';
+
+				//keep window position from changing
+				window.scrollTo(xpos,ypos);
+
+			};
+
+			//Autoexpand textedit comments
+
+			document.addEventListener('input', function (event) {
+				if (event.target.tagName.toLowerCase() !== 'textarea') return;
+				autoExpand(event.target);
+			}, false);
+		
+			$('.text-expand').click(function(event){
+				if (event.which != 1) {
+					return
+				};
+				id=$(this).data('id');
+
+
+				$('#post-text-'+id).toggleClass('d-none');
+				$('.text-expand-icon-'+id).toggleClass('fa-expand-alt');
+				$('.text-expand-icon-'+id).toggleClass('fa-compress-alt');
+
+			})
+
+		</script>
+
 	{% endif %}
 
 	<script>
-
-		// comment collapse
-
-		// Toggle comment collapse
-
-		function collapse_comment(comment_id) {
-			const comment = "comment-" + comment_id
-			const element = document.getElementById(comment)
-            const closed = element.classList.toggle("collapsed")
-            const top = element.getBoundingClientRect().y
-
-            if (closed && top < 0) {
-                element.scrollIntoView()
-                window.scrollBy(0, - 100)
-            }
-		};
-
-		//Commenting form
-
-		// Expand comment box on focus, hide otherwise
-
-		$('.comment-box').focus(function (event) {
-			event.preventDefault();
-
-			$(this).parent().parent().addClass("collapsed");
-
-		});
-
-        // Open comment reply box
-
-        function openReplyBox(id) {
-            const element = document.getElementById(`reply-to-${id}`);
-            element.classList.remove('d-none')
-
-            element.getElementsByTagName('textarea')[0].focus()
-        }
-
-		// Comment edit form
-
-		toggleEdit=function(id){
-			comment=document.getElementById("comment-text-"+id);
-			form=document.getElementById("comment-edit-"+id);
-			box=document.getElementById('edit-box-comment-'+id);
-			actions = document.getElementById('comment-' + id +'-actions');
-
-			comment.classList.toggle("d-none");
-			form.classList.toggle("d-none");
-			actions.classList.toggle("d-none");
-			autoExpand(box);
-		};
-
-		// Post edit form
-
-		togglePostEdit=function(id){
-
-			body=document.getElementById("post-body");
-			title=document.getElementById("post-title");
-			form=document.getElementById("edit-post-body-"+id);
-			box=document.getElementById("post-edit-box-"+id);
-			box2=document.getElementById("post-edit-box2-"+id);
-
-			body.classList.toggle("d-none");
-			title.classList.toggle("d-none");
-			form.classList.toggle("d-none");
-			autoExpand(box);
-			autoExpand(box2);
-		};
-
-		//comment modding
-		function removeComment(post_id,button1,button2) {
-			url="/ban_comment/"+post_id
-
-			callback=function(){
-				document.getElementById("comment-"+post_id+"-only").classList.add("banned");
-
-				button=document.getElementById("moderate-"+post_id);
-				button.onclick=function(){approveComment(post_id)};
-				button.innerHTML='<i class="fas fa-clipboard-check"></i>Approve'
-			}
-			post(url, callback, "Comment has been removed.")
-			
-
-			if (typeof button1 !== 'undefined') {
-				document.getElementById(button1).classList.toggle("d-md-inline-block");
-				document.getElementById(button2).classList.toggle("d-md-inline-block");
-			}
-		};
-
-		function approveComment(post_id,button1,button2) {
-			url="/unban_comment/"+post_id
-
-			callback=function(){
-				document.getElementById("comment-"+post_id+"-only").classList.remove("banned");
-
-				button=document.getElementById("moderate-"+post_id);
-				button.onclick=function(){removeComment(post_id)};
-				button.innerHTML='<i class="fas fa-trash-alt"></i>Remove'
-			}
-
-			post(url, callback, "Comment has been approved.")
-
-			if (typeof button1 !== 'undefined') {
-				document.getElementById(button1).classList.toggle("d-md-inline-block");
-				document.getElementById(button2).classList.toggle("d-md-inline-block");
-			}
-		}
-
-
-		function removeComment2(post_id,button1,button2) {
-			url="/ban_comment/"+post_id
-
-			callback=function(){
-				document.getElementById("comment-"+post_id+"-only").classList.add("banned");
-
-				button=document.getElementById("moderate-"+post_id);
-				button.onclick=function(){approveComment(post_id)};
-				button.innerHTML='<i class="fas fa-clipboard-check"></i>Approve'
-			}
-			post(url, callback, "Comment has been removed.")
-			
-
-			if (typeof button1 !== 'undefined') {
-				document.getElementById(button1).classList.toggle("d-none");
-				document.getElementById(button2).classList.toggle("d-none");
-			}
-		};
-
-		function approveComment2(post_id,button1,button2) {
-			url="/unban_comment/"+post_id
-
-			callback=function(){
-				document.getElementById("comment-"+post_id+"-only").classList.remove("banned");
-
-				button=document.getElementById("moderate-"+post_id);
-				button.onclick=function(){removeComment(post_id)};
-				button.innerHTML='<i class="fas fa-trash-alt"></i>Remove'
-			}
-
-			post(url, callback, "Comment has been approved.")
-
-			if (typeof button1 !== 'undefined') {
-				document.getElementById(button1).classList.toggle("d-none");
-				document.getElementById(button2).classList.toggle("d-none");
-			}
-		}
-
-
-		admin_comment=function(cid,button1,button2,distinguish){
-
-
-			var xhr = new XMLHttpRequest();
-			xhr.open("post", "/distinguish_comment/"+cid);
-
-			var form = new FormData();
-
-			form.append('formkey', formkey());
-
-			xhr.withCredentials=true;
-			xhr.onload=function(){
-				if (xhr.status==200) {
-					comment=document.getElementById('comment-'+cid+'-only');
-					comment.innerHTML=JSON.parse(xhr.response)["html"];
-				}
-				else {
-					var commentError = document.getElementById("comment-error-text");
-					$('#toast-comment-success').toast('dispose');
-					$('#toast-comment-error').toast('dispose');
-					$('#toast-comment-error').toast('show');
-					commentError.textContent = JSON.parse(xhr.response)["error"];
-				}
-			}
-			xhr.send(form)
-
-			document.getElementById(button1).classList.toggle("d-md-inline-block");
-			document.getElementById(button2).classList.toggle("d-md-inline-block");
-
-			$('#toast-post-success').toast('dispose');
-			$('#toast-post-success').toast('show');
-			if (distinguish=='yes') {
-				document.getElementById('toast-post-success-text').innerText = "Comment distinguished!";
-			}
-			else {
-				document.getElementById('toast-post-success-text').innerText = "Comment undistinguished!";
-			}
-		}
-
-		admin_comment=function(cid,button1,button2,distinguish){
-
-
-			var xhr = new XMLHttpRequest();
-			xhr.open("post", "/distinguish_comment/"+cid);
-
-			var form = new FormData();
-
-			form.append('formkey', formkey());
-
-			xhr.withCredentials=true;
-			xhr.onload=function(){
-				if (xhr.status==200) {
-					comment=document.getElementById('comment-'+cid+'-only');
-					comment.innerHTML=JSON.parse(xhr.response)["html"];
-				}
-				else {
-					var commentError = document.getElementById("comment-error-text");
-					$('#toast-comment-success').toast('dispose');
-					$('#toast-comment-error').toast('dispose');
-					$('#toast-comment-error').toast('show');
-					commentError.textContent = JSON.parse(xhr.response)["error"];
-				}
-			}
-			xhr.send(form)
-
-			document.getElementById(button1).classList.toggle("d-md-inline-block");
-			document.getElementById(button2).classList.toggle("d-md-inline-block");
-
-			$('#toast-post-success').toast('dispose');
-			$('#toast-post-success').toast('show');
-			if (distinguish=='yes') {
-				document.getElementById('toast-post-success-text').innerText = "Comment distinguished!";
-			}
-			else {
-				document.getElementById('toast-post-success-text').innerText = "Comment undistinguished!";
-			}
-		}
-
-			
-		admin_comment2=function(cid,button1,button2,distinguish){
-			var xhr = new XMLHttpRequest();
-			xhr.open("post", "/distinguish_comment/"+cid);
-
-			var form = new FormData();
-
-			form.append('formkey', formkey());
-
-			xhr.withCredentials=true;
-			xhr.onload=function(){
-				if (xhr.status==200) {
-					comment=document.getElementById('comment-'+cid+'-only');
-					comment.innerHTML=JSON.parse(xhr.response)["html"];
-				}
-				else {
-					var commentError = document.getElementById("comment-error-text");
-					$('#toast-comment-success').toast('dispose');
-					$('#toast-comment-error').toast('dispose');
-					$('#toast-comment-error').toast('show');
-					commentError.textContent = JSON.parse(xhr.response)["error"];
-				}
-			}
-			xhr.send(form)
-
-			document.getElementById(button1).classList.toggle("d-none");
-			document.getElementById(button2).classList.toggle("d-none");
-
-			$('#toast-post-success').toast('dispose');
-			$('#toast-post-success').toast('show');
-			if (distinguish=='yes') {
-				document.getElementById('toast-post-success-text').innerText = "Comment distinguished!";
-			}
-			else {
-				document.getElementById('toast-post-success-text').innerText = "Comment undistinguished!";
-			}
-		}
-
-		//Autoexpand textedit comments
-
-		function autoExpand (field) {
-
-			//get current scroll position
-			xpos=window.scrollX;
-			ypos=window.scrollY;
-
-			// Reset field height
-			field.style.height = 'inherit';
-
-			// Get the computed styles for the element
-			var computed = window.getComputedStyle(field);
-
-			// Calculate the height
-			var height = parseInt(computed.getPropertyValue('border-top-width'), 10)
-			+ parseInt(computed.getPropertyValue('padding-top'), 10)
-			+ field.scrollHeight
-			+ parseInt(computed.getPropertyValue('padding-bottom'), 10)
-			+ parseInt(computed.getPropertyValue('border-bottom-width'), 10)
-			+ 32;
-
-			field.style.height = height + 'px';
-
-			//keep window position from changing
-			window.scrollTo(xpos,ypos);
-
-		};
-
-		document.addEventListener('input', function (event) {
-			if (event.target.tagName.toLowerCase() !== 'textarea') return;
-			autoExpand(event.target);
-		}, false);
-
-		// Delete Post
-
-		function delete_postModal(id,button1,button2) {
-
-			// Passed data for modal
-
-			document.getElementById("deletePostButton-mobile").addEventListener("click", delete_post);
-
-			document.getElementById("deletePostButton").addEventListener("click", delete_post);
-
-			function delete_post(){	
-
-				this.innerHTML='<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Deleting post';	
-				this.disabled = true; 
-				post('/delete_post/' + id,
-					callback = function() {
-
-						location.reload();
-					}
-					)
-			}
-
-			document.getElementById(button1).classList.toggle("d-none");
-			document.getElementById(button2).classList.toggle("d-none");
-
-		};
-
-		// Delete Comment
-
-		function delete_commentModal(id,button1,button2) {
-
-			// Passed data for modal
-
-			document.getElementById("deleteCommentButton").onclick = function() {	
-
-				this.innerHTML='<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Deleting comment';	
-				this.disabled = true; 
-				post('/delete/comment/' + id,
-					callback = function() {
-
-						location.reload();
-					}
-					)
-			}
-
-			document.getElementById(button1).classList.toggle("d-md-inline-block");
-			document.getElementById(button2).classList.toggle("d-md-inline-block");
-
-		};
-
-		function delete_commentModal2(id,button1,button2) {
-
-			// Passed data for modal
-
-			document.getElementById("deleteCommentButton").onclick = function() {	
-
-				this.innerHTML='<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Deleting comment';	
-				this.disabled = true; 
-				post('/delete/comment/' + id,
-					callback = function() {
-
-						location.reload();
-					}
-					)
-			}
-
-			document.getElementById(button1).classList.toggle("d-none");
-			document.getElementById(button2).classList.toggle("d-none");
-
-		};
-
-		// ban modal
-
-		const banModal = function(link, id, name) {
-			document.getElementById("banModalTitle").innerHTML = `Ban @${name}`;
-			document.getElementById("ban-modal-link").value = link;
-			document.getElementById("banUserButton").innerHTML = `Ban @${name}`;
-
-			document.getElementById("banUserButton").onclick = function() {
-				let fd = new FormData(document.getElementById("banModalForm"));
-				fd.append("formkey", formkey());
-
-				let xhr = new XMLHttpRequest();
-				xhr.open("POST", `/ban_user/${id}?form`, true);
-				xhr.withCredentials = true;
-
-				xhr.onload = function(){
-					$('#toast-post-success').toast('dispose');
-					$('#toast-post-success').toast('show');
-					document.getElementById('toast-post-success-text').innerHTML = `@${name} banned`;
-				}
-
-				xhr.send(fd);
-			}
-		};
-
-		//reporting
-		// Report Comment
-
-		report_commentModal = function(id, author) {
-
-			document.getElementById("comment-author").textContent = author;
-
-			//offtopic.disabled=true;
-
-			document.getElementById("reportCommentButton").onclick = function() {
-
-				this.innerHTML='<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Reporting comment';
-				this.disabled = true;
-				var xhr = new XMLHttpRequest();
-				xhr.open("POST", '/flag/comment/'+id, true);
-				var form = new FormData()
-				form.append("formkey", formkey());
-				form.append("reason", document.getElementById("reason-comment").value);
-
-				xhr.withCredentials=true;
-
-				xhr.onload=function() {
-					document.getElementById("reportCommentFormBefore").classList.add('d-none');
-					document.getElementById("reportCommentFormAfter").classList.remove('d-none');
-				};
-
-				xhr.onerror=function(){alert(errortext)};
-				xhr.send(form);
-			}
-
-		};
-
-		$('#reportCommentModal').on('hidden.bs.modal', function () {
-
-			var button = document.getElementById("reportCommentButton");
-
-			var beforeModal = document.getElementById("reportCommentFormBefore");
-			var afterModal = document.getElementById("reportCommentFormAfter");
-
-			button.innerHTML='Report comment';
-			button.disabled= false;
-			afterModal.classList.add('d-none');
-
-			if ( beforeModal.classList.contains('d-none') ) {
-				beforeModal.classList.remove('d-none');
-			}
-
-		});
-
-
-		// Report Submission
-
-		report_postModal = function(id, author) {
-
-			document.getElementById("post-author").textContent = author;
-
-			submitbutton=document.getElementById("reportPostButton");
-
-			submitbutton.onclick = function() {
-
-				this.innerHTML='<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Reporting post';
-				this.disabled = true;
-
-				var xhr = new XMLHttpRequest();
-				xhr.open("POST", '/flag/post/'+id, true);
-				var form = new FormData()
-				form.append("formkey", formkey());
-				form.append("reason", document.getElementById("reason").value);
-
-				xhr.withCredentials=true;
-
-				xhr.onload=function() {
-					document.getElementById("reportPostFormBefore").classList.add('d-none');
-					document.getElementById("reportPostFormAfter").classList.remove('d-none');
-				};
-
-				xhr.onerror=function(){alert(errortext)};
-				xhr.send(form);
-
-			}
-		};
-
-		$('#reportPostModal').on('hidden.bs.modal', function () {
-
-			var button = document.getElementById("reportPostButton");
-
-			var beforeModal = document.getElementById("reportPostFormBefore");
-			var afterModal = document.getElementById("reportPostFormAfter");
-
-			button.innerHTML='Report post';
-			button.disabled= false;
-
-			afterModal.classList.add('d-none');
-
-			if ( beforeModal.classList.contains('d-none') ) {
-				beforeModal.classList.remove('d-none');
-			}
-
-		});
-	
-
-
-
-		$('.expandable-image').click( function(event) {
-
-			if (event.which != 1) {
-				return
-			}
-			event.preventDefault();
-
-			var url= $(this).data('url');
-
-			expandDesktopImage(url,url);
-		})
-	
-		$('.text-expand').click(function(event){
-		if (event.which != 1) {
-			return
-		};
-		id=$(this).data('id');
-
-
-		$('#post-text-'+id).toggleClass('d-none');
-		$('.text-expand-icon-'+id).toggleClass('fa-expand-alt');
-		$('.text-expand-icon-'+id).toggleClass('fa-compress-alt');
-
-		})
-
-		// Text Formatting
-
-		// Bold Text
-
-		makeBold = function (form) {
-			var text = document.getElementById(form);
-			var startIndex = text.selectionStart,
-			endIndex = text.selectionEnd;
-			var selectedText = text.value.substring(startIndex, endIndex);
-
-			var format = '**'
-
-			if (selectedText.includes('**')) {
-				text.value = selectedText.replace(/\*/g, '');
-				
-			}
-			else if (selectedText.length == 0) {
-				text.value = text.value.substring(0, startIndex) + selectedText + text.value.substring(endIndex);
-			}
-			else {
-				text.value = text.value.substring(0, startIndex) + format + selectedText + format + text.value.substring(endIndex);
-			}
-		}
-
-		// Italicize Comment Text
-
-		makeItalics = function (form) {
-			var text = document.getElementById(form);
-			var startIndex = text.selectionStart,
-			endIndex = text.selectionEnd;
-			var selectedText = text.value.substring(startIndex, endIndex);
-
-			var format = '*'
-
-			if (selectedText.includes('*')) {
-				text.value = selectedText.replace(/\*/g, '');
-				
-			}
-			else if (selectedText.length == 0) {
-				text.value = text.value.substring(0, startIndex) + selectedText + text.value.substring(endIndex);
-			}
-			else {
-				text.value = text.value.substring(0, startIndex) + format + selectedText + format + text.value.substring(endIndex);
-			}
-		}
-
-		// Quote Comment Text
-
-		makeQuote = function (form) {
-			var text = document.getElementById(form);
-			var startIndex = text.selectionStart,
-			endIndex = text.selectionEnd;
-			var selectedText = text.value.substring(startIndex, endIndex);
-
-			var format = '>'
-
-			if (selectedText.includes('>')) {
-				text.value = text.value.substring(0, startIndex) + selectedText.replace(/\>/g, '') + text.value.substring(endIndex);
-				
-			}
-			else if (selectedText.length == 0) {
-				text.value = text.value.substring(0, startIndex) + selectedText + text.value.substring(endIndex);
-			}
-			else {
-				text.value = text.value.substring(0, startIndex) + format + selectedText + text.value.substring(endIndex);
-			}
-		}
-
-		// award modal
-
-		function awardModal(link) {
-			var target = document.getElementById("awardTarget");
-			target.action = link;
-		}
-
-		// Expand Images on Desktop
-
-		function expandDesktopImage(image, link) {
-
-		// Link text
-
-			var linkText = document.getElementById("desktop-expanded-image-link");
-			var imgLink = document.getElementById("desktop-expanded-image-wrap-link");
-
-			var inlineImage = document.getElementById("desktop-expanded-image");
-
-			inlineImage.src = image.replace("100w.webp", "giphy.webp");
-			linkText.href = image;
-			imgLink.href=image;
-
-			linkText.textContent = 'View original';
-			};
-
-		post_comment=function(fullname){
-
-
-			var form = new FormData();
-
-			form.append('formkey', formkey());
-			form.append('parent_fullname', fullname);
-			form.append('submission', document.getElementById('reply-form-submission-'+fullname).value);
-			form.append('body', document.getElementById('reply-form-body-'+fullname).value);
-			form.append('file', document.getElementById('file-upload-reply-'+fullname).files[0]);
-			var xhr = new XMLHttpRequest();
-			xhr.open("post", "/comment");
-			xhr.withCredentials=true;
-			xhr.onload=function(){
-				if (xhr.status==200) {
-					commentForm=document.getElementById('comment-form-space-'+fullname);
-					commentForm.innerHTML=JSON.parse(xhr.response)["html"];
-					$('#toast-comment-success').toast('dispose');
-					$('#toast-comment-error').toast('dispose');
-					$('#toast-comment-success').toast('show');
-				}
-				else {
-					var commentError = document.getElementById("comment-error-text");
-					$('#toast-comment-success').toast('dispose');
-					$('#toast-comment-error').toast('dispose');
-					$('#toast-comment-error').toast('show');
-					commentError.textContent = JSON.parse(xhr.response)["error"];
-				}
-			}
-			xhr.send(form)
-
-			document.getElementById('save-reply-to-'+fullname).classList.add('disabled');
-
-		}
-
-		post_reply=function(id){
-
-			var form = new FormData();
-
-			form.append('formkey', formkey());
-			form.append('parent_id', id);
-			form.append('body', document.getElementById('reply-form-body-'+id).value);
-			var xhr = new XMLHttpRequest();
-			xhr.open("post", "/reply");
-			xhr.withCredentials=true;
-			xhr.onload=function(){
-				if (xhr.status==200) {
-					commentForm=document.getElementById('comment-form-space-'+id);
-					commentForm.innerHTML=JSON.parse(xhr.response)["html"];
-					$('#toast-comment-success').toast('dispose');
-					$('#toast-comment-error').toast('dispose');
-					$('#toast-comment-success').toast('show');
-				}
-				else {
-					var commentError = document.getElementById("comment-error-text");
-					$('#toast-comment-success').toast('dispose');
-					$('#toast-comment-error').toast('dispose');
-					$('#toast-comment-error').toast('show');
-					commentError.textContent = JSON.parse(xhr.response)["error"];
-				}
-			}
-			xhr.send(form)
-
-			document.getElementById('save-reply-to-'+id).classList.add('disabled');
-
-			}
-
-		herald_comment=function(cid){
-
-
-			var xhr = new XMLHttpRequest();
-			xhr.open("post", "/admin/distinguish_comment/"+cid);
-
-			var form = new FormData();
-
-			form.append('formkey', formkey());
-
-			xhr.withCredentials=true;
-			xhr.onload=function(){
-				if (xhr.status==200) {
-					comment=document.getElementById('comment-'+cid+'-only');
-					comment.innerHTML=JSON.parse(xhr.response)["html"];
-				}
-				else {
-					var commentError = document.getElementById("comment-error-text");
-					$('#toast-comment-success').toast('dispose');
-					$('#toast-comment-error').toast('dispose');
-					$('#toast-comment-error').toast('show');
-					commentError.textContent = JSON.parse(xhr.response)["error"];
-				}
-			}
-			xhr.send(form)
-
-		}
-
-		comment_edit=function(id){
-
-			var commentError = document.getElementById("comment-error-text");
-
-			var form = new FormData();
-
-			form.append('formkey', formkey());
-			form.append('body', document.getElementById('comment-edit-body-'+id).value);
-			form.append('file', document.getElementById('file-edit-reply-'+id).files[0]);
-
-			var xhr = new XMLHttpRequest();
-			xhr.open("post", "/edit_comment/"+id);
-			xhr.withCredentials=true;
-			xhr.onload=function(){
-				if (xhr.status==200) {
-					commentForm=document.getElementById('comment-text-'+id);
-					commentForm.innerHTML=JSON.parse(xhr.response)["html"];
-					document.getElementById('cancel-edit-'+id).click()
-					$('#toast-comment-success').toast('dispose');
-					$('#toast-comment-error').toast('dispose');
-					$('#toast-comment-success').toast('show');
-				}
-				else {
-					$('#toast-comment-success').toast('dispose');
-					$('#toast-comment-error').toast('dispose');
-					$('#toast-comment-error').toast('show');
-					commentError.textContent = JSON.parse(xhr.response)["error"];
-				}
-			}
-			xhr.send(form)
-
-		}
-
-	
-		block_user=function() {
-
-			var exileForm = document.getElementById("exile-form");
-
-			var exileError = document.getElementById("toast-error-message");
-
-			var usernameField = document.getElementById("exile-username");
-
-			var isValidUsername = usernameField.checkValidity();
-
-			username = usernameField.value;
-
-			if (isValidUsername) {
-
-				var xhr = new XMLHttpRequest();
-				xhr.open("post", "/settings/block");
-				xhr.withCredentials=true;
-				f=new FormData();
-				f.append("username", username);
-				f.append("formkey", formkey());
-				xhr.onload=function(){
-					if (xhr.status<300) {
-						window.location.reload(true);
-					}
-					else {
-						$('#toast-exile-error').toast('dispose');
-						$('#toast-exile-error').toast('show');
-						exileError.textContent = JSON.parse(xhr.response)["error"];
-					}
-				}
-				xhr.send(f)
-			}
-
-		}
-
 		//mobile prompt
 		if (!("standalone" in window.navigator && window.navigator.standalone)){
 			if (window.innerWidth <= 737){
@@ -873,188 +230,9 @@
 				}
 			}
 		}
-	
-		// Voting
-
-		function post_vote(url, callback) {
-		var xhr = new XMLHttpRequest();
-		xhr.open("POST", url, true);
-		var form = new FormData()
-		form.append("formkey", formkey());
-		xhr.withCredentials=true;
-
-		xhr.onload = function() {
-			if (xhr.status==204) {}
-				else if (xhr.status >= 200 && xhr.status < 300) {
-					$('#toast-post-success').toast('dispose');
-					$('#toast-post-success').toast('show');
-					document.getElementById('toast-post-success-text').innerText = JSON.parse(xhr.response)["message"];
-					callback(xhr)
-					return true
-
-				} else if (xhr.status >= 300 && xhr.status < 400) {
-					window.location.href = JSON.parse(xhr.response)["redirect"]
-				} else {
-					data=JSON.parse(xhr.response);
-					
-					$('#toast-post-error').toast('dispose');
-					$('#toast-post-error').toast('show');
-					document.getElementById('toast-post-error-text').innerText = data["error"];
-					return false
-					
-				}
-			};
-
-			xhr.send(form);
-
-		}
-
-		var upvote = function(event) {
-
-			var type = event.target.dataset.contentType;
-			var id = event.target.dataset.idUp;
-
-			var downvoteButton = document.getElementsByClassName(type + '-' + id + '-down');
-			var upvoteButton = document.getElementsByClassName(type + '-' + id + '-up');
-			var scoreText = document.getElementsByClassName(type + '-score-' + id);
-
-			for (var j = 0; j < upvoteButton.length && j < downvoteButton.length && j < scoreText.length; j++) {
-
-				var thisUpvoteButton = upvoteButton[j];
-				var thisDownvoteButton = downvoteButton[j];
-				var thisScoreText = scoreText[j];
-				var thisScore = Number(thisScoreText.textContent);
-
-				if (thisUpvoteButton.classList.contains('active')) {
-					thisUpvoteButton.classList.remove('active')
-					thisScoreText.textContent = thisScore - 1
-					voteDirection = "0"
-				} else if (thisDownvoteButton.classList.contains('active')) {
-					thisUpvoteButton.classList.add('active')
-					thisDownvoteButton.classList.remove('active')
-					thisScoreText.textContent = thisScore + 2
-					voteDirection = "1"
-				} else {
-					thisUpvoteButton.classList.add('active')
-					thisScoreText.textContent = thisScore + 1
-					voteDirection = "1"
-				}
-
-				if (thisUpvoteButton.classList.contains('active')) {
-					thisScoreText.classList.add('score-up')
-					thisScoreText.classList.remove('score-down')
-					thisScoreText.classList.remove('score')
-				} else if (thisDownvoteButton.classList.contains('active')) {
-					thisScoreText.classList.add('score-down')
-					thisScoreText.classList.remove('score-up')
-					thisScoreText.classList.remove('score')
-				} else {
-					thisScoreText.classList.add('score')
-					thisScoreText.classList.remove('score-up')
-					thisScoreText.classList.remove('score-down')
-				}
-			}
-
-			post_vote("/vote/" + type + "/" + id + "/" + voteDirection);
-			
-		}
-
-		var downvote = function(event) {
-
-			var type = event.target.dataset.contentType;
-			var id = event.target.dataset.idDown;
-
-			var downvoteButton = document.getElementsByClassName(type + '-' + id + '-down');
-			var upvoteButton = document.getElementsByClassName(type + '-' + id + '-up');
-			var scoreText = document.getElementsByClassName(type + '-score-' + id);
-
-			for (var j = 0; j < upvoteButton.length && j < downvoteButton.length && j < scoreText.length; j++) {
-
-				var thisUpvoteButton = upvoteButton[j];
-				var thisDownvoteButton = downvoteButton[j];
-				var thisScoreText = scoreText[j];
-				var thisScore = Number(thisScoreText.textContent);
-
-				if (thisDownvoteButton.classList.contains('active')) {
-					thisDownvoteButton.classList.remove('active')
-					thisScoreText.textContent = thisScore + 1
-					voteDirection = "0"
-				} else if (thisUpvoteButton.classList.contains('active')) {
-					thisDownvoteButton.classList.add('active')
-					thisUpvoteButton.classList.remove('active')
-					thisScoreText.textContent = thisScore - 2
-					voteDirection = "-1"
-				} else {
-					thisDownvoteButton.classList.add('active')
-					thisScoreText.textContent = thisScore - 1
-					voteDirection = "-1"
-				}
-
-				if (thisUpvoteButton.classList.contains('active')) {
-					thisScoreText.classList.add('score-up')
-					thisScoreText.classList.remove('score-down')
-					thisScoreText.classList.remove('score')
-				} else if (thisDownvoteButton.classList.contains('active')) {
-					thisScoreText.classList.add('score-down')
-					thisScoreText.classList.remove('score-up')
-					thisScoreText.classList.remove('score')
-				} else {
-					thisScoreText.classList.add('score')
-					thisScoreText.classList.remove('score-up')
-					thisScoreText.classList.remove('score-down')
-				}
-			}
-
-			post_vote("/vote/" + type + "/" + id + "/" + voteDirection);
-			
-		}
-
-
-		var register_votes = function() {
-			var upvoteButtons = document.getElementsByClassName('upvote-button')
-
-			var downvoteButtons = document.getElementsByClassName('downvote-button')
-
-			var voteDirection = 0
-
-			for (var i = 0; i < upvoteButtons.length; i++) {
-				upvoteButtons[i].addEventListener('click', upvote, false);
-				upvoteButtons[i].addEventListener('keydown', function(event) {
-					if (event.keyCode === 13) {
-						upvote(event)
-					}
-				}, false)
-			};
-
-			for (var i = 0; i < downvoteButtons.length; i++) {
-				downvoteButtons[i].addEventListener('click', downvote, false);
-				downvoteButtons[i].addEventListener('keydown', function(event) {
-					if (event.keyCode === 13) {
-						downvote(event)
-					}
-				}, false)
-			};
-		}
-
-		register_votes()
 	</script>
-	{% if v %}
-		<script src="https://js.pusher.com/beams/1.0/push-notifications-cdn.js"></script>
-		
-		<script>
-			const beamsClient = new PusherPushNotifications.Client({
-				instanceId: '02ddcc80-b8db-42be-9022-44c546b4dce6',
-			});		
-			
-			beamsClient
-			.start()
-			.then((beamsClient) => beamsClient.getDeviceId())
-			.then(() => beamsClient.addDeviceInterest('{{v.strid}}'))
-			.then(() => beamsClient.getDeviceInterests())
-			.catch(console.error);
-		</script>
-	{% endif %}
-	
+
+
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
@@ -1083,10 +261,6 @@
 	<meta name="twitter:url" content="{{request.path | full_link}}" />
 	{% endblock %}
 
-	<!-- Bootstrap core CSS -->
-	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
-	integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-
 	<!-- iOS webapp -->
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="apple-touch-fullscreen" content="yes">
@@ -1238,16 +412,16 @@
 		{% block stylesheets %}
 
 		{% if v %}
-			<link rel="stylesheet" href="/assets/style/{{v.theme}}_{{v.themecolor}}.css">
-			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/style/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
+			<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css">
+			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
-			<link rel="stylesheet" href="/assets/style/{{'DEFAULT_THEME' | app_config}}.css">
+			<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css">
 		{% endif %}
 
 		{% endblock %}
 
 		<!-- Font Awesome -->
-		<link href="/assets/style/fa.css" rel="stylesheet"> <!--load all styles -->
+		<link href="/assets/css/fa.css" rel="stylesheet"> <!--load all styles -->
 
 		{% block fixedMobileBarJS %}
 		{% endblock %}
@@ -1354,7 +528,7 @@
 </div>
 
 
-<script src="/assets/js/general39.js"></script>
+
 
 
 {% if request.path=='/' and g.system and g.timestamp>session.get('tooltip_last_dismissed',0)+60*60*24 and (not g.system.endswith('/chrome') and not g.system.endswith('/other')) and not g.system.endswith('/webview') %}
diff --git a/files/templates/delete_comment_modal.html b/files/templates/delete_comment_modal.html
deleted file mode 100644
index 5182f9ead..000000000
--- a/files/templates/delete_comment_modal.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- Delete Comment Modal -->
-<div class="modal fade" id="deleteCommentModal" tabindex="-1" role="dialog" aria-labelledby="deleteCommentModalTitle" aria-hidden="true">
-	<div class="modal-dialog modal-dialog-centered" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h5 class="modal-title">Delete comment?</h5>
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="far fa-times"></i></span>
-				</button>
-			</div>
-			
-			<div class="modal-body text-center">
-
-				<div class="py-4">
-					<i class="fad fa-trash-alt text-muted" style="font-size: 3.5rem;"></i>
-				</div>
-
-				<p>Your comment will be removed everywhere on {{'SITE_NAME' | app_config}}. This action can be undone.</p>
-			</div>
-			
-			<div class="modal-footer">
-				<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
-				<button id="deleteCommentButton" class="btn btn-danger">Delete comment</button>
-			</div>
-			
-		</div>
-	</div>
-</div>
diff --git a/files/templates/delete_post_modal.html b/files/templates/delete_post_modal.html
index caf7fe8e7..b14b5fdbb 100644
--- a/files/templates/delete_post_modal.html
+++ b/files/templates/delete_post_modal.html
@@ -1,3 +1,30 @@
+<script>
+	function delete_postModal(id,button1,button2) {
+
+		// Passed data for modal
+
+		document.getElementById("deletePostButton-mobile").addEventListener("click", delete_post);
+
+		document.getElementById("deletePostButton").addEventListener("click", delete_post);
+
+		function delete_post(){	
+
+			this.innerHTML='<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Deleting post';	
+			this.disabled = true; 
+			post('/delete_post/' + id,
+				callback = function() {
+
+					location.reload();
+				}
+				)
+		}
+
+		document.getElementById(button1).classList.toggle("d-none");
+		document.getElementById(button2).classList.toggle("d-none");
+
+	};
+</script>
+
 <!-- Delete Post Modal -->
 <div class="modal fade modal-sm-bottom" id="deletePostModal" tabindex="-1" role="dialog" aria-labelledby="deletePostModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered" role="document">
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index 2c4355d71..756d7aec9 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -13,6 +13,115 @@
 	}
 </style>
 
+<script>
+	var commentFormID;
+	function commentForm(form) {
+			commentFormID = form;
+	};
+
+	const TEXTAREA_POS = 'curr-pos'
+
+	// Insert EMOJI markdown into comment box function
+
+	function getEmoji(searchTerm, form) {
+		const commentBox = document.getElementById(form);
+		const old = commentBox.value;
+		const curPos = $(commentBox).data(TEXTAREA_POS);
+
+		const firstHalf = old.slice(0, curPos)
+		const lastHalf = old.slice(curPos)
+
+		let emoji = ':' + searchTerm + ':'
+		const previousChar = firstHalf.slice(-1)
+		if (firstHalf.length > 0 && previousChar !== " " && previousChar !== "\n") {
+			emoji = " " + emoji
+		}
+		if (lastHalf.length > 0 && lastHalf[0] !== " ") {
+			emoji = emoji + " "
+		}
+
+		commentBox.value = firstHalf + emoji + lastHalf;
+
+		const newPos = curPos + emoji.length
+
+		$(commentBox).data(TEXTAREA_POS, newPos)
+	}
+
+	function loadEmojis(form) {
+
+		const emojis = [
+		{
+			type:'marsey',
+			emojis: ['marseywhirlyhat','marsey173','marseycthulhu','marseycuck','marseyemperor','marseyface','marseyjohnson','marseykneel','marseymummy','marseymummy2','marseypanda','marseypumpkin','marseyskeletor','marseystein','marseyvampire','marseyvengeance','marseywitch3','marseylong1','marseylong2','marseylong3','marseypop','marseyqueenlizard','marseyagree','marseybane','marseybog','marseybux','marseycommitted','marseydisagree','marseydizzy','marseyfunko','marseyhealthy','marseykaiser','marseykyle','marseymask','marseymeds','marseykvlt','marseyn8','marseynietzsche','marseyobey','marseypatriot','marseypedo','marseypony','marseypuke','marseyqueen','marseyrage','marseysnek','marseytinfoil','marseywitch2','marseycenter','marseyauthleft','marseyauthright','marseylibleft','marseylibright','marseybinladen','marseycool','marseyjanny2','marseyjones','marseynapoleon','marseysanders','marseyshrug','marseysnoo','marseysoypoint','marseybiting','marseyblush','marseybountyhunter','marseycoonass','marseyfinger','marseyglancing','marseyhappy','marseyhearts','marseyluther','marseypizzashill','marseypokerface','marseypopcorn','marseyrasta','marseysad2','marseysmirk','marseysurprised','marseythomas','marseywitch','marseyyawn','marcusfootball','marje','marmsey','marsey1984','marsey420','marsey4chan','marsey69','marseyakshually','marseyandmarcus','marseyangel','marseyasian','marseybattered','marseybiden','marseybingus','marseyblm','marseyblowkiss','marseybluecheck','marseybong','marseybooba','marseyboomer','marseybrainlet','marseybride','marseyburger','marseybush','marseycamus','marseycanned','marseycarp','marseycatgirl','marseychef','marseychonker','marseychu','marseyclown','marseycomrade','marseyconfused','marseycoomer','marseycop','marseycope','marseycorn','marseycowboy','marseycry','marseycumjar1','marseycumjar2','marseycumjar3','marseycwc','marseydead','marseydepressed','marseydespair','marseydeux','marseydildo','marseydoomer','marseydrunk','marseydynamite','marseyexcited','marseyeyeroll','marseyfacepalm','marseyfamily','marseyfbi','marseyfeet','marseyfeminist','marseyflamethrower','marseyflamewar','marseyfloyd','marseyfug','marseygasp','marseyghost','marseygift','marseygigaretard','marseygigavaxxer','marseyglam','marseyglow','marseygodfather','marseygoodnight','marseygrass','marseygrilling','marseyhacker','marseyhmm','marseyhmmm','marseyilluminati','marseyinabox','marseyira','marseyisis','marseyjam','marseyjamming','marseyjanny','marseyjunkie','marseyking','marseykkk','marseylaugh','marseylawlz','marseylifting','marseylizard','marseylolcow','marseylove','marseymad','marseymanlet','marseymaoist','marseymcarthur','marseymerchant','marseymermaid','marseymommy','marseymouse','marseymyeisha','marseyneckbeard','marseyniqab','marseynpc','marseynun','marseynut','marseyorthodox','marseyowow','marseypainter','marseypanties','marseyparty','marseypat','marseypeacekeeper','marseypharaoh','marseypickle','marseypinochet','marseypipe','marseypirate','marseypoggers','marseypope','marseyproctologist','marseypsycho','marseyqoomer','marseyradioactive','marseyrain','marseyrat','marseyreading','marseyready','marseyrealwork','marseyreich','marseyrentfree','marseyretard','marseyrick','marseyrope','marseyrowling','marseysad','marseysadcat','marseyscarf','marseyschizo','marseyseethe','marseyshisha','marseyshook','marseysick','marseysleep','marseysmug','marseysneed','marseysociety','marseyspider','marseysrdine','marseystroke','marseysus','marseytaliban','marseytank','marseytankushanka','marseytea','marseythonk','marseythumbsup','marseytrain','marseysipping','marseytrans','marseytrans2','marseytroll','marseytrump','marseytwerking','marseyunabomber','marseyuwuw','marseyvan','marseyvaxmaxx','marseywave','marseyworried','marseyxd','marseyyeezus','marseyzoomer','marseyzwei','marsoy','marsoyhype']
+		},
+		{
+			type:'platy',
+			emojis: ['platyabused','platyblizzard','platyboxer','platydevil','platyfear','platygirlmagic','platygolong','platyhaes','platyking','platylove','platyneet','platyold','platypatience','platypopcorn','platyrich','platysarcasm','platysilly','platysleeping','platythink','platytired','platytuxedomask','platyblush','platybruh','platycaveman','platycheer','platydown','platyeyes','platyheart','platylol','platymicdrop','platynooo','platysalute','platyseethe','platythumbsup','platywave']
+		},
+		{
+			type:'tay',
+			emojis: ['tayaaa','tayadmire','taycat','taycelebrate','taychefkiss','taychristmas','tayclap','taycold','taycrown','tayflex','tayflirt','taygrimacing','tayhappy','tayheart','tayhmm','tayhuh','tayhyperdab','tayjammin','taylaugh','taymindblown','tayno','taynod','taypeace','taypray','tayrun','tayscrunch','tayshake','tayshrug','taysilly','tayslide','taysmart','taystop','taytantrum','taytea','taythink','tayvibin','taywhat','taywine','taywine2','taywink','tayyes']
+		},
+		{
+			type:'classic',
+			emojis: ['2thumbsup','aliendj','ambulance','angry','angrywhip','argue','aroused','ashamed','badass','banana','band','banghead','batman','bigeyes','bite','blind','blowkiss','blush','bong','bounce','bow','breakheart','bs','cartwheel','cat','celebrate','chainsaw','cheers','clap','cold','confused','crazyeyes','cry','cthulhu','cute','D','daydream','ddr','deadpool','devilsmile','diddle','die','distress','disturbing','dizzy','domo','doughboy','drink','drool','dudeweedlmao','edward','electro','elephant','embarrassed','emo','emo2','evil','evilclown','evilgrin','facepalm','fap','flamethrower','flipbird','flirt','frown','gasp','glomp','go','gooby','grr','gtfo','guitar','haha','handshake','happydance','headbang','heart','heartbeat','hearts','highfive','hmm','hmph','holdhands','horny','hug','hugging','hugs','hump','humpbed','hysterical','ily','inlove','jason','jawdrop','jedi','jester','kaboom','kick','kiss','kitty','laughchair','lick','link','lol','lolbeat','loving','makeout','medal','megaman','megamanguitar','meow','metime','mooning','mummy','na','nauseous','nervous','ninja','nod','nono','omg','onfire','ooo','orly','p','paddle','panda','pandabutt','paranoid','party','pat','peek','pikachu','pimp','plzdie','poke','popcorn','pout','probe','puke','punch','quote','raccoon','roar','rofl','roflmao','rolleyes','sad','sadeyes','sadhug','samurai','sarcasm','scoot','scream','shmoopy','shrug','skull','slap','slapfight','sleepy','smackfish','smackhead','smh','smile','smoke','sonic','spank','sparta','sperm','spiderman','stab','star','stare','stfu','suicide','surprisehug','suspicious','sweat','swordfight','taco','talk2hand','tantrum','teehee','thinking','threesome','throw','throwaway','tickle','typing','uhuh','vampbat','viking','violin','vulgar','wah','wat','whip','whipping','wink','witch','wizard','woah','worm','woo','work','worship','wow','XD','yay','zzz']
+		},
+		{
+			type:'rage',
+			emojis: ['troll','bitchplease','spit','challengeaccepted','contentiouscereal','cryingatcuteness','derp','derpcornsyrup','derpcrying','derpcute','derpdumb','derpeuphoria','derpinahd','derpinapokerface','derpinasnickering','derpprocessing','derprealization','derpsnickering','derptalking','derpthinking','derpthumbsup','derpunimpressed','derpwhy','donotwant','epicfacefeatures','fancywithwine','fffffffuuuuuuuuuuuu','flipthetable','foreveralone','foreveralonehappy','hewillnever','idontknow','interuptedreading','iseewhatyoudidthere','killherkillher','ledesire','leexcited','legenius','lelolidk','lemiddlefinger','lemindblown','leokay','lepanicrunning','lepokerface','lepokerface2','lerageface','leseriousface','likeaboss','lolface','longwhiskers','manymiddlefingers','megusta','motherfucker','motherofgod','mysides','ohgodwhy','pervertedspiderman','picard','ragestrangle','rukiddingme','tfwyougettrolled','trollolol','truestorybro','xallthey','yuno']
+		},
+		{
+			type:'wojak',
+			emojis: ['gigachad','gigachad2','chadyes','chadno','abusivewife','ancap','bardfinn','bloomer','boomer','boomermonster','brainletbush','brainletcaved','brainletchair','brainletchest','brainletmaga','brainletpit','chad','chadarab','chadasian','chadblack','chadjesus','chadjew','chadjihadi','chadlatino','chadlibleft','chadnordic','chadsikh','chadusa','coomer','doomer','doomerfront','doomergirl','ethot','fatbrain','fatpriest','femboy','gogetter','grug','monke','nazijak','npc','npcfront','npcmaga','psychojak','ragejak','ragemask','ramonajak','soyjackwow','soyjak','soyjakfront','soyjakhipster','soyjakmaga','soyjakyell','tomboy','zoomer','zoomersoy']
+		},
+		{
+			type:'flags',
+			emojis: ['niger', 'lgbt', 'saudi', 'animesexual','blacknation','blm','blueline','dreamgender','fatpride','incelpride','israel','kazakhstan','landlordlove','scalperpride','superstraight','trans','translord','transracial','usa']
+		}
+		]
+
+		let search_bar = document.getElementById("emoji_search");
+		let search_container = document.getElementById('emoji-tab-search')
+
+		if(search_bar.value == ""){
+			let container = document.getElementById(`EMOJIS_favorite`)
+			container.innerHTML = container.innerHTML.replace(/@form@/g, form)
+
+			const commentBox = document.getElementById(form);
+			$(commentBox).data(TEXTAREA_POS, commentBox.selectionStart)
+
+			for (i=0; i < emojis.length; i++) {
+
+				let container = document.getElementById(`EMOJIS_${emojis[i].type}`)
+				let str = ''
+				let arr = emojis[i].emojis
+
+				for (j=0; j < arr.length; j++) {
+					if(arr[j].match(search_bar.value)){
+						str += `<button class="btn m-1 px-0" onclick="getEmoji(\'${arr[j]}\', \'${form}\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-toggle="tooltip" title=":${arr[j]}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis/${arr[j]}.webp" alt="${arr[j]}-emoji"/></button>`;
+					}
+				}
+
+				container.innerHTML = str
+				search_container.innerHTML = ""
+			}
+		}else{
+			let str = ''
+			for (i=0; i < emojis.length; i++) {
+				let arr = emojis[i].emojis
+				let container = document.getElementById(`EMOJIS_${emojis[i].type}`)
+				for (j=0; j < arr.length; j++) {
+					if(arr[j].match(search_bar.value.toLowerCase())){
+					str += `<button class="btn m-1 px-0" onclick="getEmoji(\'${arr[j]}\', \'${form}\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-toggle="tooltip" title=":${arr[j]}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis/${arr[j]}.webp" alt="${arr[j]}-emoji"/></button>`;
+					}
+				}
+				container.innerHTML = ""
+			}
+			search_container.innerHTML = str
+		}
+		search_bar.oninput = function(){loadEmojis(form);};
+	}
+</script>
 <!-- Emoji Selection Modal -->
 <div id="form" class="d-none"></div>
 <div class="modal fade" id="emojiModal" tabindex="-1" role="dialog" aria-labelledby="emojiModalTitle" aria-hidden="true">
diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html
index 97f01cb42..d58beda0f 100644
--- a/files/templates/expanded_image_modal.html
+++ b/files/templates/expanded_image_modal.html
@@ -1,3 +1,36 @@
+<script>
+	$('.expandable-image').click( function(event) {
+
+		if (event.which != 1) {
+			return
+		}
+		event.preventDefault();
+
+		var url= $(this).data('url');
+
+		expandDesktopImage(url,url);
+	})
+
+	// Expand Images on Desktop
+
+	function expandDesktopImage(image, link) {
+
+		// Link text
+
+		var linkText = document.getElementById("desktop-expanded-image-link");
+		var imgLink = document.getElementById("desktop-expanded-image-wrap-link");
+
+		var inlineImage = document.getElementById("desktop-expanded-image");
+
+		inlineImage.src = image.replace("100w.webp", "giphy.webp");
+		linkText.href = image;
+		imgLink.href=image;
+
+		linkText.textContent = 'View original';
+	};
+
+</script>
+
 <!-- Expand Desktop Image Modal -->
 
 <div class="modal desktop-expanded-image-modal" id="expandImageModal" tabindex="-1" role="dialog" aria-labelledby="expandImageModalTitle" aria-hidden="true">
diff --git a/files/templates/flag_comment_modal.html b/files/templates/flag_comment_modal.html
deleted file mode 100644
index e8f946659..000000000
--- a/files/templates/flag_comment_modal.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- Report Comment Modal -->
-<div class="modal fade" id="reportCommentModal" tabindex="-1" role="dialog" aria-labelledby="reportCommentModalTitle" aria-hidden="true">
-	<div class="modal-dialog modal-dialog-centered" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h5 class="modal-title">Report <span id="comment-author"></span>'s comment</h5>
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="far fa-times"></i></span>
-				</button>
-			</div>
-			<!-- Before report is made, show this -->
-			<div class="" id="reportCommentFormBefore">
-				<form id="report-comment-form" method="post">
-					<div class="modal-body">
-						<div class="h6">We're sorry something here is wrong.</div>
-						<small class="form-text text-muted">Please enter a reason for reporting below.</small>
-						<pre></pre>
-						<input maxlength="100" id="reason-comment" class="form-control"/>
-					</div>
-					<div class="modal-footer">
-						<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
-						<button type="button" id="reportCommentButton" class="btn btn-danger">Report comment</button>
-					</div>
-				</form>
-			</div>
-			<!-- After report is made, show this -->
-			<div class="d-none" id="reportCommentFormAfter">
-				<div class="modal-body">
-					<div class="h6">Thank you for reporting this comment!</div>
-					<small class="form-text text-muted">We'll take it from here.</small>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/files/templates/gif_modal.html b/files/templates/gif_modal.html
index 291b48cc5..717082080 100644
--- a/files/templates/gif_modal.html
+++ b/files/templates/gif_modal.html
@@ -1,3 +1,145 @@
+<script>
+	
+
+	// Identify which comment form to insert GIF int
+
+	async function getGif(searchTerm) {
+
+		if (searchTerm !== undefined) {
+			document.getElementById('gifSearch').value = searchTerm;
+		}
+		else {
+			document.getElementById('gifSearch').value = null;
+		}
+
+		// load more gifs div
+
+		var loadGIFs = document.getElementById('gifs-load-more');
+
+		// error message div
+
+		var noGIFs = document.getElementById('no-gifs-found');
+
+		// categories div
+
+		var cats = document.getElementById('GIFcats');
+
+		// container div
+
+		var container = document.getElementById('GIFs');
+
+		// modal body div
+
+		var modalBody = document.getElementById('gif-modal-body')
+
+		// UI buttons
+
+		var backBtn = document.getElementById('gifs-back-btn');
+
+		var cancelBtn = document.getElementById('gifs-cancel-btn');
+
+		container.innerHTML = '';
+
+		if (searchTerm == undefined) {
+			container.innerHTML = '<div class="card" onclick="getGif(\'agree\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Agree</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/wGhYz3FHaRJgk/200w_d.webp"> </div> <div class="card" onclick="getGif(\'laugh\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Laugh</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/O5NyCibf93upy/200w_d.webp"> </div> <div class="card" onclick="getGif(\'confused\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Confused</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/3o7btPCcdNniyf0ArS/200w_d.webp"> </div> <div class="card" onclick="getGif(\'sad\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Sad</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/ISOckXUybVfQ4/200w_d.webp"> </div> <div class="card" onclick="getGif(\'happy\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Happy</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/XR9Dp54ZC4dji/200w_d.webp"> </div> <div class="card" onclick="getGif(\'awesome\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Awesome</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/3ohzdIuqJoo8QdKlnW/200w_d.webp"> </div> <div class="card" onclick="getGif(\'yes\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Yes</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/J336VCs1JC42zGRhjH/200w_d.webp"> </div> <div class="card" onclick="getGif(\'no\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">No</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/1zSz5MVw4zKg0/200w_d.webp"> </div> <div class="card" onclick="getGif(\'love\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Love</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/4N1wOi78ZGzSB6H7vK/200w_d.webp"> </div> <div class="card" onclick="getGif(\'please\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Please</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/qUIm5wu6LAAog/200w_d.webp"> </div> <div class="card" onclick="getGif(\'scared\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Scared</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/bEVKYB487Lqxy/200w_d.webp"> </div> <div class="card" onclick="getGif(\'angry\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Angry</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/12Pb87uq0Vwq2c/200w_d.webp"> </div> <div class="card" onclick="getGif(\'awkward\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Awkward</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/unFLKoAV3TkXe/200w_d.webp"> </div> <div class="card" onclick="getGif(\'cringe\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Cringe</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/1jDvQyhGd3L2g/200w_d.webp"> </div> <div class="card" onclick="getGif(\'omg\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">OMG</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/3o72F8t9TDi2xVnxOE/200w_d.webp"> </div> <div class="card" onclick="getGif(\'why\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Why</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/1M9fmo1WAFVK0/200w_d.webp"> </div> <div class="card" onclick="getGif(\'gross\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Gross</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/pVAMI8QYM42n6/200w_d.webp"> </div> <div class="card" onclick="getGif(\'meh\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Meh</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/xT77XTpyEzJ4OJO06c/200w_d.webp"> </div>'
+
+			backBtn.innerHTML = null;
+
+			cancelBtn.innerHTML = null;
+
+			noGIFs.innerHTML = null;
+
+			loadGIFs.innerHTML = null;
+		}
+		else {
+			backBtn.innerHTML = '<button class="btn btn-link pl-0 pr-3" id="gifs-back-btn" onclick="getGif();"><i class="fas fa-long-arrow-left text-muted ml-3"></i></button>';
+
+			cancelBtn.innerHTML = '<button class="btn btn-link pl-3 pr-0" id="gifs-cancel-btn" onclick="getGif();"><i class="fas fa-times text-muted"></i></button>';
+
+			let response = await fetch("/giphy?searchTerm=" + searchTerm + "&limit=48");
+			let data = await response.json()
+			var max = data.length - 1 //length of response, minus 1 (cuz array starts at index 0)
+			data = data.data
+			// GIF array
+			var gifURL = [];
+
+			if (max <= 0) {
+				noGIFs.innerHTML = '<div class="text-center py-3 mt-3"><div class="mb-3"><i class="fad fa-frown text-gray-500" style="font-size: 3.5rem;"></i></div><p class="font-weight-bold text-gray-500 mb-0">Aw shucks. No GIFs found...</p></div>';
+				container.innerHTML = null;
+				loadGIFs.innerHTML = null;
+			}
+			else {
+				for (var i = 0; i < 48; i++) {
+				gifURL[i] = "https://media.giphy.com/media/" + data[i].id + "/200w_d.webp";
+				if (data[i].username==''){
+					container.innerHTML += ('<div class="card bg-white" style="overflow: hidden" data-dismiss="modal" aria-label="Close" onclick="insertGIF(\'' + 'https://media.giphy.com/media/' + data[i].id + '/200w_d.webp' + '\',\'' + commentFormID + '\')"><div class="gif-cat-overlay"></div><img loading="lazy" class="img-fluid" src="' + gifURL[i] + '"></div>');
+				}
+				else {
+					container.innerHTML += ('<div class="card bg-white" style="overflow: hidden" data-dismiss="modal" aria-label="Close" title="by '+data[i].username+' on GIPHY" onclick="insertGIF(\'' + 'https://media.giphy.com/media/' + data[i].id + '/200w_d.webp' + '\',\'' + commentFormID + '\')"><div class="gif-cat-overlay"></div><img loading="lazy" class="img-fluid" src="' + gifURL[i] + '"></div>');
+				}
+				noGIFs.innerHTML = null;
+				loadGIFs.innerHTML = '<div class="text-center py-3"><div class="mb-3"><i class="fad fa-grin-beam-sweat text-gray-500" style="font-size: 3.5rem;"></i></div><p class="font-weight-bold text-gray-500 mb-0">Thou&#39;ve reached the end of the list!</p></div>';
+				}
+			}
+		}
+	}
+
+	function insertGIF(url,form) {
+
+		var gif = "![](" + url +")";
+
+		var commentBox = document.getElementById(form);
+
+		var old	= commentBox.value;
+
+		commentBox.value = old + gif;
+
+		}
+
+		// When GIF keyboard is hidden, hide all GIFs
+
+		$('#gifModal').on('hidden.bs.modal', function (e) {
+
+		document.getElementById('gifSearch').value = null;
+
+		// load more gifs div
+
+		var loadGIFs = document.getElementById('gifs-load-more');
+
+		// no GIFs div
+
+		var noGIFs = document.getElementById('no-gifs-found');
+
+		// container div
+
+		var container = document.getElementById('GIFs');
+
+		// UI buttons
+
+		var backBtn = document.getElementById('gifs-back-btn');
+
+		var cancelBtn = document.getElementById('gifs-cancel-btn');
+
+		// Remove inner HTML from container var
+
+		container.innerHTML = '<div class="card" onclick="getGif(\'agree\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Agree</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/wGhYz3FHaRJgk/200w_d.webp"> </div> <div class="card" onclick="getGif(\'laugh\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Laugh</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/O5NyCibf93upy/200w_d.webp"> </div> <div class="card" onclick="getGif(\'confused\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Confused</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/3o7btPCcdNniyf0ArS/200w_d.webp"> </div> <div class="card" onclick="getGif(\'sad\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Sad</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/ISOckXUybVfQ4/200w_d.webp"> </div> <div class="card" onclick="getGif(\'happy\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Happy</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/XR9Dp54ZC4dji/200w_d.webp"> </div> <div class="card" onclick="getGif(\'awesome\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Awesome</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/3ohzdIuqJoo8QdKlnW/200w_d.webp"> </div> <div class="card" onclick="getGif(\'yes\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Yes</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/J336VCs1JC42zGRhjH/200w_d.webp"> </div> <div class="card" onclick="getGif(\'no\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">No</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/1zSz5MVw4zKg0/200w_d.webp"> </div> <div class="card" onclick="getGif(\'love\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Love</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/4N1wOi78ZGzSB6H7vK/200w_d.webp"> </div> <div class="card" onclick="getGif(\'please\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Please</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/qUIm5wu6LAAog/200w_d.webp"> </div> <div class="card" onclick="getGif(\'scared\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Scared</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/bEVKYB487Lqxy/200w_d.webp"> </div> <div class="card" onclick="getGif(\'angry\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Angry</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/12Pb87uq0Vwq2c/200w_d.webp"> </div> <div class="card" onclick="getGif(\'awkward\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Awkward</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/unFLKoAV3TkXe/200w_d.webp"> </div> <div class="card" onclick="getGif(\'cringe\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Cringe</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/1jDvQyhGd3L2g/200w_d.webp"> </div> <div class="card" onclick="getGif(\'omg\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">OMG</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/3o72F8t9TDi2xVnxOE/200w_d.webp"> </div> <div class="card" onclick="getGif(\'why\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Why</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/1M9fmo1WAFVK0/200w_d.webp"> </div> <div class="card" onclick="getGif(\'gross\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Gross</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/pVAMI8QYM42n6/200w_d.webp"> </div> <div class="card" onclick="getGif(\'meh\');" style="overflow: hidden;"> <div class="gif-cat-overlay"> <div style="position: relative;top: 50%;transform: translateY(-50%);color: #ffffff;font-weight: bold;">Meh</div> </div> <img loading="lazy" class="img-fluid" src="https://media.giphy.com/media/xT77XTpyEzJ4OJO06c/200w_d.webp"> </div>'
+
+		// Hide UI buttons
+
+		backBtn.innerHTML = null;
+
+		cancelBtn.innerHTML = null;
+
+		// Remove inner HTML from no gifs div
+
+		noGIFs.innerHTML = null;
+
+		// Hide no more gifs div
+
+		loadGIFs.innerHTML = null;
+	});
+</script>
+
 <!-- GIF Selection Modal - Powered by GIPHY -->
 <div class="modal fade" id="gifModal" tabindex="-1" role="dialog" aria-labelledby="gifModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-5" role="document">
diff --git a/files/templates/log.html b/files/templates/log.html
index 91f7ef6d2..663561dbf 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -5,10 +5,10 @@
 {% block stylesheets %}
 
 {% if v %}
-	<link rel="stylesheet" href="/assets/style/{{v.theme}}_{{v.themecolor}}.css">
-	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/style/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
+	<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css">
+	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 {% else %}
-	<link rel="stylesheet" href="/assets/style/{{'DEFAULT_THEME' | app_config}}.css">
+	<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css">
 {% endif %}
 
 {% endblock %}
diff --git a/files/templates/login.html b/files/templates/login.html
index d9f006c99..20fcfe31f 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -15,19 +15,11 @@
 		
 		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
 
-		<!-- Bootstrap core CSS -->
-		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
-		integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-
 		<!-- Font Awesome -->
-		<link href="/assets/style/fa.css" rel="stylesheet"> <!--load all styles -->
-
-		<script data-search-pseudo-elements defer src="https://use.fontawesome.com/releases/latest/js/javascript.js"
-		integrity="sha384-L469/ELG4Bg9sDQbl0hvjMq8pOcqFgkSpwhwnslzvVVGpDjYJ6wJJyYjvG3u8XW7"
-		crossorigin="anonymous"></script>
+		<link href="/assets/css/fa.css" rel="stylesheet"> <!--load all styles -->
 
 		<!-- {{'SITE_NAME' | app_config}} CSS -->
-		<link rel="stylesheet" href="/assets/style/{{'DEFAULT_THEME' | app_config}}.css">
+		<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css">
 
 </head>
 
@@ -132,6 +124,7 @@
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
 <script src="/assets/js/general39.js"></script>
 
+
 <pre>
 
 
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 9659078db..26f530e31 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -12,18 +12,12 @@
 		<title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
 
 		<!-- Bootstrap core CSS -->
-		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
-		integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-
 		<!-- Font Awesome -->
 		<link href="/assets/fontawesome/css/all.css" rel="stylesheet"> <!--load all styles -->
 
-		<script data-search-pseudo-elements defer src="https://use.fontawesome.com/releases/latest/js/javascript.js"
-		integrity="sha384-L469/ELG4Bg9sDQbl0hvjMq8pOcqFgkSpwhwnslzvVVGpDjYJ6wJJyYjvG3u8XW7"
-		crossorigin="anonymous"></script>
 
 		<!-- {{'SITE_NAME' | app_config}} CSS -->
-		<link rel="stylesheet" href="/assets/style/{{'DEFAULT_THEME' | app_config}}.css">
+		<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css">
 
 </head>
 
diff --git a/files/templates/mobile_navigation_bar.html b/files/templates/mobile_navigation_bar.html
index 2bc3342a0..0a4008cbc 100644
--- a/files/templates/mobile_navigation_bar.html
+++ b/files/templates/mobile_navigation_bar.html
@@ -4,6 +4,59 @@
 	}
 </style>
 
+<script>
+	// Mobile bottom navigation bar
+
+	window.onload = function () {
+		var prevScrollpos = window.pageYOffset;
+		window.onscroll = function () {
+			var currentScrollPos = window.pageYOffset;
+
+			var topBar = document.getElementById("fixed-bar-mobile");
+
+			var bottomBar = document.getElementById("mobile-bottom-navigation-bar");
+
+			var dropdown = document.getElementById("mobileSortDropdown");
+
+			var navbar = document.getElementById("navbar");
+
+			if (bottomBar != null) {
+				if (prevScrollpos > currentScrollPos && (window.innerHeight + currentScrollPos) < (document.body.offsetHeight - 65)) {
+					bottomBar.style.bottom = "0px";
+				} 
+				else if (currentScrollPos <= 125 && (window.innerHeight + currentScrollPos) < (document.body.offsetHeight - 65)) {
+					bottomBar.style.bottom = "0px";
+				}
+				else if (prevScrollpos > currentScrollPos && (window.innerHeight + currentScrollPos) >= (document.body.offsetHeight - 65)) {
+					bottomBar.style.bottom = "-50px";
+				}
+				else {
+					bottomBar.style.bottom = "-50px";
+				}
+			}
+
+			// Execute if bottomBar exists
+
+			if (topBar != null && dropdown != null) {
+				if (prevScrollpos > currentScrollPos) {
+					topBar.style.top = "48px";
+					navbar.classList.remove("shadow");
+				} 
+				else if (currentScrollPos <= 125) {
+					topBar.style.top = "48px";
+					navbar.classList.remove("shadow");
+				}
+				else {
+					topBar.style.top = "-48px";
+					dropdown.classList.remove('show');
+					navbar.classList.add("shadow");
+				}
+			}
+			prevScrollpos = currentScrollPos;
+		}
+	}
+</script>
+
 <div class="container d-inline-flex d-lg-none">
 
 		<div class="row fixed-bottom bg-white border-top p-2" id="mobile-bottom-navigation-bar"
diff --git a/files/templates/notifications.html b/files/templates/notifications.html
index 4f7fe9802..cf423d7c0 100644
--- a/files/templates/notifications.html
+++ b/files/templates/notifications.html
@@ -116,7 +116,4 @@
 {% endblock %}
 
 {% block GIFpicker %}
-{% if v %}
-{% include "gif_modal.html" %}
-{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/flag_post_modal.html b/files/templates/report_post_modal.html
similarity index 50%
rename from files/templates/flag_post_modal.html
rename to files/templates/report_post_modal.html
index 8a143491f..a5035f72b 100644
--- a/files/templates/flag_post_modal.html
+++ b/files/templates/report_post_modal.html
@@ -1,3 +1,55 @@
+<script>
+    // Report Submission
+
+    report_postModal = function(id, author) {
+
+        document.getElementById("post-author").textContent = author;
+
+        submitbutton=document.getElementById("reportPostButton");
+
+        submitbutton.onclick = function() {
+
+            this.innerHTML='<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Reporting post';
+            this.disabled = true;
+
+            var xhr = new XMLHttpRequest();
+            xhr.open("POST", '/flag/post/'+id, true);
+            var form = new FormData()
+            form.append("formkey", formkey());
+            form.append("reason", document.getElementById("reason").value);
+
+            xhr.withCredentials=true;
+
+            xhr.onload=function() {
+                document.getElementById("reportPostFormBefore").classList.add('d-none');
+                document.getElementById("reportPostFormAfter").classList.remove('d-none');
+            };
+
+            xhr.onerror=function(){alert(errortext)};
+            xhr.send(form);
+
+        }
+    };
+
+    $('#reportPostModal').on('hidden.bs.modal', function () {
+
+        var button = document.getElementById("reportPostButton");
+
+        var beforeModal = document.getElementById("reportPostFormBefore");
+        var afterModal = document.getElementById("reportPostFormAfter");
+
+        button.innerHTML='Report post';
+        button.disabled= false;
+
+        afterModal.classList.add('d-none');
+
+        if ( beforeModal.classList.contains('d-none') ) {
+            beforeModal.classList.remove('d-none');
+        }
+
+    });
+</script>
+
 <!-- Report Post Modal -->
 <div class="modal fade" id="reportPostModal" tabindex="-1" role="dialog" aria-labelledby="reportPostModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered" role="document">
diff --git a/files/templates/search.html b/files/templates/search.html
index 76aeb3fa0..9b86b7416 100644
--- a/files/templates/search.html
+++ b/files/templates/search.html
@@ -140,7 +140,9 @@
 
 			<div class="posts" id="posts">
 
-				{% block listing_template %}{% include "submission_listing.html" %}{% endblock %}
+				{% block listing_template %}
+					{% include "submission_listing.html" %}
+				{% endblock %}
 
 			</div>
 		</div>
diff --git a/files/templates/settings.html b/files/templates/settings.html
index c42610c6e..38f48a101 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -13,6 +13,7 @@
 	<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"></script>
 	<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script>
+	<script src="/assets/js/general39.js"></script>
 
 	<script>
 
@@ -95,17 +96,14 @@
 		<meta name="twitter:url" content="{{request.host}}" />
 	<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
 
-	<!-- Bootstrap core CSS -->
-	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
-	integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
 
 	<!-- {{'SITE_NAME' | app_config}} CSS -->
 
-	<link rel="stylesheet" href="/assets/style/{{v.theme}}_{{v.themecolor}}.css">
-	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/style/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
+	<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css">
+	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 
 	<!-- Font Awesome -->
-	<link href="/assets/style/fa.css" rel="stylesheet"> <!--load all styles -->
+	<link href="/assets/css/fa.css" rel="stylesheet"> <!--load all styles -->
 
 	<script>
 		function formkey() {
@@ -232,8 +230,74 @@
  </div>
 
  {% if v %}
- {% include "2fa_modal.html" %}
- {% endif %}
+	<!-- 2FA Modal -->
+	<div class="modal fade" id="2faModal" tabindex="-1" role="dialog" aria-labelledby="2faModalTitle" aria-hidden="true">
+		<div class="modal-dialog modal-dialog-centered" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title">{% if mfa_secret %}Setup two-step login{% elif mfa_secret and not v.email %}Email required for two-step login{% else %}Disable two-step login{% endif %}</h5>
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+						<span aria-hidden="true"><i class="far fa-times"></i></span>
+					</button>
+				</div>
+				{% if mfa_secret %}
+				<div>
+					<form action="/settings/security" method="post">
+						<input type="hidden" name="formkey" value="{{v.formkey}}">
+						<input type="hidden" name="2fa_secret" value="{{mfa_secret}}">
+						<div class="modal-body">
+							<p>
+								<span class="font-weight-bold">Step 1:</span> Scan this barcode (or enter the code) using a two-factor authentication app such as Google Authenticator or Authy.
+							</p>
+							<div class="text-center mb-3">
+								<img loading="lazy" class="img-fluid" style="width: 175px;" src="/2faqr/{{mfa_secret}}">
+								<pre></pre>
+								<div class="text-small text-muted">Or enter this code: {{mfa_secret}}</div>
+							</div>
+							<p>
+								<span class="font-weight-bold">Step 2:</span> Enter the six-digit code generated in the authenticator app and your {{'SITE_NAME' | app_config}} account password.
+							</p>
+							<label for="2fa_input">6-digit code</label>
+							<input type="text" class="form-control mb-2" id="2fa_input" name="2fa_token" placeholder="# # # # # #" required>
+
+							<label for="2fa_input_password">Password</label>
+							<input type="password" autocomplete="new-password" class="form-control mb-2" id="2fa_input_password" name="password" oninput="document.getElementById('enable2faButton').disabled=false" autocomplete="off" required>
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
+							<input id="enable2faButton" class="btn btn-primary" type="submit" value="Enable 2-step login" disabled>
+						</div>
+					</form>
+				</div>
+				{% else %}
+				<div>
+					<form action="/settings/security" method="post">
+						<input type="hidden" name="formkey" value="{{v.formkey}}">
+						<input type="hidden" name="2fa_secret" value="{{mfa_secret}}">
+						<div class="modal-body">
+
+							<div class="alert alert-warning" role="alert">
+								<i class="fas fa-info-circle"></i>
+								To disable two-step login, please enter your {{'SITE_NAME' | app_config}} account password and the 6-digit code generated in your authentication app. If you no longer have your two-step device, <a href="/lost_2fa">click here</a>.
+							</div>
+
+							<label for="2fa_input_password">Password</label>
+							<input type="password" autocomplete="new-password" class="form-control mb-2" id="2fa_input_password" name="password" autocomplete="off" required>
+
+							<label for="2fa_input">6-digit code</label>
+							<input type="text" class="form-control mb-2" id="2fa_input" name="2fa_remove" placeholder="# # # # # #" oninput="document.getElementById('disable2faButton').disabled=false" required>
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
+							<input id="disable2faButton" class="btn btn-primary" type="submit" value="Disable 2-step login" disabled>
+						</div>
+					</form>
+				</div>
+				{% endif %}
+			</div>
+		</div>
+	</div>
+{% endif %}
 
  <!-- Clipboard Toast -->
 
@@ -264,7 +328,7 @@
 	</div>
 </div>
 
-<script src="/assets/js/general39.js"></script>
+
 
 {% block onload %}{% endblock %}
 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 4ae49fb9c..3eb706472 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -34,20 +34,16 @@
 
 	<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
 
-	<!-- Bootstrap core CSS -->
-	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
-	integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-
 	<!-- {{'SITE_NAME' | app_config}} CSS -->
 
 	{% if v %}
-	<link id="css-link" rel="stylesheet" href="/assets/style/{{v.theme}}_{{v.themecolor}}.css">
+	<link id="css-link" rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css">
 	{% else %}
-	<link id="css-link" rel="stylesheet" href="/assets/style/{{'DEFAULT_THEME' | app_config}}.css">
+	<link id="css-link" rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css">
 	{% endif %}
 
 	<!-- Font Awesome -->
-	<link href="/assets/style/fa.css" rel="stylesheet"> <!--load all styles -->
+	<link href="/assets/css/fa.css" rel="stylesheet"> <!--load all styles -->
 
 	<script>
 		function formkey() {
@@ -186,7 +182,7 @@
 </div>
 
 {% block mobilenavbar %}
-{% include "mobile_navigation_bar.html" %}
+	{% include "mobile_navigation_bar.html" %}
 {% endblock %}
 
 {% block invitationModal %}
@@ -204,11 +200,10 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"></script>
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
-
 <script src="/assets/js/general39.js"></script>
 
-	{% block scripts %}
-	{% endblock %}
+{% block scripts %}
+{% endblock %}
 
 <pre>
 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 7a364bed0..5b5e27923 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -5,6 +5,8 @@
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
 		<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"></script>
 		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+		<script src="/assets/js/general39.js"></script>
+
 		<script>
 		
 			//Signup js
@@ -91,19 +93,11 @@
 
 		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
 
-		<!-- Bootstrap core CSS -->
-		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
-		integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-
 		<!-- Font Awesome -->
 		<link href="/assets/fontawesome/css/all.css" rel="stylesheet"> <!--load all styles -->
 
-		<script data-search-pseudo-elements defer src="https://use.fontawesome.com/releases/latest/js/javascript.js"
-		integrity="sha384-L469/ELG4Bg9sDQbl0hvjMq8pOcqFgkSpwhwnslzvVVGpDjYJ6wJJyYjvG3u8XW7"
-		crossorigin="anonymous"></script>
-
 		<!-- {{'SITE_NAME' | app_config}} CSS -->
-		<link rel="stylesheet" href="/assets/style/{{'DEFAULT_THEME' | app_config}}.css">
+		<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css">
 
 </head>
 
@@ -235,7 +229,7 @@
 
 <!-- {{'SITE_NAME' | app_config}} JS -->
 
-<script src="/assets/js/general39.js"></script>
+
 
 <pre>
 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 25d25c8ca..a03d383d7 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -3,6 +3,28 @@
 
 <script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script>
 
+{% if v and v.id == p.author_id %}
+<script>
+	// Post edit form
+
+	togglePostEdit=function(id){
+
+		body=document.getElementById("post-body");
+		title=document.getElementById("post-title");
+		form=document.getElementById("edit-post-body-"+id);
+		box=document.getElementById("post-edit-box-"+id);
+		box2=document.getElementById("post-edit-box2-"+id);
+
+		body.classList.toggle("d-none");
+		title.classList.toggle("d-none");
+		form.classList.toggle("d-none");
+		autoExpand(box);
+		autoExpand(box2);
+	};
+</script>
+{% endif %}
+
+
 <script>
 	var clipboard = new ClipboardJS('.copy-link');
 		clipboard.on('success', function(e) {
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 29ec47fb3..b57a948cd 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -520,9 +520,9 @@
 {% if v %}
 	{% include "award_modal.html" %}
 	{% include "delete_post_modal.html" %}
+	{% include "report_post_modal.html" %}
 	{% if v.admin_level == 6 %}
 		{% include "ban_modal.html" %}
 	{% endif %}
 {% endif %}
-{% include "expanded_image_modal.html" %}
-{% include "flag_post_modal.html" %}
+{% include "expanded_image_modal.html" %}
\ No newline at end of file
diff --git a/files/templates/submit.html b/files/templates/submit.html
index f9691ac6f..ef30cba3f 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -7,6 +7,7 @@
 		<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
 		<script src="/assets/js/general39.js"></script>
 
+
 		<script>
 		
 			$(document).ready(function() {
@@ -269,23 +270,19 @@
 
 		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
 
-		<!-- Bootstrap core CSS -->
-		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
-		integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-
 		<!-- {{'SITE_NAME' | app_config}} Board CSS -->
 
 		{% block stylesheets %}
 		{% if v %}
-			<link rel="stylesheet" href="/assets/style/{{v.theme}}_{{v.themecolor}}.css">
-			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/style/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
+			<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css">
+			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
-			<link rel="stylesheet" href="/assets/style/{{'DEFAULT_THEME' | app_config}}.css">
+			<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css">
 		{% endif %}
 		{% endblock %}
 
 		<!-- Font Awesome -->
-		<link href="/assets/style/fa.css" rel="stylesheet"> <!--load all styles -->
+		<link href="/assets/css/fa.css" rel="stylesheet"> <!--load all styles -->
 </head>
 
 <body id="submit" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/backgrounds/{{v.background}}) no-repeat center center fixed !important; background-size: cover!important; background-color: #000!important;{% endif %}display: block;">
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 6cc48d865..f8d9342fb 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -3,10 +3,10 @@
 {% if u and u.profilecss %}
 	{% block stylesheets %}
 		{% if v %}
-			<link rel="stylesheet" href="/assets/style/{{v.theme}}_{{v.themecolor}}.css">
-			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/style/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
+			<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css">
+			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
-			<link rel="stylesheet" href="/assets/style/{{'DEFAULT_THEME' | app_config}}.css">
+			<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css">
 		{% endif %}
 		{% if u and u.profilecss %}
 			<link rel="stylesheet" href="/@{{u.username}}/profilecss">
@@ -44,6 +44,63 @@
 {% block desktopUserBanner %}
 <!-- Desktop -->
 <script>
+	function post_toast_callback(url, data, callback) {
+		var xhr = new XMLHttpRequest();
+		xhr.open("POST", url, true);
+		var form = new FormData()
+
+		if(typeof data === 'object' && data !== null) {
+			for(let k of Object.keys(data)) {
+				form.append(k, data[k]);
+			}
+		}
+
+		form.append("formkey", formkey());
+		xhr.withCredentials=true;
+
+		xhr.onload = function() {
+			let result = callback(xhr);
+				
+			if (xhr.status >= 200 && xhr.status < 300) {
+				$('#toast-post-error').toast('dispose');
+				$('#toast-post-success').toast('dispose');
+				$('#toast-post-success').toast('show');
+
+				try {
+					if(typeof result == "string") {
+						document.getElementById('toast-post-success-text').innerText = result;
+					} else {
+						document.getElementById('toast-post-success-text').innerText = JSON.parse(xhr.response)["message"];
+					}
+				} catch(e) {
+					document.getElementById('toast-post-success-text').innerText = "Action successful!";
+				}
+
+				return true;
+			} else {
+				$('#toast-post-success').toast('dispose');
+				$('#toast-post-error').toast('dispose');
+				$('#toast-post-error').toast('show');
+
+				try {
+					if(typeof result == "string") {
+						document.getElementById('toast-post-error-text').innerText = result;
+					} else {
+						document.getElementById('toast-post-error-text').innerText = JSON.parse(xhr.response)["error"];
+					}
+					return false
+				} catch(e) {
+					document.getElementById('toast-post-error-text').innerText = "Error. Try again later.";
+				}
+
+				return false;
+			}
+		};
+
+		xhr.send(form);
+
+	}
+
     const TRANSFER_TAX = 0.01;
 
     window.addEventListener( 'load', function() {
@@ -760,8 +817,4 @@
 {% endblock %}
 
 {% block GIFpicker %}
-{% if v %}
-{% include "emoji_modal.html" %}
-{% include "gif_modal.html" %}
-{% endif %}
 {% endblock %}
diff --git a/push.sh b/push.sh
index 097310aa8..f030b9ebb 100644
--- a/push.sh
+++ b/push.sh
@@ -5,14 +5,14 @@ git push
 
 npm install -g sass
 apt install ruby-sass
-sass ./files/assets/style/transparent.scss ./files/assets/style/transparent_ff66ac.css
-sass ./files/assets/style/win98.scss ./files/assets/style/win98_ff66ac.css
-sass ./files/assets/style/midnight.scss ./files/assets/style/midnight_ff66ac.css
-sass ./files/assets/style/dark.scss ./files/assets/style/dark_ff66ac.css
-sass ./files/assets/style/light.scss ./files/assets/style/light_ff66ac.css
-sass ./files/assets/style/coffee.scss ./files/assets/style/coffee_ff66ac.css
-sass ./files/assets/style/tron.scss ./files/assets/style/tron_ff66ac.css
-sass ./files/assets/style/4chan.scss ./files/assets/style/4chan_ff66ac.css
+sass ./files/assets/css/transparent.scss ./files/assets/css/transparent_ff66ac.css
+sass ./files/assets/css/win98.scss ./files/assets/css/win98_ff66ac.css
+sass ./files/assets/css/midnight.scss ./files/assets/css/midnight_ff66ac.css
+sass ./files/assets/css/dark.scss ./files/assets/css/dark_ff66ac.css
+sass ./files/assets/css/light.scss ./files/assets/css/light_ff66ac.css
+sass ./files/assets/css/coffee.scss ./files/assets/css/coffee_ff66ac.css
+sass ./files/assets/css/tron.scss ./files/assets/css/tron_ff66ac.css
+sass ./files/assets/css/4chan.scss ./files/assets/css/4chan_ff66ac.css
 python ./compilecss.py
 python3 ./compilecss.py
 git add .