diff --git a/files/routes/comments.py b/files/routes/comments.py
index 2460ace2e7..533edff1ab 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -208,8 +208,8 @@ def api_comment(v):
 
 	if v.agendaposter and not v.marseyawarded:
 		for k, l in AJ_REPLACEMENTS.items(): body = body.replace(k, l)
-		body = body.replace(' I ', f' @{v.username} ')
-		body = censor_slurs2(body).upper().replace(' ME ', f' @{v.username} ')
+		body = body.replace(' I ', f' @{v.username} ').replace(' i ', f' @{v.username} ')
+		body = censor_slurs2(body).replace(' ME ', f' @{v.username} ').replace(' me ', f' @{v.username} ')
 
 	body_html = sanitize(CustomRenderer().render(mistletoe.Document(body)))
 
@@ -630,8 +630,8 @@ def edit_comment(cid, v):
 
 		if v.agendaposter and not v.marseyawarded:
 			for k, l in AJ_REPLACEMENTS.items(): body = body.replace(k, l)
-			body = body.replace(' I ', f' @{v.username} ')
-			body = censor_slurs2(body).upper().replace(' ME ', f' @{v.username} ')
+			body = body.replace(' I ', f' @{v.username} ').replace(' i ', f' @{v.username} ')
+			body = censor_slurs2(body).replace(' ME ', f' @{v.username} ').replace(' me ', f' @{v.username} ')
 
 		if not c.options:
 			for i in re.finditer('\s*\$\$([^\$\n]+)\$\$\s*', body):
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 65c27b838b..eccdaf8e43 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -431,8 +431,8 @@ def edit_post(pid, v):
 	if title != p.title:
 		if v.agendaposter and not v.marseyawarded:
 			for k, l in AJ_REPLACEMENTS.items(): title = title.replace(k, l)
-			title = title.replace(' I ', f' @{v.username} ')
-			title = censor_slurs2(title).upper().replace(' ME ', f' @{v.username} ')
+			title = title.replace(' I ', f' @{v.username} ').replace(' i ', f' @{v.username} ')
+			title = censor_slurs2(title).replace(' ME ', f' @{v.username} ').replace(' me ', f' @{v.username} ')
 
 		title_html = filter_emojis_only(title)
 		if v.marseyawarded and len(list(re.finditer('>[^<\s+]|[^>\s+]<', title_html))) > 0: return {"error":"You can only type marseys!"}, 403
@@ -459,8 +459,8 @@ def edit_post(pid, v):
 
 		if v.agendaposter and not v.marseyawarded:
 			for k, l in AJ_REPLACEMENTS.items(): body = body.replace(k, l)
-			body = body.replace(' I ', f' @{v.username} ')
-			body = censor_slurs2(body).upper().replace(' ME ', f' @{v.username} ')
+			body = body.replace(' I ', f' @{v.username} ').replace(' i ', f' @{v.username} ')
+			body = censor_slurs2(body).replace(' ME ', f' @{v.username} ').replace(' me ', f' @{v.username} ')
 
 		if not p.options.count():
 			for i in re.finditer('\s*\$\$([^\$\n]+)\$\$\s*', body):
@@ -729,8 +729,8 @@ def submit_post(v):
 
 	if v.agendaposter and not v.marseyawarded:
 		for k, l in AJ_REPLACEMENTS.items(): title = title.replace(k, l)
-		title = title.replace(' I ', f' @{v.username} ')
-		title = censor_slurs2(title).upper().replace(' ME ', f' @{v.username} ')
+		title = title.replace(' I ', f' @{v.username} ').replace(' i ', f' @{v.username} ')
+		title = censor_slurs2(title).replace(' ME ', f' @{v.username} ').replace(' me ', f' @{v.username} ')
 
 	title_html = filter_emojis_only(title)
 	body = request.values.get("body", "").strip()
@@ -928,8 +928,8 @@ def submit_post(v):
 
 	if v.agendaposter and not v.marseyawarded:
 		for k, l in AJ_REPLACEMENTS.items(): body = body.replace(k, l)
-		body = body.replace(' I ', f' @{v.username} ')
-		body = censor_slurs2(body).upper().replace(' ME ', f' @{v.username} ')
+		body = body.replace(' I ', f' @{v.username} ').replace(' i ', f' @{v.username} ')
+		body = censor_slurs2(body).replace(' ME ', f' @{v.username} ').replace(' me ', f' @{v.username} ')
 
 	if request.files.get("file2") and request.headers.get("cf-ipcountry") != "T1":
 		file=request.files["file2"]
diff --git a/files/static/dist/main.css b/files/static/dist/main.css
index c291f31120..0d3053d270 100644
--- a/files/static/dist/main.css
+++ b/files/static/dist/main.css
@@ -4076,3 +4076,6 @@ video {
 		width: 20%;
 	}
 }
