From 2ccc96a002e28e6c9ba8e92e72dc2166da36061a Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 18:36:10 -0600
Subject: [PATCH 01/25] fix

---
 .../CHRISTMAS/submission_listing.html         | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index d9ad4dfb3..64111fd19 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -270,9 +270,13 @@
 					<button data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{p.realurl(v)}}" onclick="expandDesktopImage('{{ p.realurl(v) }}')">
 						<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
 					</button>
-				{% elif (p.url and p.url.lower().endswith('.mp4')) or (p.embed_url and "youtu" in p.domain) or (p.url and "streamable.com/e/" in p.url) %}
+				{% elif p.is_video %}
+					<button onclick="toggleVideo({{p.id}})">
+						<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
+					</button>
+				{% elif p.is_youtube %}
 					<button onclick="document.getElementById('video-{{p.id}}').classList.toggle('hidden')">
-						<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
+						<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
 					</button>
 				{% else %}
 					<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
@@ -305,18 +309,9 @@
 				<source src="{{p.realurl(v)}}" type="video/mp4">
 			</video>
 		</div>
-	{% elif p.embed_url and "youtu" in p.domain %}
-		<div id="video-{{p.id}}" style="text-align: center" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
-			{% if 'lite' in p.embed_url %}
-				{{p.embed_url | safe}}
-			{% else %}
-				<iframe loading="lazy" src="{{p.embed_url}}" frameborder="0" class="w-full max-h-[20rem]" width="600" height="337" allow="fullscreen"></iframe>
-			{% endif %}
-		</div>
-	{% elif p.url and "streamable.com/e/" in p.url %}
-		<div id="video-{{p.id}}" style="text-align: center" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
-			<iframe loading="lazy" src="{{p.url}}" frameborder="0" class="w-full max-h-[20rem]" width="600" height="337" allow="fullscreen">
-			</iframe>
+	{% elif p.is_youtube %}
+		<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
+			{{p.embed_url | safe}}
 		</div>
 	{% endif %}
 {% endif %}
@@ -393,7 +388,7 @@
 {% include "CHRISTMAS/expanded_image_modal.html" %}
 
 <script defer src="/assets/CHRISTMAS/js/new_comments_count.js?a=1"></script>
