diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index 52e7b5282d..174f250ca7 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -5562,9 +5562,6 @@ div[id^="form-preview-"] li > p:first-child {
 	color: #f27d0c !important;
 	font-weight: 800;
 }
-.agendaposter {
-	text-transform: uppercase !important;
-}
 code {
 	text-transform: none !important;
 }
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 764b4ed307..423d944be8 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -254,7 +254,7 @@
 			{% endif %}
 
 			{% set realbody = c.realbody(v) %}
-			<div id="comment-text-{{c.id}}" class="comment-text mb-0 {% if c.author.agendaposter and not (c.parent_submission and c.post.sub == 'chudrama') %}agendaposter agendaposter-img agendaposter-{{c.id_last_num}}{% endif %} {% if c.author.rainbow %}rainbow-text{% endif %}">
+			<div id="comment-text-{{c.id}}" class="comment-text mb-0 {% if c.author.agendaposter and not (c.parent_submission and c.post.sub == 'chudrama') %}text-uppercase agendaposter-img agendaposter-{{c.id_last_num}}{% endif %} {% if c.author.rainbow %}rainbow-text{% endif %}">
 				{{realbody | safe}}
 			</div>
 			{% if c.parent_submission or c.wall_user_id %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 5d79049423..5ec5188b4a 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -87,14 +87,14 @@
 					</div>
 					{% endif %}
 					{% if p.realurl(v) and not v_forbid_deleted %}
-						<h1 id="post-title" class="card-title post-title text-left mb-md-3 {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %}">
+						<h1 id="post-title" class="card-title post-title text-left mb-md-3 {% if p.author.agendaposter and p.sub != 'chudrama' %}text-uppercase{% endif %}">
 								<a {% if p.author.rainbow %}class="rainbow-text"{% endif %} {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener" href="{{p.realurl(v)}}">
 								{% 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 {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %}">
+						<h1 id="post-title" class="card-title post-title text-left mb-md-3 {% if p.author.agendaposter and p.sub != 'chudrama' %}text-uppercase{% endif %} {% if p.author.rainbow %}rainbow-text{% 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>
@@ -124,7 +124,7 @@
 						{% endif %}
 
 
-						<div id="post-text" class="{% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter agendaposter-img agendaposter-{{p.id_last_num}}{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %}">
+						<div id="post-text" class="{% if p.author.agendaposter and p.sub != 'chudrama' %}text-uppercase agendaposter-img agendaposter-{{p.id_last_num}}{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %}">
 							{% if p.is_image %}
 								<div class="row no-gutters mb-4">
 									<div class="col">
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 6a1e1906b7..4069726965 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -105,7 +105,7 @@
 				{{ macros.post_meta(p) }}
 			</div>
 			<h5 class="card-title post-title text-left w-lg-95 pb-0 pb-md-1">
-				<a id="{{p.id}}-title" {% if v and v.newtab %}data-target="t" target="_blank"{% endif %} href="{{p.permalink}}" class="{% if p.sub %}sub{% endif %} stretched-link {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %}">
+				<a id="{{p.id}}-title" {% if v and v.newtab %}data-target="t" target="_blank"{% endif %} href="{{p.permalink}}" class="{% if p.sub %}sub{% endif %} stretched-link {% if p.author.agendaposter and p.sub != 'chudrama' %}text-uppercase{% 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></h5>
@@ -217,7 +217,7 @@
 
 {% if not v_forbid_deleted %}
 	{% if p.realbody(v, listing=True) %}
-		<div class="d-none card rounded border {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter agendaposter-img agendaposter-{{p.id_last_num}}{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %} post-preview" id="post-text-{{p.id}}">
+		<div class="d-none card rounded border {% if p.author.agendaposter and p.sub != 'chudrama' %}text-uppercase agendaposter-img agendaposter-{{p.id_last_num}}{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %} post-preview" id="post-text-{{p.id}}">
 			{{p.realbody(v, listing=True) | safe}}
 		</div>
 	{% endif %}