diff --git a/files/templates/submission.html b/files/templates/submission.html
index 1256563ed..2935392e1 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -1,87 +1,124 @@
 {% extends "default.html" %}
 
+
 {% set ups=p.upvotes %}
 {% set downs=p.downvotes %}
 {% set score=ups-downs %}
 
 {% if v %}
-{% set voted=p.voted if p.voted else 0 %}
+	{% set voted=p.voted if p.voted else 0 %}
 {% else %}
-{% set voted=-2 %}
+	{% set voted=-2 %}
 {% endif %}
 
 {% block title %}
 
-{% if v and (v.id == p.author_id or v.admin_level == 6 and v.id in [1,28,995,2513]) %}
-<script defer>		
-	togglePostEdit=function(id){
+{% if v and (v.id == p.author_id or v.admin_level > 1 and v.admin_level > 2) %}
+	<script>
+		function togglePostEdit(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);
+			body=document.getElementById("post-body");
+			title=document.getElementById("post-title");
+			form=document.getElementById("edit-post-body-"+id);
+			box=document.getElementById("post-edit-box-"+id);
 
-		body.classList.toggle("hidden");
-		title.classList.toggle("hidden");
-		form.classList.toggle("hidden");
-		autoExpand(box);
-	};
-</script>
+			body.classList.toggle("d-none");
+			title.classList.toggle("d-none");
+			form.classList.toggle("d-none");
+			autoExpand(box);
+		};
+	</script>
 {% endif %}
 
-{% if 'rama' not in request.host %}
-<script defer>
-	function poll_vote(cid) {
-		{% if v %}
-		var type = document.getElementById(cid).checked;
-		var scoretext = document.getElementById('poll-' + cid);
-		var score = Number(scoretext.textContent);
-		if (type == true) scoretext.textContent = score + 1;
-		else scoretext.textContent = score - 1;
-		post('/vote/poll/' + cid + '?vote=' + type);
-		{% else %}
-		var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
-		myToast.show();
-		document.getElementById('toast-post-error-text').innerText = "Only logged-in users can vote!";
-		{% endif %}
-	}
-</script>
+<script src="/assets/js/new_comments_count.js?v=53"></script>
 
-{% if v %}
-<script defer src="/assets/js/comments_v.js?v=70"></script>
+{% if p.award_count("train") %}
+	<style>
+		@keyframes train {
+			0% {
+				left: 0%;
+			}
+			100% {
+				left: 100%;
+			}
+		}
+
+		@keyframes trainrev {
+			0% {
+				left: 100%;
+			}
+			100% {
+				left: 0%;
+			}
+		}
+
+		@media (max-width: 768px) {
+			.train1 {
+				position: fixed;
+				z-index: 10;
+				width: 35px;
+				animation: train 3s linear infinite !important;
+			}
+			.train2 {
+				display: none !important;
+			}
+			.train3 {
+				display: none !important;
+			}
+			.train4 {
+				display: none !important;
+			}
+		}
+
+		@media (min-width: 768px) {
+			.train1 {
+				position: absolute;
+				z-index: 10;
+				width: 100px;
+				animation: trainrev 5s linear infinite !important;
+				transform: scaleX(-1);
+				-webkit-transform: scaleX(-1);
+				top: 35%
+			}
+			.train2 {
+				position: absolute;
+				z-index: 10;
+				width: 100px;
+				animation: train 5s linear infinite !important;
+				top: 10%
+			}
+			.train3 {
+				position: absolute;
+				z-index: 10;
+				width: 100px;
+				animation: train 5s linear infinite !important;
+				top: 60%
+			}
+			.train4 {
+				position: absolute;
+				z-index: 10;
+				width: 100px;
+				animation: trainrev 5s linear infinite !important;
+				transform: scaleX(-1);
+				-webkit-transform: scaleX(-1);
+				top: 85%
+			}
+		}
+	</style>
+
+	<img class="train1" src="/assets/images/emojis/marseytrain.webp?v=1">
 {% endif %}
 
+{% if p.award_count("train") > 1 %}
+	<img class="train2" src="/assets/images/emojis/marseytrain.webp?v=1">
 {% endif %}
 
-{% if p.award_count("shit") %}
-<script defer src="/assets/js/bugs.js?v=54"></script>
-{% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %}
-{% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %}
-<script>
-	new BugController({
-		imageSprite: "/assets/images/fly-sprite.gif",
-		canDie: false,
-		minBugs: {{minbugs}},
-		maxBugs: {{maxbugs}},
-		mouseOver: "multiply"
-	});
-</script>
+{% if p.award_count("train") > 2 %}
+	<img class="train3" src="/assets/images/emojis/marseytrain.webp?v=1">
 {% endif %}
 
-
-{% if p.award_count("fireflies") %}
-<script defer src="/assets/js/fireflies.js?v=54"></script>
-{% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %}
-{% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %}
-<script>
-	new BugController({
-		imageSprite: "/assets/images/fireflies.gif",
-		canDie: false,
-		minBugs: {{minbugs}},
-		maxBugs: {{maxbugs}},
-		mouseOver: "multiply"
-	});
-</script>
+{% if p.award_count("train") > 3 %}
+	<img class="train4" src="/assets/images/emojis/marseytrain.webp?v=1">
 {% endif %}
 
 
@@ -100,7 +137,7 @@
 <meta property="og:title" content="{{'@'+comment_info.author.username}} comments on {{p.plaintitle(v)}} - {{'SITE_NAME' | app_config}}" >
 <meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{'SITE_NAME' | app_config}}/assets/images/{{'SITE_NAME' | app_config}}/preview.gif{% endif %}" >
 {% if p.url and p.url.lower().endswith('.mp4') %}
-<meta property="og:video" content="{{ p.realurl(v) }}" >
+	<meta property="og:video" content="{{ p.realurl(v) }}" >
 {% endif %}
 <meta property="og:url" content="{{comment_info.permalink | full_link}}" >
 <meta property="og:site_name" content="{{request.host}}" >
@@ -155,244 +192,285 @@
 
 <div style="display:none" id="popover-{{p.id}}">
 	<div class="popover-user-profile" role="tooltip">
-		<img class="w-100 h-64 object-cover" src="{{p.author.banner_url}}">
-		<div class="d-flex align-items-end px-3 mt-n6 mb-3">
-			<img class="avatar-72 rounded img-thumbnail shadow-sm" src="{{p.author.profile_url}}">
-			<div class="px-3 text-truncate">
-				<h5 class="text-truncate text-black">{{p.author.username}}</h5>
-			</div>
-		</div>
-		<div class="px-3">
-			<span class="popover-bio text-black">{% if p.author.bio_html %}{{p.author.bio_html_eager | safe}}{% endif %}</span>
-		</div>
-		<div class="border-top d-flex align-items-center p-3 gap-3 smol">
-			<span>
-				<strong class="text-black">{{p.author.post_count}}</strong>
-				<span class="text-black">posts</span>
-			</span>
-			<span class="ml-3">
-				<strong class="text-black">{{p.author.comment_count}}</strong>
-				<span class="text-black">comments</span>
-			</span>
-			<span class="ml-3">
-				<strong class="text-black">{{p.author.coins}}</strong>
-				<span class="text-black">coins</span>
-			</span>  
-			&nbsp;&nbsp;&nbsp;&nbsp;
-			<a {% if v %}href="{{p.author.url}}"{% else %}href="/logged_out{{p.author.url}}"{% endif %} target="_blank" class="ml-auto text-decoration-none">
-				View
-				<i class="fas fa-arrow-right fa-sm px-1"></i>
-			</a>
+	  <img loading="lazy" class="w-100 h-64 object-cover" src="{{p.author.banner_url}}">
+	  <div class="d-flex align-items-end px-3 mt-n6 mb-3">
+		<img loading="lazy" class="avatar-72 rounded img-thumbnail shadow-sm" src="{{p.author.profile_url}}">
+		<div class="px-3 text-truncate">
+		  <h5 class="text-truncate text-black">{{p.author.username}}</h5>
 		</div>
+	  </div>
+	  <div class="px-3">
+		<span class="popover-bio text-black">{% if p.author.bio_html %}{{p.author.bio_html_eager | safe}}{% endif %}</span>
+	  </div>
+
+	  <div class="ml-3 mr-3 my-2">
+		{% for b in p.author.badges %}
+			{% if b.url %}
+				<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img width="32" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}} - {{b.text}}"></a>
+			{% else %}
+				<img width="32" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}} - {{b.text}}">
+			{% endif %}
+		{% endfor %}
+	</div>
+
+	  <div class="border-top d-flex align-items-center p-3 gap-3 smol">
+		<span>
+		  <strong class="text-black">{{p.author.post_count}}</strong>
+		  <span class="text-black">posts</span>
+		</span>
+		<span class="ml-3">
+		  <strong class="text-black">{{p.author.comment_count}}</strong>
+		  <span class="text-black">comments</span>
+		</span>
+		<span class="ml-3">
+			<strong class="text-black">{{p.author.coins}}</strong>
+			<span class="text-black">coins</span>
+		</span>  
+		&nbsp;&nbsp;&nbsp;&nbsp;
+		<a {% if v %}href="{{p.author.url}}"{% else %}href="/logged_out{{p.author.url}}"{% endif %} target="_blank" class="ml-auto text-decoration-none">
+		  View
+		  <i class="fas fa-arrow-right fa-sm px-1"></i>
+		</a>
+	  </div>
 	</div>
 </div>
 