-<script defer src="/assets/CHRISTMAS/js/submission_listing.js?a=1"></script>
+<script defer src="/assets/CHRISTMAS/js/submission_listing.js?a=2"></script>
 
 <style>
 	.mod:before {

From e96bd2401fdabf258896d91df618a41af536cb88 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 18:37:46 -0600
Subject: [PATCH 02/25] fix

---
 files/templates/CHRISTMAS/submission_listing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 64111fd19..9281075d3 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -260,7 +260,7 @@
 
 		<div class="relative z-10 flex flex-row flex-nowrap pl-3 md:pl-5 flex-shrink-0">
 			<div style="z-index: 3;">
-				{% if p.club and not (v and v.paid_dues) %}
+				{% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %}
 					<img loading="lazy" src="/assets/images/emojis/marseyglow.webp" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
 				{% elif not p.url %}
 					<a {% if v and v.newtab %}target="_blank"{% endif %} {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %}>

From 0de595bfd3f50fe7c9613fc7e8c8a7fcf9141db2 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 18:42:55 -0600
Subject: [PATCH 03/25] fix

---
 .../CHRISTMAS/sidebars/HomeSidebar.html       | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index ad0bc8ff3..9f23e4bcb 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -1,4 +1,19 @@
-{% set random = range(1, 11)|random() %}
+{% set random = range(0,1)|random() %}
+
+{%
+
+	set banner = [
+	{
+		'credit': 'asdf',
+		'image': 'https://i.imgur.com/fx5jcvU.jpeg'
+	},
+	{
+		'credit': 'asdf2',
+		'image': 'https://i.imgur.com/fx5jcvU.jpeg'
+	}
+	]
+
+%}
 
 <div class="hidden xl:block xl:col-start-10 xl:col-end-13 flex-shrink-0 py-4">
 	<div>
@@ -58,7 +73,7 @@
 	</div>
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>
 	<button data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="/static/assets/CHRISTMAS/banners/banner-1.jpg?a=1" onclick="expandDesktopImage('/static/assets/CHRISTMAS/banners/banner-1.jpg?a=1')" class="w-full h-56 shadow-sm p-[3px] bg-white dark:bg-gray-900 overflow-hidden">
-		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="/static/assets/CHRISTMAS/banners/banner-1.jpg?a=1" alt="new year celebration party with drinks"/>
+		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="{{ banner[random].image }}" alt="new year celebration party with drinks"/>
 	</button>
 	<!-- Link to OC post -->
 	<small class="block mt-1 text-right text-gray-500">

From e286db6e657f45f0544de54177dfa1f95c616a7a Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 18:43:31 -0600
Subject: [PATCH 04/25] fix

---
 files/templates/CHRISTMAS/sidebars/HomeSidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index 9f23e4bcb..b8f82ba28 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -81,7 +81,7 @@
 	</small>
 	<!-- Creds -->
 	<small class="hidden mt-1 text-right text-gray-500">
-		Artwork by <a href="/@username-here" class="font-bold">@username-here</a>
+		Artwork by <a href="/@{{ banner[random].author }}" class="font-bold">@{{ banner[random].author }}</a>
 	</small>
 	{% if v %}
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>

From 7b4aa31232764d8c7a7bebc0409daf83ad30ddb6 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 18:44:01 -0600
Subject: [PATCH 05/25] fix

---
 files/templates/CHRISTMAS/sidebars/HomeSidebar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index b8f82ba28..8b3382381 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -76,11 +76,11 @@
 		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="{{ banner[random].image }}" alt="new year celebration party with drinks"/>
 	</button>
 	<!-- Link to OC post -->
-	<small class="block mt-1 text-right text-gray-500">
+	<small class="hidden mt-1 text-right text-gray-500">
 		<a href="/post/32341/" class="font-bold">Share</a> your artwork to have it featured
 	</small>
 	<!-- Creds -->
-	<small class="hidden mt-1 text-right text-gray-500">
+	<small class="block mt-1 text-right text-gray-500">
 		Artwork by <a href="/@{{ banner[random].author }}" class="font-bold">@{{ banner[random].author }}</a>
 	</small>
 	{% if v %}

From 48c7f6f3e52e8fb0cad2319e56ac161432ea2e3c Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 18:45:02 -0600
Subject: [PATCH 06/25] fix

---
 .../CHRISTMAS/sidebars/HomeSidebar.html       | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index 8b3382381..d3dad58df 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -1,18 +1,16 @@
 {% set random = range(0,1)|random() %}
 
 {%
-
 	set banner = [
-	{
-		'credit': 'asdf',
-		'image': 'https://i.imgur.com/fx5jcvU.jpeg'
-	},
-	{
-		'credit': 'asdf2',
-		'image': 'https://i.imgur.com/fx5jcvU.jpeg'
-	}
+		{
+			'username': 'asdf',
+			'image': 'https://i.imgur.com/fx5jcvU.jpeg'
+		},
+		{
+			'username': 'asdf2',
+			'image': 'https://i.imgur.com/fx5jcvU.jpeg'
+		}
 	]
-
 %}
 
 <div class="hidden xl:block xl:col-start-10 xl:col-end-13 flex-shrink-0 py-4">
@@ -81,7 +79,7 @@
 	</small>
 	<!-- Creds -->
 	<small class="block mt-1 text-right text-gray-500">
-		Artwork by <a href="/@{{ banner[random].author }}" class="font-bold">@{{ banner[random].author }}</a>
+		Artwork by <a href="/@{{ banner[random].username }}" class="font-bold">@{{ banner[random].username }}</a>
 	</small>
 	{% if v %}
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>

From 3aadc78eeb661b6f5e4bd0cc7c9cce34a90bb6af Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 18:45:50 -0600
Subject: [PATCH 07/25] fix

---
 files/templates/CHRISTMAS/sidebars/HomeSidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index d3dad58df..f0ad2e40a 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -79,7 +79,7 @@
 	</small>
 	<!-- Creds -->
 	<small class="block mt-1 text-right text-gray-500">
-		Artwork by <a href="/@{{ banner[random].username }}" class="font-bold">@{{ banner[random].username }}</a>
+		Artwork by <a href="/@{{ banner[1].username }}" class="font-bold">@{{ banner[1].username }}</a>
 	</small>
 	{% if v %}
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>

From 1c1aad7b9fd566107928d7873fb7610c05247d30 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:10:24 -0600
Subject: [PATCH 08/25] fix

---
 .../CHRISTMAS/sidebars/HomeSidebar.html       | 48 +++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index f0ad2e40a..67aca039f 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -1,14 +1,54 @@
-{% set random = range(0,1)|random() %}
+{% set random = range(0,11)|random() %}
 
 {%
 	set banner = [
 		{
 			'username': 'asdf',
-			'image': 'https://i.imgur.com/fx5jcvU.jpeg'
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-1.jpg?a=1'
 		},
 		{
 			'username': 'asdf2',
-			'image': 'https://i.imgur.com/fx5jcvU.jpeg'
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-2.jpg?a=1'
+		},
+		{
+			'username': 'asdf2',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-3.jpg?a=1'
+		},
+		{
+			'username': 'asdf2',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-4.jpg?a=1'
+		},
+		{
+			'username': 'asdf2',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-5.webp?a=1'
+		},
+		{
+			'username': 'asdf2',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-6.jpg?a=1'
+		},
+		{
+			'username': 'asdf2',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-7.jpg?a=1'
+		},
+		{
+			'username': 'asdf2',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-8.webp?a=1'
+		},
+		{
+			'username': 'asdf2',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-9.jpg?a=1'
+		},
+		{
+			'username': 'asdf2',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-10.jpg?a=1'
+		},
+		{
+			'username': 'asdf2',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-11.jpg?a=1'
+		},
+		{
+			'username': 'asdf2',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-12.jpg?a=1'
 		}
 	]
 %}
@@ -79,7 +119,7 @@
 	</small>
 	<!-- Creds -->
 	<small class="block mt-1 text-right text-gray-500">
-		Artwork by <a href="/@{{ banner[1].username }}" class="font-bold">@{{ banner[1].username }}</a>
+		Artwork by <a href="/@{{ banner[random].username }}" class="font-bold">@{{ banner[random].username }}</a>
 	</small>
 	{% if v %}
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>

From 30d0f700ee3055a173fdb35daea53261a29840bd Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:17:48 -0600
Subject: [PATCH 09/25] fix

---
 .../CHRISTMAS/sidebars/HomeSidebar.html       | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index 67aca039f..3ff926561 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -3,52 +3,60 @@
 {%
 	set banner = [
 		{
-			'username': 'asdf',
+			'username': 'Bartholomew_1',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-1.jpg?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'Yui',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-2.jpg?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'Bartholomew_1',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-3.jpg?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'chiobu',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-4.jpg?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'chiobu',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-5.webp?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'geese_suck',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-6.jpg?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'Bartholomew_1',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-7.jpg?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'drama_enthusiast',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-8.webp?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'dramarama',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-9.jpg?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'geese_suck',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-10.jpg?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'ThreeLetterAgent',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-11.jpg?a=1'
 		},
 		{
-			'username': 'asdf2',
+			'username': 'geese_suck',
 			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-12.jpg?a=1'
+		},
+		{
+			'username': 'geese_suck',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-13.jpg?a=1'
+		},
+		{
+			'username': 'geese_suck',
+			'image': '/static/assets/CHRISTMAS/banners/sidebar-banner-14.jpg?a=1'
 		}
 	]
 %}

From ed495695026e5a34cd4f37bf4e4bbf69c08bf3a5 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:18:46 -0600
Subject: [PATCH 10/25] fix

---
 files/templates/CHRISTMAS/sidebars/HomeSidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index 3ff926561..6c277655f 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -118,7 +118,7 @@
 		</ul>
 	</div>
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>
-	<button data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="/static/assets/CHRISTMAS/banners/banner-1.jpg?a=1" onclick="expandDesktopImage('/static/assets/CHRISTMAS/banners/banner-1.jpg?a=1')" class="w-full h-56 shadow-sm p-[3px] bg-white dark:bg-gray-900 overflow-hidden">
+	<button data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{ banner[random].image }}" onclick="expandDesktopImage('{{ banner[random].image }}')" class="w-full h-56 shadow-sm p-[3px] bg-white dark:bg-gray-900 overflow-hidden">
 		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="{{ banner[random].image }}" alt="new year celebration party with drinks"/>
 	</button>
 	<!-- Link to OC post -->