+.agendaposter {
+    text-transform: uppercase !important;
+}
\ No newline at end of file
diff --git a/files/static/src/main.css b/files/static/src/main.css
index 8d1f5dd6e2..7efbffb837 100644
--- a/files/static/src/main.css
+++ b/files/static/src/main.css
@@ -473,3 +473,7 @@
 		max-width: 100%;
 		@apply inline-block object-contain
 	}
+
+.agendaposter {
+	text-transform: uppercase !important;
+}
\ No newline at end of file
diff --git a/files/templates/CHRISTMAS/authforms.html b/files/templates/CHRISTMAS/authforms.html
index 87afd6826d..dbd52310dd 100644
--- a/files/templates/CHRISTMAS/authforms.html
+++ b/files/templates/CHRISTMAS/authforms.html
@@ -14,11 +14,11 @@
 
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=1"><link rel="stylesheet" href="/assets/CHRISTMAS/css/{{v.theme}}.css?a=1">
+			<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=2"><link rel="stylesheet" href="/assets/CHRISTMAS/css/{{v.theme}}.css?a=1">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/CHRISTMAS/css/agendaposter.css?a=1">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=1"><link rel="stylesheet" href="/assets/CHRISTMAS/css/{{'DEFAULT_THEME' | app_config}}.css?a=1">
+			<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=2"><link rel="stylesheet" href="/assets/CHRISTMAS/css/{{'DEFAULT_THEME' | app_config}}.css?a=1">
 		{% endif %}
 
 </head>
diff --git a/files/templates/CHRISTMAS/comments.html b/files/templates/CHRISTMAS/comments.html
index c58b1ca68e..22f69cff4d 100644
--- a/files/templates/CHRISTMAS/comments.html
+++ b/files/templates/CHRISTMAS/comments.html
@@ -318,7 +318,7 @@
 				<div id="comment-banned-warning" class="hidden-on-collapse text-red-600 mb-0">Removed by @{{c.ban_reason}}</div>
 			{% endif %}
 
-			<div id="comment-text-{{c.id}}" class="comment-text hidden-on-collapse mt-2 break-words {% if c.sentto != None and v.id==c.author_id %}text-green-700 dark:text-green-400{% endif %}">
+			<div id="comment-text-{{c.id}}" class="{% if c.author.agendaposter %}agendaposter{% endif %} comment-text hidden-on-collapse mt-2 break-words {% if c.sentto != None and v.id==c.author_id %}text-green-700 dark:text-green-400{% endif %}">
 				{{c.realbody(v) | safe}}
 				{% if c.options %}
 					{% for o in c.options %}
diff --git a/files/templates/CHRISTMAS/home.html b/files/templates/CHRISTMAS/home.html
index f7450567fc..f70ba00d1e 100644
--- a/files/templates/CHRISTMAS/home.html
+++ b/files/templates/CHRISTMAS/home.html
@@ -64,10 +64,6 @@
 	{% if v %}
 		{% include "CHRISTMAS/award_modal.html" %}
 	{% endif %}
-
-	{% if v.agendaposter %}
-		<iframe width="0" height="0" src="https://www.youtube.com/embed/A2o15RCtSS0?rel=0&amp;controls=0&amp;showinfo=0&autoplay=1" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-	{% endif %}
 {% endblock %}
 
 {% block scripts %}
diff --git a/files/templates/CHRISTMAS/login.html b/files/templates/CHRISTMAS/login.html
index 906f12e75f..0ecc952843 100644
--- a/files/templates/CHRISTMAS/login.html
+++ b/files/templates/CHRISTMAS/login.html
@@ -13,9 +13,9 @@
 	<title>Login -	{{'SITE_NAME' | app_config}}</title>
 	{% endblock %}
 
-	<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=1">
+	<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=2">
 
-	<link rel="stylesheet" href="/static/dist/main.css?a=1">
+	<link rel="stylesheet" href="/static/dist/main.css?a=2">
 
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
 
diff --git a/files/templates/CHRISTMAS/login_2fa.html b/files/templates/CHRISTMAS/login_2fa.html
index 726cde2555..2170c86fea 100644
--- a/files/templates/CHRISTMAS/login_2fa.html
+++ b/files/templates/CHRISTMAS/login_2fa.html
@@ -13,7 +13,7 @@
 		<title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=1"><link rel="stylesheet" href="/assets/CHRISTMAS/css/{{'DEFAULT_THEME' | app_config}}.css?a=1">
+		<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=2"><link rel="stylesheet" href="/assets/CHRISTMAS/css/{{'DEFAULT_THEME' | app_config}}.css?a=1">
 
 </head>
 