-{% endblock %}
 
-{% block subHeader %}
-	<div class="relative max-w-screen-2xl mx-auto px-4 py-4 grid grid-cols-12 rounded-t">
-		<div class="absolute top-0 left-0 w-full h-full bg-gradient-to-t from-gray-300 to-gray-200 rounded-t sub-header-shadow"></div>
-		<div class="relative col-span-full flex items-center">
-			<div>
-				<h1 class="font-bold text-xl font-heading leading-normal mb-0">
-					Thread
-				</h1>
-				<ul class="flex space-x-2 text-xs text-gray-500 leading-normal mb-0">
-					<li>
-						<a href="/" class="text-gray-500 hover:underline">Home</a>
-					</li>
-					<li>
-						<i class="fas fa-arrow-alt-right text-shadow fa-fw fa-sm"></i>
-					</li>
-					<li>
-						<a href="#" class="text-gray-700 hover:underline">{{p.author.username}}'s post</a>
-					<li>
+<div class="modal fade modal-sm-bottom d-md-none" id="actionsModal" tabindex="-1" role="dialog" aria-labelledby="actionsModalTitle" aria-hidden="true">
+	<div class="modal-dialog modal-dialog-centered" role="document">
+		<div class="modal-content">
+			<div class="modal-header p-3">
+				<h5 class="col modal-title text-center h6">More options</h5>
+				<button type="button" class="close position-absolute py-3" style="right: 1rem;" data-bs-dismiss="modal" aria-label="Close">
+					<span aria-hidden="true"><i class="fas fa-times-circle text-gray-500"></i></span>
+				</button>
+			</div>
+			<div class="modal-body">
+				<ul class="list-group post-actions">
+					<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#reportPostModal" onclick="report_postModal('{{p.id}}')"><i class="far fa-flag text-center text-muted mr-3"></i>Report</button>
+					
+					{% if v and v.id==p.author_id %}
+						{% if p.private %}
+							<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" href="javascript:void(0)" onclick="post_toast('/publish/{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-globe text-center text-muted mr-3"></i>Publish</button>
+						{% endif %}
+
+						<button id="pin-profile2-{{p.id}}" class="{% if p.is_pinned %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-muted text-left" href="javascript:void(0)" onclick="post_toast2('/pin/{{p.id}}','pin-profile2-{{p.id}}','unpin-profile2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-center mr-3"></i>Pin to profile</button>
+						<button id="unpin-profile2-{{p.id}}" class="{% if not p.is_pinned %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-muted text-left" href="javascript:void(0)" onclick="post_toast2('/pin/{{p.id}}','pin-profile2-{{p.id}}','unpin-profile2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-center mr-3"></i>Unpin from profile</button>
+
+						{% if p.deleted_utc > 0 %}
+							<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" href="javascript:void(0)" onclick="post_toast('/undelete_post/{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-trash-alt text-center text-muted mr-3"></i>Undelete</button>
+						{% else %}
+							<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#deletePostModal" onclick="delete_postModal('{{p.id}}')"><i class="far fa-trash-alt text-center text-muted mr-3"></i>Delete</button>
+						{% endif %}
+					{% endif %}
+
+					<a class="btn-block" href="/votes?link={{p.fullname}}"><button class="nobackground btn btn-link btn-block btn-lg text-left text-muted"><i class="fas fa-arrows-v text-center text-muted mr-3"></i>Votes</button></a>
+
+					{% if v %}
+						<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#awardModal" onclick="awardModal('/post/{{p.id}}/awards')"><i class="fas fa-gift text-center text-muted mr-3"></i>Give Award</button>
+					{% endif %}
+
+					{% if v %}
+						<button id="subscribe2-{{p.id}}" class="{% if p.id in v.subscribed_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" href="javascript:void(0)" onclick="post_toast2('/subscribe/{{p.id}}','subscribe2-{{p.id}}','unsubscribe2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye text-center text-muted mr-3"></i>Subscribe</button>
+
+						<button id="unsubscribe2-{{p.id}}" class="{% if not p.id in v.subscribed_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" href="javascript:void(0)" onclick="post_toast2('/unsubscribe/{{p.id}}','subscribe2-{{p.id}}','unsubscribe2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash text-center text-muted mr-3"></i>Unsubscribe</button>
+					{% endif %}
+
+					{% if v %}
+						<button id="save2-{{p.id}}" class="{% if p.id in v.saved_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" href="javascript:void(0)" onclick="post_toast2('/save_post/{{p.id}}','save2-{{p.id}}','unsave2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-save text-center text-muted mr-3"></i>Save</button>
+						<button id="unsave2-{{p.id}}" class="{% if p.id not in v.saved_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" href="javascript:void(0)" onclick="post_toast2('/unsave_post/{{p.id}}','save2-{{p.id}}','unsave2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-save text-center text-muted mr-3"></i>Unsave</button>
+
+						{% if v.id==p.author_id or v.admin_level > 1 and v.admin_level > 2 %}
+							<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" onclick="togglePostEdit('{{p.id}}')"><i class="far fa-edit text-center text-muted mr-3"></i>Edit</button>
+						{% endif %}
+
+						{% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %}
+							<button id="club2-{{p.id}}" class="{% if p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-info text-left" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club2-{{p.id}}','unclub2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash mr-3"></i>Mark club</button>
+							<button id="unclub2-{{p.id}}" class="{% if not p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-info text-left" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club2-{{p.id}}','unclub2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye mr-3"></i>Unmark club</button>
+						{% endif %}
+
+						{% if v.admin_level > 0 %}
+							<button id="pin2-{{p.id}}" class="{% if p.stickied %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left" href="javascript:void(0)" onclick="post_toast2('/sticky/{{p.id}}','pin2-{{p.id}}','unpin2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-center mr-3"></i>Pin</button>
+							<button id="unpin2-{{p.id}}" class="{% if not p.stickied %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left" href="javascript:void(0)" onclick="post_toast2('/sticky/{{p.id}}','pin2-{{p.id}}','unpin2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-center mr-3"></i>Unpin</button>
+							{% if v==p.author %}
+								<button id="distinguish2-{{p.id}}" class="{% if p.distinguish_level %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left" href="javascript:void(0)" onclick="post_toast2('/distinguish/{{p.id}}','distinguish2-{{p.id}}','undistinguish2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-crown text-center mr-3"></i>Distinguish</button>
+								<button id="undistinguish2-{{p.id}}" class="{% if not p.distinguish_level %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left" href="javascript:void(0)" onclick="post_toast2('/distinguish/{{p.id}}','distinguish2-{{p.id}}','undistinguish2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-crown text-center mr-3"></i>Undistinguish</button>
+							{% endif %}
+
+							{% if "/reported/" in request.path %}
+								<button class="nobackground btn btn-link btn-block btn-lg text-danger text-left" href="javascript:void(0)" onclick="post_toast('/ban_post/{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-ban text-center mr-3"></i>Remove</button>
+								<button class="nobackground btn btn-link btn-block btn-lg text-success text-left" href="javascript:void(0)" onclick="post_toast('/unban_post/{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-check text-center mr-3"></i>Approve</button>
+							{% else %}
+								<button id="remove2-{{p.id}}" class="{% if p.is_banned %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" href="javascript:void(0)" onclick="post_toast2('/ban_post/{{p.id}}','remove2-{{p.id}}','approve2-{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-ban text-center mr-3"></i>Remove</button>
+								<button id="approve2-{{p.id}}" class="{% if not p.is_banned %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left"  href="javascript:void(0)" onclick="post_toast2('/unban_post/{{p.id}}','remove2-{{p.id}}','approve2-{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-check text-center mr-3"></i>Approve</button>
+							{% endif %}
+						{% endif %}
+
+						{% if v.admin_level > 1 and p.oauth_app %}
+							<a href="{{p.oauth_app.permalink}}"><button class="nobackground btn btn-link btn-block btn-lg text-muted text-left"><i class="far fa-code text-center text-info mr-3"></i>API App</button></a>
+						{% endif %}
+
+					{% endif %}
+
+					{% if v and v.id != p.author_id %}
+						<button id="unblock2-{{p.id}}" class="nobackground btn btn-link btn-block btn-lg text-success text-left{% if not p.is_blocking %} d-none{% endif %}" data-bs-dismiss="modal" onclick="post_toast2('/settings/unblock?username={{p.author.username}}','block2-{{p.id}}','unblock2-{{p.id}}')"><i class="fas fa-eye mr-3 text-success"></i>Unblock user</button>
+
+						<button id="prompt2-{{p.id}}" class="blockuser nobackground btn btn-link btn-block btn-lg text-danger text-left d-none" data-bs-dismiss="modal" onclick="post_toast2('/settings/block?username={{p.author.username}}','prompt2-{{p.id}}','unblock2-{{p.id}}')"><i class="fas fa-eye-slash mr-3 text-danger"></i>Are you sure?</button>
+						
+						<button id="block2-{{p.id}}" class="blockuser nobackground btn btn-link btn-block btn-lg text-danger text-left{% if p.is_blocking %} d-none{% endif %}" onclick="document.getElementById('block2-{{p.id}}').classList.toggle('d-none');document.getElementById('prompt2-{{p.id}}').classList.toggle('d-none');"><i class="fas fa-eye-slash mr-3 text-danger"></i>Block user</button>
+					{% endif %}
+
+					{% if v and (v.id==p.author_id or v.admin_level > 1) %}
+						<button id="mark2-{{p.id}}" class="{% if p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" onclick="post_toast2('/toggle_post_nsfw/{{p.id}}','mark2-{{p.id}}','unmark2-{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center text-danger mr-3"></i>Mark +18</button>
+						<button id="unmark2-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" onclick="post_toast2('/toggle_post_nsfw/{{p.id}}','mark2-{{p.id}}','unmark2-{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center text-danger mr-3"></i>Unmark +18</button>
+					{% endif %}
+
+					{% if v and v.admin_level > 1 and v.id!=p.author_id %}
+						<button id="ban2-{{p.id}}" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{ p.author.id }}', '{{p.author.username}}')" class="{% if p.author.is_suspended %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" href="javascript:void(0)"><i class="fas fa-user-minus mr-3"></i>Ban user</button>
+						<button id="unban2-{{p.id}}" class="{% if not p.author.is_suspended %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left" href="javascript:void(0)" onclick="post_toast2('/unban_user/{{p.author_id}}','ban2-{{p.id}}','unban2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-user-minus mr-3"></i>Unban user</button>
+					{% endif %}
 				</ul>
 			</div>
 		</div>
 	</div>
+</div>
 {% endblock %}
 
 {% block content %}
 
-<div class="col-span-full xl:col-span-9">
+{% if request.host == 'pcmemes.net' %}
+	{% set cc='SPLASH MOUNTAIN' %}
+{% else %}
+	{% set cc='COUNTRY CLUB' %}
+{% endif %}
 
-<!-- Non-dismissable Alerts -->
-<div class="p-2.5 md:p-0">
-	<!-- Removal Reason -->
-	{% if p.is_banned and p.ban_reason %}
-		<div class="mt-4 mb-0 rounded-lg shadow-lg p-3 text-white bg-red-600 border border-red-900 shadow-inset-t-white-10">
-			<i class="fas fa-gavel fa-fw mr-1"></i>
-			<span class="font-medium">
-				Removed by @{{p.ban_reason}}
-			</span>
-		</div>
-	{% endif %}
-	<!-- Banned -->
-	{% if p.bannedfor and p.author.banned_by %}
-		<div class="mt-4 mb-0 rounded-lg shadow-lg p-3 text-white bg-red-600 border border-red-900 shadow-inset-t-white-10">
-			<i class="fas fa-gavel fa-fw mr-1"></i>
-			<span class="font-medium">
-				Author was banned for this post by
-				<a href="/@{{p.author.banned_by.username}}" class="text-white hover:underline">@{{p.author.banned_by.username}}</a>
-			</span>
-		</div>
-	{% endif %}	
-</div>
+<div class="row mb-3">
 
-<!-- Post -->
-<div id="post-root" class="sm:py-4 my-2.5 sm:my-0">
+	<div id="post-root" class="col-12">
 
-	<div id="post-{{p.id}}" class="w-full p-2.5 md:p-0 {% if voted==1 %}upvoted{% elif voted==-1 %}downvoted{% endif %}">
-		<div class="{% if p.deleted_utc > 0 %}deleted {% endif %} flex flex-row-reverse flex-nowrap justify-end">
+		<div id="post-{{p.id}}" class="card border-0 mt-3{% if p.is_banned %} banned{% endif %}{% if p.stickied %} stickied{% endif %}{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}">
+			<div class="{% if p.deleted_utc > 0 %}deleted {% endif %}d-flex flex-row-reverse flex-nowrap justify-content-end">
 
-			{% if not p.is_image and p.thumb_url and not p.embed_url %}
-			<div class="hidden md:block pl-3">
-				<a rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>
-					<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-32 h-20 object-cover object-cover bg-white border border-gray-300" alt="post thumbnail">
-				</a>
-			</div>
-			{% endif %}
+				{% if not p.is_image and p.thumb_url and not p.embed_url %}
+				<div class="card-header bg-transparent border-0 d-none d-md-flex flex-row flex-nowrap pl-3 p-0">
+					<a rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}" style="height: fit-content;" {% if not v or v.newtabexternal %}target="_blank"{% endif %}><img loading="lazy" src="{{p.thumb_url}}" class="post-img d-none d-md-block" alt="Unable to load image"></a>
+				</div>
+				{% endif %}
 