From c2ec5d8b8defeb57cdd719e1855971c15689cb8b Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:19:37 -0600
Subject: [PATCH 11/25] fix

---
 .../CHRISTMAS/sidebars/HomeSidebar.html        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index 6c277655f..0b3b565a9 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -121,14 +121,16 @@
 	<button data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{ banner[random].image }}" onclick="expandDesktopImage('{{ banner[random].image }}')" class="w-full h-56 shadow-sm p-[3px] bg-white dark:bg-gray-900 overflow-hidden">
 		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="{{ banner[random].image }}" alt="new year celebration party with drinks"/>
 	</button>
-	<!-- Link to OC post -->
-	<small class="hidden mt-1 text-right text-gray-500">
-		<a href="/post/32341/" class="font-bold">Share</a> your artwork to have it featured
-	</small>
-	<!-- Creds -->
-	<small class="block mt-1 text-right text-gray-500">
-		Artwork by <a href="/@{{ banner[random].username }}" class="font-bold">@{{ banner[random].username }}</a>
-	</small>
+	<div class="mt-1 flex justify-between">
+		<!-- Link to OC post -->
+		<small class="text-gray-500">
+			<a href="/post/32341/" class="font-bold">Share</a> your artwork to have it featured
+		</small>
+		<!-- Creds -->
+		<small class="text-gray-500">
+			Artwork by <a href="/@{{ banner[random].username }}" class="font-bold">@{{ banner[random].username }}</a>
+		</small>
+	</div>
 	{% if v %}
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>
 	<div class="flex flex-col sticky top-4">

