diff --git a/files/templates/badmins.html b/files/templates/badmins.html
index 220ad75f7..5c541371a 100644
--- a/files/templates/badmins.html
+++ b/files/templates/badmins.html
@@ -15,7 +15,7 @@
 </thead>
 {% for user in badmins %}
 	<tr>
-		<td><a {% if user.patron %}class="patron"{% endif %} style="color:#{{user.namecolor}}; {% if user.patron %}background-color:#{{user.namecolor}};{% endif %} font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.coins}}</td>
 	</tr>
 {% endfor %}
diff --git a/files/templates/banned.html b/files/templates/banned.html
index 3e6674d02..ebfbf1549 100644
--- a/files/templates/banned.html
+++ b/files/templates/banned.html
@@ -13,9 +13,9 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight:bold;">{{users.index(user)+1}}</td>
-		<td><a {% if user.patron %}class="patron"{% endif %} style="color:#{{user.namecolor}}; {% if user.patron %}background-color:#{{user.namecolor}};{% endif %} font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold;">{% if user.ban_reason %}{{user.ban_reason}}{% endif %}</td>
-		<td>{% if user.banned_by %}<a {% if user.banned_by.patron %}class="patron"{% endif %} style="color:#{{user.banned_by.namecolor}}; {% if user.banned_by.patron %}background-color:#{{user.banned_by.namecolor}};{% endif %} font-weight:bold;" href="/@{{user.banned_by.username}}"><img src="/uid/{{user.banned_by.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.banned_by.username}}</a>{% endif %}</td>
+		<td> font-weight:bold;" href="/@{{user.banned_by.username}}"><img src="/uid/{{user.banned_by.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if user.banned_by.patron %}class="patron" style="background-color:#{{user.banned_by.namecolor}};"{% endif %}>{{user.banned_by.username}}</span></a>{% endif %}</td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/files/templates/blocks.html b/files/templates/blocks.html
index dd9bb30b6..74a79b441 100644
--- a/files/templates/blocks.html
+++ b/files/templates/blocks.html
@@ -14,8 +14,8 @@
 </thead>
 {% for user in users %}
 	<tr>
-		<td><a {% if user.patron %}class="patron"{% endif %} style="font-weight:bold;color:#{{user.namecolor}}; {% if user.patron %}background-color:#{{user.namecolor}};{% endif %}" href="/@{{user.username}}">{{user.username}}</a></td>
-		<td><a {% if targets[loop.index-1].patron %}class="patron"{% endif %} style="font-weight:bold;color:#{{targets[loop.index-1].namecolor}}; {% if targets[loop.index-1].patron %}background-color:#{{targets[loop.index-1].namecolor}};{% endif %}" href="/@{{targets[loop.index-1].username}}">{{targets[loop.index-1].username}}</a></td>
+		<td><a style="font-weight:bold;color:#{{user.namecolor}}; " href="/@{{user.username}}"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="font-weight:bold;color:#{{targets[loop.index-1].namecolor}}; " href="/@{{targets[loop.index-1].username}}"><span {% if targets[loop.index-1].patron %}class="patron" style="background-color:#{{targets[loop.index-1].namecolor}};"{% endif %}>{{targets[loop.index-1].username}}</span></a></td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/files/templates/comments.html b/files/templates/comments.html
index e01ec771e..47bf78968 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -126,7 +126,7 @@
 				{% if c.is_blocking %}<i class="fas fa-user-minus text-warning" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="{% if v and v.admin_level >= 2 %}You're blocking this user, but you can see this comment because {{'it\'s an admin comment' if c.distinguish_level else 'you\'re an admin'}}.{% else %}Comment author is banned{% endif %}"></i>&nbsp;{% endif %}
 				{% if c.is_blocked %}<i class="fas fa-user-minus text-danger" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="This user is blocking you, but you can see this comment because {{'it\'s an admin comment' if c.distinguish_level else 'you\'re an admin'}}."></i>&nbsp;{% endif %}
 
-				<a {% if c.author.patron %}class="patron"{% endif %} style="color:#{{c.author.namecolor}}; {% if c.author.patron %}background-color:#{{c.author.namecolor}};{% endif %} font-size:12px; font-weight:bold;" href="/@{{c.author.username}}"><img src="{{c.author.profile_url}}" class="profile-pic-25 mr-2"/>{{c.author.username}}</a>{% if c.author.customtitle %}&nbsp;<bdi style="color: #{{c.author.titlecolor}}">&nbsp;{{c.author.customtitle | safe}}</bdi>{% endif %}
+				<a style="color:#{{c.author.namecolor}};  font-size:12px; font-weight:bold;" href="/@{{c.author.username}}"><img src="{{c.author.profile_url}}" class="profile-pic-25 mr-2"/><span {% if c.author.patron %}class="patron" style="background-color:#{{c.author.namecolor}};"{% endif %}>{{c.author.username}}</span></a>{% if c.author.customtitle %}&nbsp;<bdi style="color: #{{c.author.titlecolor}}">&nbsp;{{c.author.customtitle | safe}}</bdi>{% endif %}
 
 				<span id="timestamp-{{c.id}}" data-toggle="tooltip" data-placement="bottom" title="" class="time-stamp">&nbsp;{{c.age_string}}</span>
 				{% if c.edited_utc %}
diff --git a/files/templates/followers.html b/files/templates/followers.html
index fc1d05555..846efb8e2 100644
--- a/files/templates/followers.html
+++ b/files/templates/followers.html
@@ -13,7 +13,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight: bold">{{users.index(user)+1}}</td>
-		<td><a {% if user.patron %}class="patron"{% endif %} style="color:#{{user.namecolor}}; {% if user.patron %}background-color:#{{user.namecolor}};{% endif %} font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/files/templates/header.html b/files/templates/header.html
index bcb1c2522..4eaaf5888 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -78,7 +78,7 @@
 					<div class="d-flex">
 						<div><img src="{{v.profile_url}}" class="profile-pic-35"></div>
 						<div class="text-left pl-2">
-							<div style="color: #{{v.namecolor}}" class="text-small font-weight-bold {% if v.patron %}patron{% endif %}">{{v.username}}</div>
+							<div style="color: #{{v.namecolor}}" class="text-small font-weight-bold {% if v.patron %}patron{% endif %}"><span {% if v.patron %}class="patron" style="background-color:#{{v.namecolor}};"{% endif %}>{{v.username}}</span></div>
 							<div class="text-small-extra text-purple"><i class="fad fa-coins mr-1"></i><span id="user-coins-amount">{{v.coins}}</span> {{"COINS_NAME" | app_config}}</div>
 						</div>
 					</div>
diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html
index ca2cddc88..d8481e8c2 100644
--- a/files/templates/leaderboard.html
+++ b/files/templates/leaderboard.html
@@ -17,7 +17,7 @@
 {% for user in users1 %}
 	<tr>
 		<td style="font-weight:bold;">{{users1.index(user)+1}}</td>
-		<td><a {% if user.patron %}class="patron"{% endif %} style="color:#{{user.namecolor}}; {% if user.patron %}background-color:#{{user.namecolor}};{% endif %} font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.coins}}</td>
 	</tr>
 {% endfor %}
@@ -42,7 +42,7 @@
 {% for user in users2 %}
 	<tr>
 		<td style="font-weight:bold;">{{users2.index(user)+1}}</td>
-		<td><a {% if user.patron %}class="patron"{% endif %} style="color:#{{user.namecolor}}; {% if user.patron %}background-color:#{{user.namecolor}};{% endif %} font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.stored_subscriber_count}}</td>
 	</tr>
 {% endfor %}
@@ -67,7 +67,7 @@
 {% for user in users3 %}
 	<tr>
 		<td style="font-weight:bold;">{{users3.index(user)+1}}</td>
-		<td><a {% if user.patron %}class="patron"{% endif %} style="color:#{{user.namecolor}}; {% if user.patron %}background-color:#{{user.namecolor}};{% endif %} font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.post_count}}</td>
 	</tr>
 {% endfor %}
@@ -92,7 +92,7 @@
 {% for user in users4 %}
 	<tr>
 		<td style="font-weight:bold;">{{users4.index(user)+1}}</td>
-		<td><a {% if user.patron %}class="patron"{% endif %} style="color:#{{user.namecolor}}; {% if user.patron %}background-color:#{{user.namecolor}};{% endif %} font-weight:bold; fonts" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.comment_count}}</td>
 	</tr>
 {% endfor %}