-			<div class="w-full">
-				<!-- Content -->
 				<div id="post-content" class="{% if p.deleted_utc > 0 %}deleted {% endif %}card-block w-100 my-md-auto">
 
+					<div class="post-meta text-left mb-2">
+						{% if p.bannedfor and p.author.banned_by %}
+							<a href="javascript:void(0)"><i class="fad fa-gavel text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="User was banned for this post by @{{p.author.banned_by.username}}"></i></a>
+						{% endif %}	
+
+						{% if p.awards %}
+							{% for a in p.awards %}
+								<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{a.title}} Award given by @{{a.user.username}}"></i>
+							{% endfor %}
+						{% endif %}
+						{% if v and v.admin_level > 1 and p.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Shadowbanned by @{{p.author.shadowbanned}}"></i>{% endif %}
+						{% if p.stickied %}<i id="pinned-{{p.id}}" class="fas fa-thumbtack fa-rotate--45 fa-fw text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%}"></i>{% endif %}
+						{% if p.is_pinned %}<i class="fas fa-thumbtack fa-rotate--45 fa-fw text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Pinned to profile"></i>{% endif %}
+						{% if p.distinguish_level %} <i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{'SITE_NAME' | app_config}} Admin, speaking officially"></i>{% endif %}
+						{% if p.is_bot %} <i class="fad fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom"	data-bs-original-title="Bot"></i>{% endif %}
+						{% if p.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
+						{% if p.private %}<span class="badge border-warning border-1 text-small-extra">Draft</span>{% endif %}
+						{% if p.active_flags %}<a class="btn btn-primary" href="javascript:void(0)" style="padding:1px 5px; font-size:10px;" onclick="document.getElementById('flaggers').classList.toggle('d-none')">{{p.active_flags}} Reports</a>{% endif %}
+						{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{p.author.verified}}"></i>
+						{% endif %}
+						<a class="user-name text-decoration-none" data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover-{{p.id}}" href="javascript:void(0)" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold;" class="user-name"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level and 'rama' in request.host %}class="mod"{% endif %}>{{p.author.username}}</span></a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{% if p.author.quadrant %}<img loading="lazy" height="20" src="/assets/images/quadrants/{{p.author.quadrant}}.webp?v=1">{% endif %}{{p.author.customtitle | safe}}</bdi>{% endif %}
+						<span data-bs-toggle="tooltip" data-bs-placement="bottom" id="timestamp" onmouseover="timestamp('timestamp','{{p.created_utc}}')">&nbsp;{{p.age_string}}</span>
+						({% if p.realurl(v) %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>{{p.domain}}</a>{% else %}text post{% endif %})
+
+						{% if p.edited_utc %}
+							&nbsp;&nbsp;Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('edited_timestamp','{{p.edited_utc}}')" id="edited_timestamp">{{p.edited_string}}</span>
+						{% endif %}
+						&nbsp;&nbsp;{{p.views}} views
+					</div>
 					{% if p.active_flags %}
-					<div id="flaggers" class="flaggers hidden">
+					<div id="flaggers" class="flaggers d-none">
 						<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
 						<pre></pre>
 						<ul style="padding-left:20px; margin-bottom: 0;">
 							{% for f in p.ordered_flags %}
-							<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}<a href="javascript:void(0)" onclick="post_toast('/del_report/p{{ f.id }}')">[remove]</a>{% endif %}</li>
+								<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a href="javascript:void(0)" onclick="post_toast('/del_report/p{{ f.id }}')">[remove]</a>{% endif %}</li>
 							{% endfor %}
 						</ul>
 					</div>
 					{% endif %}
-
-					<!-- Meta information -->
-					<div class="flex items-center space-x-2 md:-ml-2 mb-1 text-sm text-gray-500 leading-normal">
-
-						<div class="relative avatar md:hidden">
-							<img loading="lazy" src="{{ p.author.profile_url }}" class="w-9 h-9 p-[3px] bg-white border border-gray-300 object-cover" alt="{{ p.author.username }} avatar"/>
-						</div>
-
-						{% if v and v.admin_level==6 and p.author.shadowbanned %}
-						<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Shadowbanned by @{{p.author.shadowbanned}}"></i>
-						{% endif %}
-						{% if p.distinguish_level %}
-						<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{'SITE_NAME' | app_config}} Admin, speaking officially"></i>
-						{% endif %}
-						{% if p.is_bot %}
-						<i class="fad fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Bot"></i>
-						{% endif %}
-						{% if p.author.verified %}
-						<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{p.author.verified}}"></i>
-						{% endif %}
-						<button class="flex items-center font-bold" data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover-{{p.id}}" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold;" class="user-name">
-							{% if p.author.patron and not p.distinguish_level %}
-							<span class="patron" style="background-color:#{{p.author.namecolor}};">
-								{{p.author.username}}
-							</span>
-							{% elif p.distinguish_level and 'rama' in request.host %}
-							<span class="mod">
-								{{p.author.username}}
-							</span>
-							{% else %}
-							<span>
-								{{p.author.username}}
-							</span>
-							{% endif %}
-						</button>
-
-						{% if p.author.customtitle %}
-						<bdi style="color: #{{p.author.titlecolor}}">
-							{% if p.author.quadrant %}
-								<img loading="lazy" height="20" src="/assets/images/PCM/quadrants/{{p.author.quadrant}}.gif">
-							{% endif %}
-							{{p.author.customtitle | safe}}
-						</bdi>
-						{% endif %}
-
-						<span data-bs-toggle="tooltip" data-bs-placement="bottom" id="timestamp">{{p.age_string}}</span>
-
-						{% if p.edited_utc %}
-						Edited
-						<span data-bs-toggle="tooltip" data-bs-placement="bottom" id="edited_timestamp">{{p.edited_string}}</span>
-						{% endif %}
-
-						{% if p.realurl(v) %}
-						<a class="text-gray-500 hover:underline" href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>({{p.domain}})
-						</a>
-						{% else %}
-						<span>(text post)</span>
-						{% endif %}
-
-						<!-- <span>{{p.views}} views</span> -->
-					</div>
-
-					<!-- Title -->
-					<h1 id="post-title" class="post-title font-bold font-heading text-lg md:text-3xl leading-normal mb-2">
-						{% if p.club %}
-							<span class="badge badge-yellow font-sans-serif md:hidden">Country Club</span>
-						{% endif %}
-						{% if p.flair %}
-						<span class="badge badge-blue font-sans-serif md:hidden">
-							{{p.flair | safe}}
-						</span>
-						{% endif %}
-						{% if p.realurl(v) %}
-						<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}" class="text-black hover:text-primary">
+					{% if p.realurl(v) %}
+						<h1 id="post-title" class="card-title post-title text-left mb-md-3"><a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
+							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
+							{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair | safe}}</span>{% endif %}
 							{{p.realtitle(v) | safe}}