From 417c97833150870ce1c62cca29e6ffa5d1022e33 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:19:59 -0600
Subject: [PATCH 12/25] fix

---
 files/templates/CHRISTMAS/sidebars/HomeSidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index 0b3b565a9..f88be2cce 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -124,7 +124,7 @@
 	<div class="mt-1 flex justify-between">
 		<!-- Link to OC post -->
 		<small class="text-gray-500">
-			<a href="/post/32341/" class="font-bold">Share</a> your artwork to have it featured
+			<a href="/post/32341/" class="font-bold">Share</a> your artwork
 		</small>
 		<!-- Creds -->
 		<small class="text-gray-500">

From abd251e8548045298b1673b18185744820ea754b Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:20:24 -0600
Subject: [PATCH 13/25] fix

---
 files/templates/CHRISTMAS/sidebars/HomeSidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index f88be2cce..387cc1b1f 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -124,7 +124,7 @@
 	<div class="mt-1 flex justify-between">
 		<!-- Link to OC post -->
 		<small class="text-gray-500">
-			<a href="/post/32341/" class="font-bold">Share</a> your artwork
+			<a href="/post/32341/" class="text-gray-500 hover:text-gray-400 font-bold">Share</a> your artwork
 		</small>
 		<!-- Creds -->
 		<small class="text-gray-500">

From aeafefd3e207b12c1ffc89d6de198c105adbdf43 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:20:52 -0600
Subject: [PATCH 14/25] fix

---
 files/templates/CHRISTMAS/sidebars/HomeSidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index 387cc1b1f..8cb3f6a83 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -124,7 +124,7 @@
 	<div class="mt-1 flex justify-between">
 		<!-- Link to OC post -->
 		<small class="text-gray-500">
-			<a href="/post/32341/" class="text-gray-500 hover:text-gray-400 font-bold">Share</a> your artwork
+			<a href="/post/32341/">Share</a> your artwork
 		</small>
 		<!-- Creds -->
 		<small class="text-gray-500">

From 3ffbe5520f5ee18e8091f23f04915e33087d6147 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:22:11 -0600
Subject: [PATCH 15/25] fix

---
 files/templates/CHRISTMAS/sidebars/HomeSidebar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index 8cb3f6a83..339062a56 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -119,12 +119,12 @@
 	</div>
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>
 	<button data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{ banner[random].image }}" onclick="expandDesktopImage('{{ banner[random].image }}')" class="w-full h-56 shadow-sm p-[3px] bg-white dark:bg-gray-900 overflow-hidden">
-		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="{{ banner[random].image }}" alt="new year celebration party with drinks"/>
+		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="{{ banner[random].image }}" alt="artwork featuring an orange and white cat"/>
 	</button>
 	<div class="mt-1 flex justify-between">
 		<!-- Link to OC post -->
 		<small class="text-gray-500">
-			<a href="/post/32341/">Share</a> your artwork
+			<a href="/post/32341/" class="font-bold">Share</a> your artwork
 		</small>
 		<!-- Creds -->
 		<small class="text-gray-500">

From 986505ea172c32533e58d700974e73ddf5c3b6db Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:26:37 -0600
Subject: [PATCH 16/25] fix