diff --git a/files/templates/patrons.html b/files/templates/patrons.html
index 36aecaee8..8a8fdd02a 100644
--- a/files/templates/patrons.html
+++ b/files/templates/patrons.html
@@ -13,7 +13,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight:bold;">{{users.index(user)+1}}</td>
-		<td><a {% if user.patron %}class="patron"{% endif %} style="color:#{{user.namecolor}}; {% if user.patron %}background-color:#{{user.namecolor}};{% endif %} font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
 
 		<td><img style="width: 32px; height: 32px" src="/assets/images/badges/patron-{{user.patron}}.gif"></td>
 
diff --git a/files/templates/rentoids.html b/files/templates/rentoids.html
index 1f210620d..f1760e683 100644
--- a/files/templates/rentoids.html
+++ b/files/templates/rentoids.html
@@ -13,7 +13,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight: bold">{{users.index(user)+1}}</td>
-		<td><a {% if user.patron %}class="patron"{% endif %} style="color:#{{user.namecolor}}; {% if user.patron %}background-color:#{{user.namecolor}};{% endif %} font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index e231b8134..f859273fd 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -254,7 +254,7 @@
 								<label for="bio" class="text-black w-lg-25">Username</label>
 
 								<div class="w-lg-100">
-									<p>Your original username will always stay reserved for you: <code>{{v.original_username}}</code></p>
+									<p>Your original username will always stay reserved for you: <code><span {% if v.original.patron %}class="patron" style="background-color:#{{v.original.namecolor}};"{% endif %}>{{v.original.username}}</span></code></p>
 
 
 									<form action="/settings/name_change" method="post">