-						</a>
-						{% else %}
-						{{p.realtitle(v) | safe}}
-						{% endif %}
-					</h1>
+						</a></h1>					
+					{% else %}
+						<h1 id="post-title" class="card-title post-title text-left mb-md-3">
+							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
+							{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair | safe}}</span>{% endif %}
+							{{p.realtitle(v) | safe}}
+						</h1>
+					{% endif %}
 
-					<!-- Body content -->
-					<div id="post-body" class="post-body mb-3">
+					<div id="post-body" class="post-body mt-3">
 						{% if p.realurl(v) %}
-						{% if "streamable.com/" in p.realurl(v) %}
-						<div style="width: 100%; height: 0px; position: relative; padding-bottom: 56.250%;"><iframe loading="lazy" src="{{p.realurl(v)}}" frameborder="0" width="100%" height="100%" allowfullscreen="" style="width: 100%; height: 100%; position: absolute;"></iframe></div>
-						<pre></pre>
-						{% elif "spotify.com/" in p.realurl(v) %}
-						{% if "spotify.com/embed/" in p.realurl(v) %}
-						{% set streamurl=p.realurl(v) %}
-						{% else %}
-						{% set streamurl=p.realurl(v).replace("spotify.com", "spotify.com/embed") %}
-						{% endif %}
-						<iframe loading="lazy" src="{{streamurl}}" width="100%" height="160" frameBorder="0" allowtransparency="true" allow="encrypted-media"></iframe>
-						<pre></pre>
+							{% if "streamable.com/" in p.realurl(v) %}
+								<div style="width: 100%; height: 0px; position: relative; padding-bottom: 56.250%;"><iframe loading="lazy" src="{{p.realurl(v)}}" frameborder="0" width="100%" height="100%" allowfullscreen="" style="width: 100%; height: 100%; position: absolute;"></iframe></div>
+								<pre></pre>
+							{% elif "spotify.com/" in p.realurl(v) %}
+								{% if "spotify.com/embed/" in p.realurl(v) %}
+									{% set streamurl=p.realurl(v) %}
+								{% else %}
+									{% set streamurl=p.realurl(v).replace("spotify.com", "spotify.com/embed") %}
+								{% endif %}
+								<iframe loading="lazy" src="{{streamurl}}" width="100%" height="160" frameBorder="0" allowtransparency="true" allow="encrypted-media"></iframe>
+								<pre></pre>
 
-						{% elif not p.embed_url and not p.is_image and not (p.url and p.url.lower().endswith('.mp4')) %}
-						<a rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>
-							<div class="d-flex md:hidden justify-content-between align-items-center border rounded p-2{% if p.realbody(v) %} mb-3{% endif %}">
-								<span>{{p.domain|truncate(30, True)}}</span>
-								<i class="fas fa-external-link-alt text-small"></i>
-							</div>
-						</a>
-						{% endif %}
-						{% endif %}
-						<div id="post-text" class="text-black {% if p.award_count("candycane") %}candycane{% endif %}">
-							{% if p.is_image %}
-							<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
-								<img loading="lazy" src="{{p.realurl(v)}}" class="img-fluid" style="max-height:500px;" alt="Unable to load image">
-							</a>
-							{% elif p.url and p.url.lower().endswith('.mp4') %}
-							<video controls loop preload="metadata" style="max-width: 100%">
-								<source src="{{ p.realurl(v) }}" type="video/mp4"/>
-							</video>
+							{% elif not p.embed_url and not p.is_image and not (p.url and p.url.lower().endswith('.mp4')) %}
+								<a rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>
+									<div class="d-flex d-md-none justify-content-between align-items-center border rounded p-2{% if p.realbody(v) %} mb-3{% endif %}">
+										<span>{{p.domain|truncate(30, True)}}</span>
+										<i class="fas fa-external-link-alt text-small"></i>
+									</div>
+								</a>
+							{% endif %}
+						{% endif %}
+						<div id="post-text">
+							{% if p.is_image %}
+								<div class="row no-gutters">
+									<div class="col">
+										<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
+											<img loading="lazy" src="{{p.realurl(v)}}" class="img-fluid" style="max-height:500px;" alt="Unable to load image">
+										</a>
+									</div>
+								</div>
+								<pre></pre>
+							{% elif p.url and p.url.lower().endswith('.mp4') %}
+								<div class="row no-gutters">
+									<div class="col">
+										<video controls loop preload="metadata" style="max-width: 100%">
+											<source src="{{ p.realurl(v) }}" type="video/mp4">
+										</video>
+									</div>
+								</div>
+								<pre></pre>
 							{% endif %}
-
 							{{p.realbody(v) | safe}}
 
 							{% for c in p.options %}
-							<div class="custom-control">								
-								<input type="checkbox" class="custom-control-input" id="{{c.id}}" name="option" {% if c.poll_voted(v) %}checked{% endif %} onchange="poll_vote('{{c.id}}')">
-								<label class="custom-control-label" for="{{c.id}}">{{c.body_html | safe}} - <a href="/votes?link=t3_{{c.id}}"><span id="poll-{{c.id}}">{{c.upvotes}}</span> votes</a></label>
-							</div>
+								<div class="custom-control">								
+									<input type="checkbox" class="custom-control-input" id="{{c.id}}" name="option" {% if c.poll_voted(v) %}checked{% endif %} onchange="poll_vote('{{c.id}}')">
+									<label class="custom-control-label" for="{{c.id}}">{{c.body_html | safe}}<span class="presult {% if not p.total_poll_voted(v) %}d-none{% endif %}"> - <a href="/votes?link=t3_{{c.id}}"><span id="poll-{{c.id}}">{{c.upvotes}}</span> votes</a></span></label>
+								</div>
 							{% endfor %}
+								
+							{% if p.is_banned and p.ban_reason %}
+								<div class="text-removed mb-0">removed by @{{p.ban_reason}}</div>
+							{% endif %}
+			
+			
+
 
 						</div>
 
@@ -416,297 +494,446 @@
 							{% endif %}
 						{% endif %}
 
+
 						{% if p.author.sig_html and (p.author_id == 1904 or not (v and v.sigs_disabled)) %}
 							<hr>
 							{{p.author.sig_html | safe}}
 						{% endif %}
+
 					</div>
 