---
 .../CHRISTMAS/submission_listing.html         | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 9281075d3..6bb743c44 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -259,31 +259,29 @@
 	</div>
 
 		<div class="relative z-10 flex flex-row flex-nowrap pl-3 md:pl-5 flex-shrink-0">
-			<div style="z-index: 3;">
-				{% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %}
-					<img loading="lazy" src="/assets/images/emojis/marseyglow.webp" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
-				{% elif not p.url %}
-					<a {% if v and v.newtab %}target="_blank"{% endif %} {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %}>
-						<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
-					</a>
-				{% elif p.is_image %}
-					<button data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{p.realurl(v)}}" onclick="expandDesktopImage('{{ p.realurl(v) }}')">
-						<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
-					</button>
-				{% elif p.is_video %}
-					<button onclick="toggleVideo({{p.id}})">
-						<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
-					</button>
-				{% elif p.is_youtube %}
-					<button onclick="document.getElementById('video-{{p.id}}').classList.toggle('hidden')">
-						<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
-					</button>
-				{% else %}
-					<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
-						<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover  bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
-					</a>
-				{% endif %}
-			</div>
+			{% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %}
+				<img loading="lazy" src="/assets/images/emojis/marseyglow.webp" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
+			{% elif not p.url %}
+				<a {% if v and v.newtab %}target="_blank"{% endif %} {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %}>
+					<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
+				</a>
+			{% elif p.is_image %}
+				<button data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{p.realurl(v)}}" onclick="expandDesktopImage('{{ p.realurl(v) }}')">
+					<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
+				</button>
+			{% elif p.is_video %}
+				<button onclick="toggleVideo({{p.id}})">
+					<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
+				</button>
+			{% elif p.is_youtube %}
+				<button onclick="document.getElementById('video-{{p.id}}').classList.toggle('hidden')">
+					<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
+				</button>
+			{% else %}
+				<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
+					<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover  bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
+				</a>
+			{% endif %}
 		</div>
 
 </div>
@@ -303,17 +301,19 @@
 {% endif %}
 
 {% if not p.club or v and (v.paid_dues or v.id == p.author_id) %}
+<div class="relative z-10 md:ml-[4.5rem] mt-3 {% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %}">
 	{% if p.is_video %}
-		<div id="video-{{p.id}}" style="text-align: center" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
+		<div id="video-{{p.id}}" class="text-center">
 			<video controls loop preload="metadata" class="w-full max-h-[20rem]">
 				<source src="{{p.realurl(v)}}" type="video/mp4">
 			</video>
 		</div>
 	{% elif p.is_youtube %}
-		<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
+		<div id="video-{{p.id}}">
 			{{p.embed_url | safe}}
 		</div>
 	{% endif %}
+</div>
 {% endif %}
 
 </li>

From 39eec176a3ae5eef5b7a42d526c4ef9ef1152a41 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:27:31 -0600
Subject: [PATCH 17/25] fix

---
 files/templates/CHRISTMAS/submission_listing.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 6bb743c44..d1495b03b 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -301,15 +301,15 @@
 {% endif %}
 
 {% if not p.club or v and (v.paid_dues or v.id == p.author_id) %}
-<div class="relative z-10 md:ml-[4.5rem] mt-3 {% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %}">
+<div class="relative z-10 md:ml-[4.5rem] mt-3">
 	{% if p.is_video %}
-		<div id="video-{{p.id}}" class="text-center">
+		<div id="video-{{p.id}}" class="text-center {% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %}">
 			<video controls loop preload="metadata" class="w-full max-h-[20rem]">
 				<source src="{{p.realurl(v)}}" type="video/mp4">
 			</video>
 		</div>
 	{% elif p.is_youtube %}
-		<div id="video-{{p.id}}">
+		<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
 			{{p.embed_url | safe}}
 		</div>
 	{% endif %}

From a72b4fe8c2fb100f2fdeb596d10e0121f7c49d86 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:28:14 -0600
Subject: [PATCH 18/25] fix

---
 files/templates/CHRISTMAS/submission_listing.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index d1495b03b..0c43d147a 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -286,12 +286,6 @@
 
 </div>
 
-	<div class="relative z-10 md:hidden pt-3">
-		{% include "CHRISTMAS/submission/SubmissionActionsMobile.html" %}
-	</div>
-
-{% include "CHRISTMAS/modals/ModalSubmissionActions.html" %}
-
 {% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}
 <div class="md:ml-[4.5rem] mt-4">
 	<a target="_blank" rel="nofollow noopener noreferrer" href="{{p.url}}" class="inline-block">
