diff --git a/files/templates/comments/CommentForm.html b/files/templates/comments/CommentForm.html
index bfbf580482..2728c9826e 100644
--- a/files/templates/comments/CommentForm.html
+++ b/files/templates/comments/CommentForm.html
@@ -1,4 +1,3 @@
-{% if v %}
 <form id="reply-to-{{p.fullname}}" class="flex flex-wrap w-full" action="/comment" method="post">
 	<input type="hidden" name="formkey" value="{{v.formkey}}">
 	<input type="hidden" name="parent_fullname" value="t2_{{p.id}}">
@@ -51,5 +50,4 @@
 			Comment
 		</button>
 	</div>
-</form>
-{% endif %}
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/files/templates/submission.html b/files/templates/submission.html
index f154f8bc4c..1811cd738e 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -455,7 +455,25 @@
 
 						</div>
 
-						
+						{% if p.embed_url %}
+							{% if p.domain == "twitter.com" %}
+								{{p.embed_url | safe}}
+								{% if v and v.theme.split("_")[0] in ["light", "coffee", "4chan"] %}
+									<script src="/assets/js/twitterlight.js?v=13"></script>
+								{% else %}
+									<script src="/assets/js/twitter.js?v=13"></script>
+								{% endif %}
+								<script>document.getElementById('twitter-widget-0').setAttribute('sandbox','')</script>
+							{% elif "youtu" in p.domain %}
+								{% if 'lite' in p.embed_url %}
+									{{p.embed_url | safe}}
+								{% else %}
+									<div class="embed-responsive embed-responsive-16by9 mb-3">
+										<iframe loading="lazy" src="{{p.embed_url}}" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+									</div>
+								{% endif %}
+							{% endif %}
+						{% endif %}
 
 						{% if p.author.sig_html and (p.author_id == 1904 or not (v and v.sigs_disabled)) %}
 							<hr>
@@ -615,11 +633,6 @@
 			{% 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">
@@ -635,10 +648,6 @@
 			</div>
 			{% endif %}
 
-			{% if offset %}
-				<script src="/assets/js/viewmore.js?v=7"></script>
-			{% endif %}
-
 	</div>
 
 	</div>