diff --git a/files/templates/submission.html b/files/templates/submission.html
index f401660ca..c3b123fa4 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -219,7 +219,7 @@
 						{% 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">unlisted</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 %}
-						&nbsp;<a {% if p.author.patron %}class="patron"{% endif %} href="{{p.author.url}}" style="color: #{{p.author.namecolor}}; {% if p.author.patron %}background-color:#{{p.author.namecolor}};{% endif %} font-weight: bold;" class="user-name"><img src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"/>{{p.author.username}}</a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
+						&nbsp;<a href="{{p.author.url}}" style="color: #{{p.author.namecolor}};  font-weight: bold;" class="user-name"><img src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"/><span {% if p.author.patron %}class="patron" style="background-color:#{{p.author.namecolor}};"{% endif %}>{{p.author.username}}</span></a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
 						<span data-toggle="tooltip" data-placement="bottom" id="timestamp" title="">&nbsp;{{p.age_string}}</span>
 						({% if p.realurl(v) %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" {% if v and v.newtabexternal %}target="_blank"{% endif %}>{{p.domain}}</a>{% else %}text post{% endif %})
 						
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 1f40e0540..4a86707c4 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -101,7 +101,7 @@
 				{% if p.is_blocked %}<i class="fas fa-user-minus text-danger" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="This user is blocking you."></i>{% endif %}
 				{% if p.private %}<span class="badge border-warning border-1 text-small-extra">unlisted</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-{{p.id}}').classList.toggle('d-none')">{{p.active_flags}} Reports</a>{% endif %}
-				&nbsp;<a {% if p.author.patron %}class="patron"{% endif %} href="{{p.author.url}}" style="color: #{{p.author.namecolor}}; {% if p.author.patron %}background-color:#{{p.author.namecolor}};{% endif %} font-weight: bold;" class="user-name"><img src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"/>{{p.author.username}}</a>{% if p.author.customtitle %}<bdi  style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
+				&nbsp;<a href="{{p.author.url}}" style="color: #{{p.author.namecolor}};  font-weight: bold;" class="user-name"><img src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"/><span {% if p.author.patron %}class="patron" style="background-color:#{{p.author.namecolor}};"{% endif %}>{{p.author.username}}</span></a>{% if p.author.customtitle %}<bdi  style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
 				<span data-toggle="tooltip" data-placement="bottom" id="timestamp-{{p.id}}" title="">&nbsp;{{p.age_string}}</span>
 				&nbsp;
 				({% if p.realurl(v) %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" target="_blank">{{p.domain}}</a>{% else %}text post{% endif %})
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index a319105dc..71e7c599f 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -108,7 +108,7 @@
 							{% endif %}
 							
 							<div class="d-flex align-items-center mt-1 mb-2">
-								<h1 class="font-weight-bolder h3 mb-0" style="color: #{{u.namecolor}}">{{u.username}}</h1>
+								<h1 class="font-weight-bolder h3 mb-0" style="color: #{{u.namecolor}}"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span></h1>
 								{% if u.username != u.original_username %}
 								<span>
 									<i class="fad fa-user-tag text-info align-middle ml-2" data-toggle="tooltip" data-placement="bottom" title="Original Username: @{{u.original_username}}"></i>
@@ -349,7 +349,7 @@
 					<h5 style="color:#ff66ac;">BANNED USER{% if u.ban_reason %}: {{u.ban_reason}}{% endif %}</h5>
 					{% if u.unban_utc %}<h5 style="color:#ff66ac;">{{u.unban_string}}</h5>{% endif %}
 				{% endif %}
-				<a class="text-black"><h1 class="h5 d-inline-block" style="color: #{{u.namecolor}}">{{u.username}}</h1></a>
+				<a class="text-black"><h1 class="h5 d-inline-block" style="color: #{{u.namecolor}}"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span></h1></a>
 				
 				{% if u.username != u.original_username %}
 					<span>
diff --git a/files/templates/userpage_blocked.html b/files/templates/userpage_blocked.html
index 2aafc47b4..c13ae4eae 100644
--- a/files/templates/userpage_blocked.html
+++ b/files/templates/userpage_blocked.html
@@ -27,7 +27,7 @@
 {% endblock %}
 
 {% block title %}
-<title>{{u.username}}</title>
+<title><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span></title>
 <meta name="description" content="[banned]">
 {% endblock %}
 
diff --git a/files/templates/userpage_blocking.html b/files/templates/userpage_blocking.html
index 53515e938..17bab7eef 100644
--- a/files/templates/userpage_blocking.html
+++ b/files/templates/userpage_blocking.html
@@ -27,7 +27,7 @@
 {% endblock %}
 
 {% block title %}
-<title>{{u.username}}</title>
+<title><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span></title>
 <meta name="description" content="[banned]">
 {% endblock %}
 
diff --git a/files/templates/viewers.html b/files/templates/viewers.html
index c53b3272e..e44be5a3e 100644
--- a/files/templates/viewers.html
+++ b/files/templates/viewers.html
@@ -12,7 +12,7 @@
 </thead>
 {% for view in viewers %}
 	<tr>
-        <td style="font-weight: bold"><a {% if view.viewer.patron %}class="patron"{% endif %} style="color: #{{view.viewer.namecolor}}" href="/@{{view.viewer.username}}"><img src="/uid/{{view.viewer.id}}/pic/profile" class="profile-pic-20 mr-1">{{view.viewer.username}}</a></td>
+        <td style="font-weight: bold"><a style="color: #{{view.viewer.namecolor}}" href="/@{{view.viewer.username}}"><img src="/uid/{{view.viewer.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if view.viewer.patron %}class="patron" style="background-color:#{{view.viewer.namecolor}};"{% endif %}>{{view.viewer.username}}</span></a></td>
         <td style="font-weight: bold">{{view.last_view_string}}</td>
 	</tr>
 {% endfor %}
diff --git a/files/templates/votes.html b/files/templates/votes.html
index 057ebafff..e563a6e6f 100644
--- a/files/templates/votes.html
+++ b/files/templates/votes.html
@@ -28,7 +28,7 @@
 	<thead class="bg-primary text-white"><tr><th>User</th></tr></thead>
 
 	{% for vote in ups %}
-		<tr><td><a {% if vote.user.patron %}class="patron"{% endif %} style="color:#{{vote.user.namecolor}}; {% if vote.user.patron %}background-color:#{{vote.user.namecolor}};{% endif %} font-weight:bold;" href="/@{{vote.user.username}}"><img src="/uid/{{vote.user.id}}/pic/profile" class="profile-pic-20 mr-1">{{vote.user.username}}</a></td></tr>
+		<tr><td><a style="color:#{{vote.user.namecolor}};  font-weight:bold;" href="/@{{vote.user.username}}"><img src="/uid/{{vote.user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if vote.user.patron %}class="patron" style="background-color:#{{vote.user.namecolor}};"{% endif %}>{{vote.user.username}}</span></a></td></tr>
 	{% endfor %}
 </table>
 
@@ -37,7 +37,7 @@
 	<thead class="bg-primary text-white"><tr><th>User</th></tr></thead>
 
 	{% for vote in downs %}
-		<tr><td><a {% if vote.user.patron %}class="patron"{% endif %} style="color:#{{vote.user.namecolor}}; {% if vote.user.patron %}background-color:#{{vote.user.namecolor}};{% endif %} font-weight:bold;" href="/@{{vote.user.username}}"><img src="/uid/{{vote.user.id}}/pic/profile" class="profile-pic-20 mr-1">{{vote.user.username}}</a></td></tr>
+		<tr><td><a style="color:#{{vote.user.namecolor}};  font-weight:bold;" href="/@{{vote.user.username}}"><img src="/uid/{{vote.user.id}}/pic/profile" class="profile-pic-20 mr-1"><span {% if vote.user.patron %}class="patron" style="background-color:#{{vote.user.namecolor}};"{% endif %}>{{vote.user.username}}</span></a></td></tr>
 	{% endfor %}
 </table>