-					{% if v and (v.id==p.author_id or v.admin_level==6 and v.id in [1,28,995,2513]) and not v.is_suspended %}
-						{% include "/submission/SubmissionEditForm.html" %}
+					{% if v and (v.id==p.author_id or v.admin_level > 2) and not v.is_suspended %}
+						<div id="edit-post-body-{{p.id}}" class="d-none comment-write collapsed child">
+							<form id="post-edit-form-{{p.id}}" action="/edit_post/{{p.id}}" method="post" enctype="multipart/form-data">
+								<div class="d-flex flex-column">
+									<input type="hidden" name="formkey" value="{{v.formkey}}">
+									<input type="hidden" name="current_page" value="{{request.path}}">
+									<input name="title" class="edit-title" required placeholder="title" value="{{p.title}}" >
+									<textarea name="body" {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" oninput="markdown('post-edit-box-{{p.id}}', 'post-edit-{{p.id}}');charLimit('post-edit-box-{{p.id}}','charcount-post-edit')" id="post-edit-box-{{p.id}}" form="post-edit-form-{{p.id}}" class="comment-box form-control rounded" aria-label="With textarea" placeholder="Add text to your post..." rows="10" data-id="{{p.id}}">{{p.body}}</textarea> 
+									
+									<div class="text-small font-weight-bold mt-1" id="charcount-post-edit" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></div>
+
+									<div class="comment-format">
+										<small class="format btn btn-secondary"><i class="fas fa-bold" aria-hidden="true" onclick="makeBold('post-edit-box-{{p.id}}')" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Bold"></i></small> 
+										<a class="format btn btn-secondary" href="javascript:void(0)"><i class="fas fa-italic" aria-hidden="true" onclick="makeItalics('post-edit-box-{{p.id}}')" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Italicize"></i></a> 
+										<a class="format btn btn-secondary" href="javascript:void(0)"><i class="fas fa-quote-right" aria-hidden="true" onclick="makeQuote('post-edit-box-{{p.id}}')" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Quote"></i></a>
+										<a class="format btn btn-secondary" href="javascript:void(0)"><span class="font-weight-bolder text-uppercase" onclick="commentForm('post-edit-box-{{p.id}}');getGif()" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom"  data-bs-original-title="Add GIF">GIF</span></a>
+										<a class="format btn btn-secondary" href="javascript:void(0)"><i class="fas fa-smile-beam" onclick="loadEmojis('post-edit-box-{{p.id}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom"  data-bs-original-title="Add Emoji"></i></a>
+
+										<label class="format btn btn-secondary m-0 ml-1 {% if v %}d-inline-block{% else %}d-none{% endif %}" for="file-upload-edit-{{p.id}}">
+											<div id="filename-show-edit-{{p.id}}"><i class="far fa-image"></i></div>
+											<input id="file-upload-edit-{{p.id}}" type="file" name="file" accept="image/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="document.getElementById('filename-show-edit-{{p.id}}').innerHTML='image';" hidden>
+										</label>
+						
+										<small class="format d-none"><i class="fas fa-link" aria-hidden="true"></i></small> 
+									</div>
+								</div>
+								<button form="post-edit-form-{{p.id}}" class="btn btn-primary ml-2 fl-r">Save Edit</button>
+								<a href="javascript:void(0)" onclick="togglePostEdit('{{p.id}}')" class="btn btn-link text-muted ml-auto cancel-form fl-r">Cancel</a> 
+							</form>
+							<div id="post-edit-{{p.id}}" class="mb-3 mt-5"></div>
+							<div class="form-text text-small p-0 m-0"><a href="/formatting" target="_blank">Formatting help</a></div>
+						</div>
 					{% endif %}
 
-					{% if p.embed_url and "http" not in p.embed_url %}
-					<div id="crosspost-embed">
-						<div class="row no-gutters">
-							<div id="frontpage" class="col-12 pt-0">
+							{% if p.embed_url and "http" not in p.embed_url %}
+							<div id="crosspost-embed">
+							<div class="row no-gutters">
+								<div id="frontpage" class="col-12 pt-0">
 								<div class="posts" id="posts">
 									{{ p.embed_url | post_embed(v) | safe }}
 								</div>
+								</div>
 							</div>
+							</div>
+							{% endif %}
+							<div class="d-none d-md-flex justify-content-between align-items-center mt-2">
+								<div class="post-actions mt-2">
+				<ul class="list-inline text-right d-flex">
+
+						<li class="list-inline-item">
+							<a {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %}>
+								<i class="fas fa-comment-dots"></i>{{p.comment_count}}
+								<span class="text-info d-none new-comments"></span>
+							</a>
+						</li>
+
+						{% if v and (v.id==p.author_id or v.admin_level > 1 and v.admin_level > 2) %}
+							<a class="list-inline-item" href="javascript:void(0)" onclick="togglePostEdit('{{p.id}}')"><i class="fas fa-edit"></i>Edit</a>
+						{% endif %}
+
+						{% if v and v.id==p.author_id %}
+							{% if p.private %}
+								<a class="list-inline-item" href="javascript:void(0)" onclick="post_toast('/publish/{{p.id}}')"><i class="fas fa-globe"></i>Publish</a>
+							{% endif %}
+						{% endif %}
+
+						<a class="list-inline-item" href="/votes?link={{p.fullname}}"><i class="fas fa-arrows-v"></i>Votes</a>
+						
+						{% if v %}
+							<a class="list-inline-item text-muted d-none d-md-inline-block" href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#awardModal" onclick="awardModal('/post/{{p.id}}/awards')"><i class="fas fa-gift fa-fw"></i>Give Award</a>
+						{% endif %}
+
+						<a class="list-inline-item copy-link" href="javascript:void(0);" role="button" data-clipboard-text="{% if 'rama' in request.host %}https://freeghettohoes.biz{{p.permalink}}{% else %}{{p.permalink | full_link}}{% endif %}"><i class="fas fa-copy"></i>Copy link</a>
+
+						{% if v %}
+							<a id="subscribe-{{p.id}}" class="{% if p.id in v.subscribed_idlist() %}d-none{% endif %} list-inline-item" href="javascript:void(0)" onclick="post_toast2('/subscribe/{{p.id}}','subscribe-{{p.id}}','unsubscribe-{{p.id}}')"><i class="fas fa-eye"></i>Subscribe</a>
+							<a id="unsubscribe-{{p.id}}" class="{% if p.id not in v.subscribed_idlist() %}d-none{% endif %} list-inline-item" href="javascript:void(0)" onclick="post_toast2('/unsubscribe/{{p.id}}','subscribe-{{p.id}}','unsubscribe-{{p.id}}')"><i class="fas fa-eye-slash"></i>Unsubscribe</a>
+
+							<a id="save-{{p.id}}" class="{% if p.id in v.saved_idlist() %}d-none{% endif %} list-inline-item" href="javascript:void(0)" onclick="post_toast2('/save_post/{{p.id}}','save-{{p.id}}','unsave-{{p.id}}')"><i class="fas fa-save"></i>Save</a>
+							<a id="unsave-{{p.id}}" class="{% if not p.id in v.saved_idlist() %}d-none{% endif %} list-inline-item" href="javascript:void(0)" onclick="post_toast2('/unsave_post/{{p.id}}','save-{{p.id}}','unsave-{{p.id}}')"><i class="fas fa-save"></i>Unsave</a>
+
+						{% endif %}
+
+						<a class="list-inline-item" href="javascript:void(0)" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#reportPostModal" onclick="report_postModal('{{p.id}}')"><i class="fas fa-flag"></i>Report</a>
+
+						{% if v and v.id==p.author_id %}
+							<a id="pin-profile-{{p.id}}" class="{% if p.is_pinned %}d-none{% endif %} list-inline-item text-muted" href="javascript:void(0)" onclick="post_toast2('/pin/{{p.id}}','unpin-profile-{{p.id}}','pin-profile-{{p.id}}')"><i class="fas fa-thumbtack fa-rotate--45"></i>Pin to profile</a>
+							<a id="unpin-profile-{{p.id}}" class="{% if not p.is_pinned %}d-none{% endif %} list-inline-item text-muted" href="javascript:void(0)" onclick="post_toast2('/pin/{{p.id}}','unpin-profile-{{p.id}}','pin-profile-{{p.id}}')"><i class="fas fa-thumbtack fa-rotate--45"></i>Unpin from profile</a>
+
+							{% if p.deleted_utc > 0 %}
+								<a class="list-inline-item" href="javascript:void(0)" onclick="post_toast('/undelete_post/{{p.id}}')"><i class="fas fa-trash-alt"></i>Undelete</a>
+							{% else %}
+								<a class="list-inline-item" href="javascript:void(0)" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#deletePostModal" onclick="delete_postModal('{{p.id}}')"><i class="fas fa-trash-alt"></i>Delete</a>
+							{% endif %}
+						{% endif %}
+						{% if v and v.admin_level > 0 %}
+							<a id="pin-{{p.id}}" class="{% if p.stickied %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/sticky/{{p.id}}','pin-{{p.id}}','unpin-{{p.id}}')"><i class="fas fa-thumbtack fa-rotate--45"></i>Pin</a>
+							<a id="unpin-{{p.id}}" class="{% if not p.stickied %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/sticky/{{p.id}}','pin-{{p.id}}','unpin-{{p.id}}')"><i class="fas fa-thumbtack fa-rotate--45"></i>Unpin</a>
+							{% if v==p.author %}
+								<a id="distinguish-{{p.id}}" class="{% if p.distinguish_level %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/distinguish/{{p.id}}','distinguish-{{p.id}}','undistinguish-{{p.id}}')"><i class="fas fa-crown"></i>Distinguish</a>
+								<a id="undistinguish-{{p.id}}" class="{% if not p.distinguish_level %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/distinguish/{{p.id}}','distinguish-{{p.id}}','undistinguish-{{p.id}}')"><i class="fas fa-crown"></i>Undistinguish</a>
+							{% endif %}
+						{% endif %}
+
+						{% if v %}
+							{% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %}
+								<a id="club-{{p.id}}" class="{% if p.club %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club-{{p.id}}','unclub-{{p.id}}')"><i class="fas fa-eye-slash"></i>Mark club</a>
+								<a id="unclub-{{p.id}}" class="{% if not p.club %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club-{{p.id}}','unclub-{{p.id}}')"><i class="fas fa-eye"></i>Unmark club</a>
+							{% endif %}
+
+							{% if v.admin_level > 1 %}
+								{% if "/reported/" in request.path %}
+									{% if v.id != p.author.id %}<a class="list-inline-item text-danger" href="javascript:void(0)" onclick="post_toast('/ban_post/{{p.id}}')"><i class="fas fa-ban"></i>Remove</a>{% endif %}
+									<a class="list-inline-item text-success" href="javascript:void(0)" onclick="post_toast('/unban_post/{{p.id}}')"><i class="fas fa-check"></i>Approve</a>
+								{% else %}
+									{% if v.id != p.author.id %}<a id="remove-{{p.id}}" class="{% if p.is_banned %}d-none{% endif %} list-inline-item text-danger" href="javascript:void(0)" onclick="post_toast2('/ban_post/{{p.id}}','remove-{{p.id}}','approve-{{p.id}}')"><i class="fas fa-ban"></i>Remove</a>{% endif %}
+									<a id="approve-{{p.id}}" class="{% if not p.is_banned %}d-none{% endif %} list-inline-item text-success" href="javascript:void(0)" onclick="post_toast2('/unban_post/{{p.id}}','remove-{{p.id}}','approve-{{p.id}}')"><i class="fas fa-check"></i>Approve</a>
+								{% endif %}
+							{% endif %}
+
+							{% if v.id == p.author_id or v.admin_level > 1 %}
+								<a id="mark-{{p.id}}" class="{% if p.over_18 %}d-none{% endif %} list-inline-item text-danger" href="javascript:void(0)" onclick="post_toast2('/toggle_post_nsfw/{{p.id}}','mark-{{p.id}}','unmark-{{p.id}}')"><i class="fas fa-eye-evil"></i>Mark +18</a>
+								<a id="unmark-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} list-inline-item text-danger" href="javascript:void(0)" onclick="post_toast2('/toggle_post_nsfw/{{p.id}}','mark-{{p.id}}','unmark-{{p.id}}')"><i class="fas fa-eye-evil"></i>Unmark +18</a>
+							{% endif %}
+
+							{% if v.admin_level > 1 and p.oauth_app %}
+								<a class="list-inline-item" href="{{p.oauth_app.permalink}}" ><i class="fas fa-code"></i>API App</a>
+							{% endif %}
+
+							{% if not v.id==p.author_id %}								
+								<a id="unblock-{{p.id}}" class="text-success list-inline-item {% if not p.is_blocking %} d-none{% endif %}" href="javascript:void(0)" onclick="post_toast2('/settings/unblock?username={{p.author.username}}','block-{{p.id}}','unblock-{{p.id}}')"><i class="fas fa-eye text-success"></i>Unblock user</a>
+
+								<a id="prompt-{{p.id}}" class="text-danger blockuser list-inline-item d-none" href="javascript:void(0)" onclick="post_toast2('/settings/block?username={{p.author.username}}','prompt-{{p.id}}','unblock-{{p.id}}')"><i class="fas fa-eye-slash text-danger"></i>Are you sure?</a>
+
+								<a id="block-{{p.id}}" class="text-danger blockuser list-inline-item {% if p.is_blocking %} d-none{% endif %}" href="javascript:void(0)" onclick="document.getElementById('block-{{p.id}}').classList.toggle('d-none');document.getElementById('prompt-{{p.id}}').classList.toggle('d-none');"><i class="fas fa-eye-slash text-danger"></i>Block user</a>
+							{% endif %}
+
+							{% if v.admin_level > 1 and v.id!=p.author_id %}
+								<a id="ban-{{p.id}}" class="{% if p.author.is_suspended %}d-none{% endif %} list-inline-item text-danger" href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{ p.author.id }}', '{{p.author.username}}')"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</a>
+								<a id="unban-{{p.id}}" class="{% if not p.author.is_suspended %}d-none{% endif %} list-inline-item text-danger" id="unexile2-user-{{p.id}}" href="javascript:void(0)" onclick="post_toast2('/unban_user/{{p.author_id}}','ban-{{p.id}}','unban-{{p.id}}')"><i class="fas fa-user-slash"></i>Unban user</a>
+							{% endif %}
+						{% endif %}
+								</ul>
+							</div>
+
 						</div>