diff --git a/files/templates/CHRISTMAS/sign_up.html b/files/templates/CHRISTMAS/sign_up.html
index 2b68e9d5e1..7fe31abdbb 100644
--- a/files/templates/CHRISTMAS/sign_up.html
+++ b/files/templates/CHRISTMAS/sign_up.html
@@ -26,9 +26,9 @@
 
 	<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}</title>
 
-	<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=1">
+	<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=2">
 
-	<link rel="stylesheet" href="/static/dist/main.css?a=1">
+	<link rel="stylesheet" href="/static/dist/main.css?a=2">
 
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
 
diff --git a/files/templates/CHRISTMAS/sign_up_failed_ref.html b/files/templates/CHRISTMAS/sign_up_failed_ref.html
index 417ace7140..5e5e72b664 100644
--- a/files/templates/CHRISTMAS/sign_up_failed_ref.html
+++ b/files/templates/CHRISTMAS/sign_up_failed_ref.html
@@ -31,7 +31,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=1"><link rel="stylesheet" href="/assets/CHRISTMAS/css/{{'DEFAULT_THEME' | app_config}}.css?a=1">
+		<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=2"><link rel="stylesheet" href="/assets/CHRISTMAS/css/{{'DEFAULT_THEME' | app_config}}.css?a=1">
 
 </head>
 
diff --git a/files/templates/CHRISTMAS/submission.html b/files/templates/CHRISTMAS/submission.html
index 46a0c7f58c..815b84f692 100644
--- a/files/templates/CHRISTMAS/submission.html
+++ b/files/templates/CHRISTMAS/submission.html
@@ -368,7 +368,7 @@
 					</div>
 
 					<!-- Title -->
-					<h1 id="post-title" class="post-title font-medium text-lg md:text-3xl leading-normal mb-2">
+					<h1 id="post-title" class="{% if p.author.agendaposter %}agendaposter{% endif %} post-title font-medium text-lg md:text-3xl leading-normal mb-2">
 						{% 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 dark:text-gray-200 hover:text-primary" style="word-break: break-word;">
 							{{p.realtitle(v) | safe}}
@@ -379,7 +379,7 @@
 					</h1>
 
 					<!-- Body content -->
-					<div id="post-body" class="post-body mb-3">
+					<div id="post-body" class="{% if p.author.agendaposter %}agendaposter{% endif %} post-body mb-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>
diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index c23cad1106..d9ad4dfb31 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -242,13 +242,13 @@
 			</div>
 			
 			<h5 class="post-title font-medium text-lg md:text-xl leading-5 mb-2">
-				<a {% if v and v.newtab %}target="_blank"{% endif %} href="{{p.permalink}}" class="stretched-link text-black dark:text-gray-200 hover:text-primary visited:text-gray-700 dark:visited:text-gray-400 break-words" style="word-break: break-word;">
+				<a {% if v and v.newtab %}target="_blank"{% endif %} href="{{p.permalink}}" class="{% if p.author.agendaposter %}agendaposter{% endif %} stretched-link text-black dark:text-gray-200 hover:text-primary visited:text-gray-700 dark:visited:text-gray-400 break-words" style="word-break: break-word;">
 				{{p.realtitle(v) | safe}}
 				</a>
 			</h5>
 
 			{% if p.realbody(v) and not p.over_18 %}
-				<div class="post-text relative z-10 gradient-mask max-h-10 overflow-hidden pointer-events-none text-gray-500 break-words" style="word-break: break-word;" id="post-text-{{p.id}}">
+				<div class="{% if p.author.agendaposter %}agendaposter{% endif %} post-text relative z-10 gradient-mask max-h-10 overflow-hidden pointer-events-none text-gray-500 break-words" style="word-break: break-word;" id="post-text-{{p.id}}">
 					{{p.realbody(v) | safe}}
 				</div>
 			{% endif %}
diff --git a/files/templates/CHRISTMAS/tailwind.html b/files/templates/CHRISTMAS/tailwind.html
index f916832558..2652fc9457 100644
--- a/files/templates/CHRISTMAS/tailwind.html
+++ b/files/templates/CHRISTMAS/tailwind.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link rel="stylesheet" href="/static/dist/main.css?a=1">
+    <link rel="stylesheet" href="/static/dist/main.css?a=2">
 
     <title>Flask + Tailwind CSS</title>
   </head>
diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index f073961f7d..4b9e83612b 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -14,11 +14,11 @@
 
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/static/assets/css/agendaposter.css?a=3">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 		{% endif %}
 
 </head>
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 004244c924..5a6a21a1b0 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -232,7 +232,7 @@
 				<div id="comment-banned-warning" class="comment-text text-removed mb-0">removed by @{{c.ban_reason}}</div>
 			{% endif %}
 
-			<div id="comment-text-{{c.id}}" class="comment-text mb-0">
+			<div id="comment-text-{{c.id}}" class="comment-text mb-0 {% if c.author.agendaposter %}agendaposter{% endif %}">
 				{{c.realbody(v) | safe}}
 				{% if c.options %}
 					{{c.options_html(v) | safe}}
diff --git a/files/templates/default.html b/files/templates/default.html
index 67684b04a0..222b7793a2 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -6,12 +6,12 @@
 	<script src="/static/assets/js/bootstrap.js?a=3"></script>
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=5">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=6">
 		<link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 		{% if v.agendaposter %}<link rel="stylesheet" href="/static/assets/css/agendaposter.css?a=3">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 	{% endif %}
 
 	<link href="/static/assets/css/fa.css?a=3" rel="stylesheet"> 
diff --git a/files/templates/log.html b/files/templates/log.html
index e75c115db8..c67bae66c3 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,11 +6,11 @@
 {% block content %}
 {% if v %}
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 	{% if v.agendaposter %}<link rel="stylesheet" href="/static/assets/css/agendaposter.css?a=3">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 {% else %}
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 {% endif %}
 
 <div class="row justify-content-around">
diff --git a/files/templates/login.html b/files/templates/login.html
index 0b9921594e..cddbbcc67c 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -17,7 +17,7 @@
 	{% endblock %}
 	
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=5">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=6">
 	<link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 	<link href="/static/assets/css/fa.css?a=3" rel="stylesheet"> 
 
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index ca6629e9fb..ed737489e8 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -13,7 +13,7 @@
 		<title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 72f01037a8..f3dcb42b96 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -33,7 +33,7 @@
 
 
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 	{% if v.agendaposter %}<link rel="stylesheet" href="/static/assets/css/agendaposter.css?a=3">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 
 		<link href="/static/assets/css/fa.css?a=3" rel="stylesheet"> 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 36254c953a..2aea1c5525 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -38,10 +38,10 @@
 	
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 	{% endif %}
 
 		<link href="/static/assets/css/fa.css?a=3" rel="stylesheet"> 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 6265b6aad9..4fed1f3efe 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -30,7 +30,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index be5d00e03f..19c48e9f86 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -31,7 +31,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index c551c155f3..7a82d60064 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -356,13 +356,13 @@
 					</div>
 					{% endif %}
 					{% 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)}}">