@@ -316,6 +310,12 @@
 </div>
 {% endif %}
 
+<div class="relative z-10 md:hidden pt-3">
+	{% include "CHRISTMAS/submission/SubmissionActionsMobile.html" %}
+</div>
+
+{% include "CHRISTMAS/modals/ModalSubmissionActions.html" %}
+
 </li>
 
 {% else %}

From 71297698b0ce1623b3572c056ee02a673582b09f Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:30:47 -0600
Subject: [PATCH 19/25] fix

---
 files/templates/CHRISTMAS/submission_listing.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 0c43d147a..2e2467d7b 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -295,9 +295,9 @@
 {% endif %}
 
 {% if not p.club or v and (v.paid_dues or v.id == p.author_id) %}
-<div class="relative z-10 md:ml-[4.5rem] mt-3">
+<div class="relative z-10">
 	{% if p.is_video %}
-		<div id="video-{{p.id}}" class="text-center {% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %}">
+		<div id="video-{{p.id}}" class="text-center {% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
 			<video controls loop preload="metadata" class="w-full max-h-[20rem]">
 				<source src="{{p.realurl(v)}}" type="video/mp4">
 			</video>

From 771024d5ff30eec03979e309e98143d1174241f2 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:31:18 -0600
Subject: [PATCH 20/25] fix

---
 files/templates/CHRISTMAS/submission_listing.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 2e2467d7b..3148d1ca8 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -294,16 +294,16 @@
 </div>
 {% endif %}
 
-{% if not p.club or v and (v.paid_dues or v.id == p.author_id) %}
-<div class="relative z-10">
+{% if not p.club or v and (v.paid_dues or v.id == p.author_id) and (p.is_video or p.is_youtube) %}
+<div class="relative z-10 md:ml-[4.5rem] mt-3">
 	{% if p.is_video %}
-		<div id="video-{{p.id}}" class="text-center {% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
+		<div id="video-{{p.id}}" class="text-center {% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %}">
 			<video controls loop preload="metadata" class="w-full max-h-[20rem]">
 				<source src="{{p.realurl(v)}}" type="video/mp4">
 			</video>
 		</div>
 	{% elif p.is_youtube %}
-		<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
+		<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %}">
 			{{p.embed_url | safe}}
 		</div>
 	{% endif %}

From 46414ace34a3e0b346429ffdb298dba14680bf87 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:31:57 -0600
Subject: [PATCH 21/25] fix

---
 files/templates/CHRISTMAS/submission_listing.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 3148d1ca8..68e09ef96 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -295,15 +295,15 @@
 {% endif %}
 
 {% if not p.club or v and (v.paid_dues or v.id == p.author_id) and (p.is_video or p.is_youtube) %}
-<div class="relative z-10 md:ml-[4.5rem] mt-3">
+<div class="relative z-10">
 	{% if p.is_video %}
-		<div id="video-{{p.id}}" class="text-center {% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %}">
+		<div id="video-{{p.id}}" class="text-center {% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
 			<video controls loop preload="metadata" class="w-full max-h-[20rem]">
 				<source src="{{p.realurl(v)}}" type="video/mp4">
 			</video>
 		</div>
 	{% elif p.is_youtube %}
-		<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %}">
+		<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}hidden{% endif %} md:ml-[4.5rem] mt-3">
 			{{p.embed_url | safe}}
 		</div>
 	{% endif %}

From cc11e486251dffc4d7c8d9afdc17a8f5dca05b1d Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:37:36 -0600
Subject: [PATCH 22/25] fix

---
 .../CHRISTMAS/sidebars/HomeSidebar.html         | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index 339062a56..5fce18ead 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -118,19 +118,12 @@
 		</ul>
 	</div>
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>
-	<button data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{ banner[random].image }}" onclick="expandDesktopImage('{{ banner[random].image }}')" class="w-full h-56 shadow-sm p-[3px] bg-white dark:bg-gray-900 overflow-hidden">
+	<a href="/post/32341/" class="w-full h-56 shadow-sm p-[3px] bg-white dark:bg-gray-900 overflow-hidden">
 		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="{{ banner[random].image }}" alt="artwork featuring an orange and white cat"/>