+
 					</div>
-					{% endif %}
-
-				</div>
-
-				<!-- Post actions -->
-				<div class="hidden md:block pt-4">
-					{% include "/submission/SubmissionActions.html" %}
-				</div>
-
-			</div>
-
-				<!-- Author avatar, post score, and voting buttons -->
-				<div class="hidden md:flex flex-col flex-shrink-0 items-center mr-4">
-
-					<div class="relative avatar">
-						<img loading="lazy" src="{{p.author.profile_url}}" class="w-14 h-14 p-[3px] bg-white border border-gray-300 object-cover" alt="author avatar"/>
-					</div>
-
-					<div class="py-2 text-sm text-gray-400 text-center font-bold hidden md:block">
-					{% if v and request.path.startswith('/@') and not v.admin_level %}
-						{% if voted==1 %}
-						<div class="mx-auto arrow-up post-{{p.id}}-up active"></div>
-						{% endif %}
-
-						<span id="post-score-{{p.id}}" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="" data-bs-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-						{% if voted==-1 %}
-							<div class="mx-auto arrow-down post-{{p.id}}-down active"></div>
-						{% endif %}
-
-						{% elif v %}
+					
+					{% if v %}
 
+					<div id="voting" class="voting d-none d-md-block mb-auto">
 						<div id="post-{{p.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('post', '{{p.id}}', '1')" class="mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
 
-						<span id="post-score-{{p.id}}" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="" data-bs-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-						<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('post', '{{p.id}}', '-1')" class="mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
-
-						{% else %}
-
-						<div id="post-{{p.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('post', '{{p.id}}', '1')" class="mx-auto arrow-up" onclick="location.href='/login';"></div>
-
-						<span id="post-{{p.id}}-score-none" class="score"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="" data-bs-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-						<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('post', '{{p.id}}', '-1')" class="mx-auto arrow-down" onclick="location.href='/login';"></div>
-						{% endif %}
-					</div>
-
-					<!-- {% if v %}
-					<div id="voting" class="shadow-inner shadow-md rounded-md flex flex-col mb-1 py-2 items-center w-16 border-opacity-40 border border-gray-700 bg-gray-700 text-gray-500">
-						 <button id="post-{{p.id}}-up" tabindex="0" onclick="vote('post', '{{p.id}}', '1')" class="mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></button>
-						<span id="post-score-{{p.id}}" class="font-bold text-lg post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}" data-bs-toggle="tooltip" data-bs-placement="right" title="" data-bs-original-title="+{{ups}} | -{{downs}}">{{score}}</span>
+						<span id="post-score-{{p.id}}" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-original-title="+{{ups}} | -{{downs}}">{{score}}</span>
 						<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('post', '{{p.id}}', '-1')" class="text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
 					</div>
 
-					<button id="post-{{p.id}}-up" class="flex items-center justify-center text-xs font-bold mb-1 rounded-md w-full border p-1 border-gray-800 post-{{p.id}}-up text-gray-500 hover:text-pink-500 focus:text-pink-500" onclick="vote('post', '{{p.id}}', '1')">
-						+&nbsp;<i class="fas fa-heart fa-sm fa-fw pl-1"></i>
-					</button>
- 					
-					{% if environ.get('DISABLE_DOWNVOTES') != '1' %}
-					<button id="post-{{p.id}}-down" class="text-gray-600 text-center text-xs post-{{p.id}}-down {% if voted==-1 %}active{% endif %}" onclick="vote('post', '{{p.id}}', '-1')">
-						Dislike
-					</button>
-					{% endif %}
-
 					{% else %}
-					Logged out score
-					<div id="voting" class="shadow-inner shadow-md rounded-md flex flex-col mb-1 py-2 items-center w-16 border-opacity-40 border border-gray-700 bg-gray-700 text-gray-500">
-						<span id="post-score-{{p.id}}" class="font-bold text-lg post-score-{{p.id}}" data-bs-toggle="tooltip" data-bs-placement="right" title="" data-bs-original-title="+{{ups}} | -{{downs}}">{{score}}</span>
-					</div>
-					Logged out upvote (links to login)
-					<button id="post-{{p.id}}-up" class="flex items-center justify-center text-xs font-bold mb-1 rounded-md w-full border p-1 border-gray-800 post-{{p.id}}-up text-gray-500 hover:text-pink-500 focus:text-pink-500" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
-						+&nbsp;<i class="fas fa-heart fa-sm fa-fw pl-1"></i>
-					</button>
-					Logged out downvote (links to login)
-					{% if environ.get('DISABLE_DOWNVOTES') != '1' %}
-					<button id="post-{{p.id}}-down" class="text-gray-600 text-center text-xs post-{{p.id}}-down" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
-						Dislike
-					</button>
-					{% endif %}
 
-					{% endif %} -->
+					<div id="voting" class="voting d-none d-md-block mb-auto">
+						<div id="post-{{p.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('post', '{{p.id}}', '1')" class="arrow-up mx-auto" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
+						</div>
+						<span id="post-{{p.id}}-score-none" class="score text-muted"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" data-bs-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
+						<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-{{p.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('post', '{{p.id}}', '-1')" class="arrow-down mx-auto" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></div>
+					</div>
+
+					{% endif %}
 
 				</div>
 
+
+
+
 			</div>
 
-	</div>
+		</div>
 
 		{% if not p.is_image and not (p.url and p.url.lower().endswith('.mp4')) %}
-		<div class="col-span-full">
-			<div class="col">
-				<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}"></a>
+			<div class="row no-gutters d-md-none">
+				<div class="col">
+					<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}"></a>
+				</div>
 			</div>
-		</div>
 		{% endif %}
 	</div>
 