+						<h1 id="post-title" class="card-title post-title text-left mb-md-3 {% if p.author.agendaposter %}agendaposter{% endif %}"><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></h1>					
 					{% else %}
-						<h1 id="post-title" class="card-title post-title text-left mb-md-3">
+						<h1 id="post-title" class="card-title post-title text-left mb-md-3 {% if p.author.agendaposter %}agendaposter{% endif %}">
 							{% 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}}
@@ -396,7 +396,7 @@
 						{% endif %}
 
 						
-						<div id="post-text">
+						<div id="post-text" {% if p.author.agendaposter %}class="agendaposter"{% endif %}>
 							{% if p.is_image %}
 								<div class="row no-gutters">
 									<div class="col">
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 4588f56c7b..322087a16c 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -192,7 +192,7 @@
 				&nbsp;&nbsp;{{p.views}} views
 			</div>
 
-			<h5 class="card-title post-title text-left w-lg-75 mb-0 pb-0 pb-md-1"><a {% if v and v.newtab %}target="_blank"{% endif %} href="{{p.permalink}}" class="stretched-link">
+			<h5 class="card-title post-title text-left w-lg-75 mb-0 pb-0 pb-md-1"><a {% if v and v.newtab %}target="_blank"{% endif %} href="{{p.permalink}}" class="stretched-link {% if p.author.agendaposter %}agendaposter{% endif %}">
 				{% 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}}
@@ -490,7 +490,7 @@
 
 {% if not p.club or v and (v.paid_dues or v.id == p.author_id) %}
 	{% if p.realbody(v) %}
-		<div class="d-none card rounded border pb-0 pt-3 my-2" id="post-text-{{p.id}}">
+		<div class="d-none card rounded border pb-0 pt-3 my-2 {% if p.author.agendaposter %}agendaposter{% endif %}" id="post-text-{{p.id}}">
 			{{p.realbody(v) | safe}}
 
 			{% if p.author.sig_html and (p.author_id == 1904 or not (v and v.sigs_disabled)) %}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index c49e32b794..f7d86e1a9d 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -25,11 +25,11 @@
 		{% block stylesheets %}
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=5"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=6"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/static/assets/css/agendaposter.css?a=3">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=5">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=6">
 			<link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 		{% endif %}
 		{% endblock %}