-	</button>
-	<div class="mt-1 flex justify-between">
-		<!-- Link to OC post -->
-		<small class="text-gray-500">
-			<a href="/post/32341/" class="font-bold">Share</a> your artwork
-		</small>
-		<!-- Creds -->
-		<small class="text-gray-500">
-			Artwork by <a href="/@{{ banner[random].username }}" class="font-bold">@{{ banner[random].username }}</a>
-		</small>
-	</div>
+	</a>
+	<small class="mt-1 block text-gray-500">
+		Artwork by <a href="/@{{ banner[random].username }}" class="font-bold">@{{ banner[random].username }}</a>
+	</small>
 	{% if v %}
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>
 	<div class="flex flex-col sticky top-4">

From 770c405ae77bbcc7c2b1a053eebbfe8b0f4edc34 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:40:26 -0600
Subject: [PATCH 23/25] fix

---
 files/templates/CHRISTMAS/submission_listing.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 68e09ef96..0f27db4df 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -266,17 +266,17 @@
 					<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
 				</a>
 			{% elif p.is_image %}
-				<button data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{p.realurl(v)}}" onclick="expandDesktopImage('{{ p.realurl(v) }}')">
+				<a href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{p.realurl(v)}}" onclick="expandDesktopImage('{{ p.realurl(v) }}')">
 					<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
-				</button>
+				</a>
 			{% elif p.is_video %}
-				<button onclick="toggleVideo({{p.id}})">
+				<a href="javascript:void(0)" onclick="toggleVideo({{p.id}})">
 					<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
-				</button>
+				</a>
 			{% elif p.is_youtube %}
-				<button onclick="document.getElementById('video-{{p.id}}').classList.toggle('hidden')">
+				<a href="javascript:void(0)" onclick="document.getElementById('video-{{p.id}}').classList.toggle('hidden')">
 					<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
-				</button>
+				</a>
 			{% else %}
 				<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
 					<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover  bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">

From 540b7d0470630c202dc8a141d77fcb2dcf889a4b Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:42:07 -0600
Subject: [PATCH 24/25] fix

---
 files/templates/CHRISTMAS/sidebars/HomeSidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index 5fce18ead..630520d3a 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -118,7 +118,7 @@
 		</ul>
 	</div>
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>
-	<a href="/post/32341/" class="w-full h-56 shadow-sm p-[3px] bg-white dark:bg-gray-900 overflow-hidden">
+	<a href="/post/32341/" class="block w-full h-56 shadow-sm p-[3px] bg-white dark:bg-gray-900 overflow-hidden">
 		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="{{ banner[random].image }}" alt="artwork featuring an orange and white cat"/>
 	</a>
 	<small class="mt-1 block text-gray-500">

From e0e434c386130f543d0ce6a62a832c2acff72764 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Tue, 28 Dec 2021 19:44:52 -0600
Subject: [PATCH 25/25] fix

---
 files/templates/CHRISTMAS/submission.html                    | 2 --
 files/templates/CHRISTMAS/submission/SubmissionEditForm.html | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/files/templates/CHRISTMAS/submission.html b/files/templates/CHRISTMAS/submission.html
index 815b84f69..e6c7f231f 100644
--- a/files/templates/CHRISTMAS/submission.html
+++ b/files/templates/CHRISTMAS/submission.html
@@ -454,9 +454,7 @@
 					</div>
 
 					{% if v and (v.id==p.author_id or v.admin_level > 1 and v.admin_level > 2) %}
-					<div class="py-2">
 						{% include "CHRISTMAS/submission/SubmissionEditForm.html" %}
-					</div>
 					{% endif %}
 
 					{% if p.embed_url and "http" not in p.embed_url and "<" not in p.embed_url %}
diff --git a/files/templates/CHRISTMAS/submission/SubmissionEditForm.html b/files/templates/CHRISTMAS/submission/SubmissionEditForm.html
index d0bc60e94..0559c5cea 100644
--- a/files/templates/CHRISTMAS/submission/SubmissionEditForm.html
+++ b/files/templates/CHRISTMAS/submission/SubmissionEditForm.html
@@ -1,4 +1,4 @@
-<div id="edit-post-body-{{p.id}}" class="hidden">
+<div id="edit-post-body-{{p.id}}" class="py-2 hidden">
 	<form id="post-edit-form-{{p.id}}" class="flex flex-col w-full" action="/edit_post/{{p.id}}" method="post">
 		<input type="hidden" name="formkey" value="{{v.formkey}}">
 		<input type="hidden" name="current_page" value="{{request.path}}">