-	<div class="md:hidden px-2.5">
-		{% include "/submission/SubmissionActionsMobile.html" %}
+ <div class="row mb-3 d-md-none">
+	<div class="col-12">
+
+		<div class="post-actions">
+			<ul class="list-inline text-right d-flex">
+
+				<li class="list-inline-item mr-auto">
+					<a {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %}>
+						<i class="fas fa-comment-dots"></i>{{p.comment_count}}
+						<span class="text-info d-none new-comments"></span>
+					</a>
+				</li>
+
+				<a class="list-inline-item copy-link" href="javascript:void(0);" role="button" data-clipboard-text="{% if 'rama' in request.host %}https://freeghettohoes.biz{{p.permalink}}{% else %}{{p.permalink | full_link}}{% endif %}"><i class="fas fa-link"></i>Copy link</a>
+				{% if v %}
+				<li class="list-inline-item">
+					<a href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#actionsModal">
+						<i class="fas fa-ellipsis-h"></i>
+					</a>
+				</li>
+				{% endif %}
+				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}">
+					{% if v %}
+						<span id="post-mobile-{{p.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('post-mobile', '{{p.id}}', '1')" class="mx-0 pr-1 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}">
+						</span>
+					{% else %}
+						<span id="arrow-{{p.id}}-mobile-up" tabindex="0" class="mx-0 pr-1 arrow-mobile-up" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
+							<i class="fas fa-arrow-alt-up mx-0" aria-hidden="true"></i>
+						</span>
+					{% endif %}
+
+					<span id="post-mobile-score-{{p.id}}" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="+{{ups}} | -{{downs}}">{{score}}</span>
+
+					{% if v %}
+						<span {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="post-mobile-{{p.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('post-mobile', '{{p.id}}', '-1')" class="mx-0 pl-1 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></span>
+					{% else %}
+						<span {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="arrow-{{p.id}}-mobile-down" tabindex="0" class="arrow-mobile-down mx-0 pl-1 my-0" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
+							<i class="fas fa-arrow-alt-down mx-0" aria-hidden="true"></i>
+						</span>
+					{% endif %}
+				</li>
+			</ul>
+		</div>
+
 	</div>
 
-	<div class="shadow-inset-t-white-05 border-t border-gray-300 py-4 mt-3 md:mt-0">
+</div>
 
-			<div class="flex justify-between mb-1 px-2.5 md:px-0">
-				<div class="md:ml-20 font-bold text-sm">
-					<span class="text-black">
-						{{ p.comment_count }} {{ 'Response' if p.comment_count == 1 else 'Responses' }}
-					</span>
-					<!-- Entire thread link -->
-					{% if linked_comment and p.comment_count >= 2%}
-					<a href="{% if v %}{{ p.permalink }}{% else %}/logged_out/{{p.permalink}}{% endif %}" class="pl-2 text-red-600 hover:text-red-700">
-						View entire thread
-					</a>
-					{% endif %}
+<div class="row border-md-0 comment-section pb-3">
+	<div class="col border-top">
+		<div class="comments-count py-3">
+			<div class="dropdown dropdown-actions">
+				<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					{% if sort=="top" %}<i class="fas fa-arrow-alt-circle-up mr-1"></i>{% endif %}
+					{% if sort=="bottom" %}<i class="fas fa-arrow-alt-circle-down mr-1"></i>{% endif %}
+					{% if sort=="new" %}<i class="fas fa-sparkles mr-1"></i>{% endif %}
+					{% if sort=="old" %}<i class="fas fa-book mr-1"></i>{% endif %}
+					{% if sort=="controversial" %}<i class="fas fa-bullhorn mr-1"></i>{% endif %}
+					{{sort | capitalize}}
+				</button>
+				<div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
+					{% if sort != "top" %}<a class="dropdown-item" href="?sort=top"><i class="fas fa-arrow-alt-circle-up mr-2"></i>Top</a>{% endif %}
+					{% if sort != "bottom" %}<a class="dropdown-item" href="?sort=bottom"><i class="fas fa-arrow-alt-circle-down mr-2"></i>Bottom</a>{% endif %}
+					{% if sort != "new" %}<a class="dropdown-item" href="?sort=new"><i class="fas fa-sparkles mr-2"></i>New</a>{% endif %}
+					{% if sort != "old" %}<a class="dropdown-item" href="?sort=old"><i class="fas fa-book mr-2"></i>Old</a>{% endif %}
+					{% if sort != "controversial" %}<a class="dropdown-item" href="?sort=controversial"><i class="fas fa-bullhorn mr-2"></i>Controversial</a>{% endif %}
 				</div>
-				<ul class="flex space-x-3 text-sm text-gray-500 leading-normal mb-0">
-					<li>
-						<a href="?sort=top" class="{{ 'font-bold text-red-600' if sort == 'top' else 'text-gray-500 hover:text-gray-700'}}">
-							Top
-						</a>
-					</li>
-					<li>
-						<a href="?sort=new" class="{{ 'font-bold text-red-600' if sort == 'new' else 'text-gray-500 hover:text-gray-700'}}">
-							Latest
-						</a>
-					</li>
-					<li>
-						<a href="?sort=old" class="{{ 'font-bold text-red-600' if sort == 'old' else 'text-gray-500 hover:text-gray-700'}}">
-							Oldest
-						</a>
-					</li>
-					<li>
-						<a href="?sort=controversial" class="{{ 'font-bold text-red-600' if sort == 'controversial' else 'text-gray-500 hover:text-gray-700'}}">
-							Controversial
-						</a>
-					</li>
-					<li>
-						<a href="?sort=bottom" class="{{ 'font-bold text-red-600' if sort == 'bottom' else 'text-gray-500 hover:text-gray-700'}}">
-							Worst
-						</a>
-					</li>
-				</ul>
-			</div>
-
-			{% if v %}
-			<div id="comment-form-space-{{p.fullname}}" class="comment-write flex px-2.5 md:px-0">
-				<div class="hidden md:block relative flex-shrink-0 mr-4 {{ 'santa' if p.author.patron else 'cap' }}">
-					<img loading="lazy" src="{{v.profile_url}}" class="w-14 h-14 p-[3px] bg-white border border-gray-300 object-cover" alt="my avatar"/>
-				</div>
-				{% include "/comments/CommentForm.html" %}
-			</div>
-			{% endif %}
-
-			{% if not v and not p.is_banned %}
-			<div class="comment-write flex mb-3 px-2.5 md:px-0">
-				<div class="hidden md:block relative flex-shrink-0 mr-4">
-					<div class="flex items-center justify-center w-14 h-14 p-[3px] bg-transparent border border-dashed border-gray-400 object-cover">
-						<i class="fas fa-user fa-fw text-gray-400"></i>
-					</div>
-				</div>
-				<textarea maxlength="10000" class="comment-box rounded border border-gray-700 border-opacity-40 bg-gray-700 bg-opacity-20 focus:bg-opacity-100 focus:bg-white hover:bg-opacity-30 shadow-inner w-full p-2" name="body" aria-label="With textarea" placeholder="Add your comment..." rows="3" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></textarea>
-			</div>
-			{% if p.comment_count >= 2 %}
-			<div class="border-0 mt-4 p-2.5">
-				<h5 class="font-bold text-black mb-2 leading-normal">Become an rDramanaut today.</h5>
-				<div>
-					<a href="/signup?redirect={{request.path | urlencode}}" class="btn btn-red">Sign up</a>
-					<a href="/login?redirect={{request.path | urlencode}}" class="btn btn-gray mt-2">Sign in</a>
-				</div>
-			</div>
-			{% endif %}
-			{% endif %}
-
-			{% if p.replies %}
-			<div class="comment-section px-2.5 md:px-0" id="comment-section">
-				{% with comments=p.replies %}
-				{% include "comments.html" %}
-				{% endwith %}
-			</div>
-			{% elif not p.replies and p.deleted_utc == 0 %}
-			<div class="comment-section px-2.5 md:px-0 text-center py-7">
-				<span class="fa-stack fa-2x text-muted mb-4">
-					<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
-					<i class="fas text-gray-500 fa-ghost fa-stack-1x text-lg"></i>
-				</span>
-				<h2 class="h5">Be the first to comment!</h2>
-				{% if v %}
-				<p class="text-muted">This comment section is a ghost town...</p>
-				{% else %}
-				<p class="text-muted">This comment section is a ghost town. <a href="/login?redirect={{request.path | urlencode}}">Sign in</a></p>
+				{% if linked_comment and p.comment_count >= 2%}
+					<pre></pre>
+					<div class="total"><a {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %}>View entire discussion</a></div>
 				{% endif %}
 			</div>
+		</div>
+
+	<div id="comment-form-space-{{p.fullname}}" class="comment-write mb-3">
+		<form id="reply-to-{{p.fullname}}" action="/comment" method="post">
+			<input type="hidden" name="formkey" value="{{v.formkey}}">
+			<input type="hidden" name="parent_fullname" value="t2_{{p.id}}">
+			<input id="reply-form-submission-{{p.fullname}}" type="hidden" name="submission" value="{{p.id}}">
+			{% if v %}
+			<textarea {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" oninput="markdown('reply-form-body-{{p.fullname}}', 'form-preview-{{p.id}}');charLimit('reply-form-body-{{p.fullname}}','charcount-reply')" id="reply-form-body-{{p.fullname}}" data-fullname="{{p.fullname}}" class="comment-box form-control rounded" id="comment-form" name="body" form="reply-to-{{p.fullname}}" aria-label="With textarea" placeholder="Add your comment..." rows="3"></textarea>
 			{% endif %}
 
-			{% if offset %}
-				<script src="/assets/js/viewmore.js?v=7"></script>
-			{% endif %}
+			<div class="text-small font-weight-bold mt-1" id="charcount-reply" style="right: 1rem; bottom: 0.5rem; z-index: 3;"></div>
 
+			<div class="comment-format">
+				<a class="btn btn-secondary format d-inline-block m-0" href="javascript:void(0)"><i class="fas fa-bold" onclick="makeBold('reply-form-body-{{p.fullname}}')" data-bs-toggle="tooltip" data-bs-placement="bottom"  data-bs-original-title="Bold"></i></a>
+				&nbsp;
+				<a class="btn btn-secondary format d-inline-block m-0" href="javascript:void(0)"><i class="fas fa-italic" onclick="makeItalics('reply-form-body-{{p.fullname}}')" data-bs-toggle="tooltip" data-bs-placement="bottom"  data-bs-original-title="Italicize"></i></a>
+				&nbsp;
+				<a class="btn btn-secondary format d-inline-block m-0" href="javascript:void(0)"><i class="fas fa-quote-right" onclick="makeQuote('reply-form-body-{{p.fullname}}')" data-bs-toggle="tooltip" data-bs-placement="bottom"  data-bs-original-title="Quote"></i></a>
+				&nbsp;
+				<label class="btn btn-secondary format d-inline-block m-0" for="gif-reply-btn-{{p.fullname}}">
+					<span id="gif-reply-btn-{{p.fullname}}" class="font-weight-bolder text-uppercase" onclick="commentForm('reply-form-body-{{p.fullname}}');getGif()" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Add GIF">GIF</span>
+				</label> 
+				&nbsp;
+				<label class="btn btn-secondary format d-inline-block m-0" for="emoji-reply-btn-{{p.fullname}}">
+					<div id="emoji-reply-btn-{{p.fullname}}" onclick="loadEmojis('reply-form-body-{{p.fullname}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Add Emoji"><i class="fas fa-smile-beam"></i></div>
+				</label> 
+				<label class="format btn btn-secondary m-0 ml-1 {% if v %}d-inline-block{% else %}d-none{% endif %}" for="file-upload-reply-{{p.fullname}}">
+					<div id="filename-show-reply-{{p.fullname}}"><i class="far fa-image"></i></div>
+					<input id="file-upload-reply-{{p.fullname}}" type="file" name="file" accept="image/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="document.getElementById('filename-show-reply-{{p.fullname}}').innerHTML='image';" hidden>
+				</label>
+			</div>
+			<a id="save-reply-to-{{p.fullname}}" href="javascript:void(0)" form="reply-to-{{p.fullname}}" class="btn btn-primary text-whitebtn ml-auto fl-r" onclick="post_comment('{{p.fullname}}', '{{p.id}}')">Comment</a>
+		</form>
+		<div id="form-preview-{{p.id}}" class="mb-3 mt-5"></div>
+		<div class="form-text text-small p-0 m-0"><a href="/formatting" target="_blank">Formatting help</a></div>
 	</div>
 
+	{% if not v and not p.is_banned %}
+	<div class="comment-write mb-3">
+		<textarea maxlength="10000" class="comment-box form-control rounded" name="body" aria-label="With textarea" placeholder="Add your comment..." rows="3" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></textarea>
 	</div>
-
-	{% endblock %}
-
-<!-- Sidebar -->
-{% block sidebar %}
-	{% include "/sidebars/SubmissionSidebar.html" %}
-{% endblock %}
-
-{% block modals %}
-	{% if v %}
-		{% if v.id == p.author_id %}
-			{% include "delete_post_modal.html" %}
-		{% endif %}
-
-		{% include "report_post_modal.html" %}
-		{% include "award_modal.html" %}
-		{% include "emoji_modal.html" %}
-		{% include "gif_modal.html" %}
-
-		{% if v.admin_level == 6 %}
-			{% include "ban_modal.html" %}
-		{% endif %}
+	{% if p.comment_count >= 2 %}
+	<div class="card border-0 mt-4">
+		<div class="card-body">
+			<h5 class="card-title">Jump in the discussion.</h5>
+			<p class="card-text">No email address required.</p>
+			<div>
+				<a href="/signup?redirect={{request.path | urlencode}}" class="btn btn-primary">Sign up</a>
+				<a href="/login?redirect={{request.path | urlencode}}" class="btn btn-link text-muted">Sign in</a>
+			</div>
+		</div>
+	</div>
+	{% endif %}
 	{% endif %}
 
-	{% include "/modals/ModalSubmissionActions.html" %}
-	{% include "expanded_image_modal.html" %}
-{% endblock %}
+	{% if p.replies %}
+	<div class="comment-section">
+	{% with comments=p.replies %}
+		{% include "comments.html" %}
+	{% endwith %}
+ </div>
+ 
+{% if offset %}
+	<script src="/assets/js/viewmore.js?v=1"></script>
+{% endif %}
 
-{% block scripts %}
-	<!-- This file contains minimal html and javascript required for awards, needs to be near </body> closing tag -->
-	{% include "/submission/SubmissionAwards.html" %}
-
-	{% if v %}
-	<script defer src="/assets/js/vote.js?v=1"></script>
-		{% if not p.comment_count %}
-			<script defer src="/assets/js/comments_v.js?v=74"></script>
+{% elif not p.replies and p.deleted_utc == 0 %}
+	<div class="comment-section text-center py-7">
+		<span class="fa-stack fa-2x text-muted mb-4">
+			<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
+			<i class="fas text-gray-500 fa-ghost fa-stack-1x text-lg"></i>
+		</span>
+		<h2 class="h5">Be the first to comment!</h2>
+		{% if v %}
+		<p class="text-muted">This comment section is a ghost town...</p>
+		{% else %}
+		<p class="text-muted">This comment section is a ghost town. <a href="/login?redirect={{request.path | urlencode}}">Sign in</a></p>
 		{% endif %}
-	{% endif %}
+	</div>
+{% endif %}
 
-	<script defer src="/assets/js/new_comments_count.js?v=53"></script>
+</div>
 
-	<script defer>
-		(() => {
-			const date = new Date({{p.created_utc*1000}});
-			document.getElementById('timestamp').title = date.toString();
-			{% if p.edited_utc %}
-			const dateEdited = new Date({{p.edited_utc*1000}});
-			document.getElementById('edited_timestamp').title = dateEdited.toString();
-			{% endif %}
+</div>
 
-			{% if (not v or v.highlightcomments) %}
+<script>
+	(() => {
+		{% if (not v or v.highlightcomments) %}
 			showNewCommentCounts('{{p.id}}', {{p.comment_count}})
-			{% endif %}
+		{% endif %}
 
-			{% if "?context" not in request.full_path %}
+		{% if "?context" not in request.full_path %}
 			const comments = JSON.parse(localStorage.getItem("comment-counts")) || {}
 			const newTotal = {{p.comment_count}} || ((comments['{{p.id}}'] || { c: 0 }).c + 1)
 			comments['{{p.id}}'] = { c: newTotal, t: Date.now() }
 			window.localStorage.setItem("comment-counts", JSON.stringify(comments))
-			{% endif %}
+		{% endif %}
 
-			{% if p.stickied %}
-			const pinned_info = document.getElementById('pinned-{{p.id}}')
-			{% if p.stickied.startswith('t:') %}
+		{% if p.stickied %}
+		const pinned_info = document.getElementById('pinned-{{p.id}}')
+		{% if p.stickied.startswith('t:') %}
 			pinned_info.setAttribute("data-bs-original-title", `Pinned until ${new Date({{p.stickied[2:]}} * 1000).toString()}`)
-				{% else %}
-				pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{p.stickied}}")
-				{%endif%}
-				{%endif%}
-			})()
-		</script>
+		{% else %}
+			pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{p.stickied}}")
+		{%endif%}
+		{%endif%}
+	})()
+</script>
+
+{% if v and v.id==p.author_id %}
+	{% include "delete_post_modal.html" %}
+{% endif %}
+
+{% if v %}
+	{% include "report_post_modal.html" %}
+{% endif %}
+
+
+
+<script src="/assets/js/clipboard.js?v=1"></script>
+
+{% if not p.comment_count %}
+	{% if v %}
+		<script src="/assets/js/comments_v.js?v=82"></script>
+		{% include "award_modal.html" %}
+		{% include "emoji_modal.html" %}
+		{% include "gif_modal.html" %}
+		{% if v.admin_level > 1 %}
+			{% include "ban_modal.html" %}
+		{% endif %}
+	{% endif %}
+	<script src="/assets/js/comments.js?v=8"></script>
+	{% include "expanded_image_modal.html" %}
+{% endif %}
+
+{% if p.award_count("shit") %}
+	<script src="/assets/js/bugs.js?v=55"></script>
+	{% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %}
+	{% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %}
+	<script>
+		new BugController({
+			imageSprite: "/assets/images/fly-sprite.webp",
+			canDie: false,
+			minBugs: {{minbugs}},
+			maxBugs: {{maxbugs}},
+			mouseOver: "multiply"
+		});
+		{% if not v %}
+			function poll_vote(cid, parentid) {
+				var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
+				myToast.show();
+				document.getElementById('toast-post-error-text').innerText = "Only logged-in users can vote!";
+			}
+		{% endif %}
+	</script>
+{% endif %}
+
+
+{% if p.award_count("fireflies") %}
+	<script src="/assets/js/fireflies.js?v=55"></script>
+	{% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %}
+	{% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %}
+	<script>
+		new BugController({
+			imageSprite: "/assets/images/fireflies.webp",
+			canDie: false,
+			minBugs: {{minbugs}},
+			maxBugs: {{maxbugs}},
+			mouseOver: "multiply"
+		});
+	</script>
+{% endif %}
+
+
 {% endblock %}
\ No newline at end of file