From 8a1343e7394e24e680623c0ee5fdde2ed5e94475 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Sun, 1 Jan 2023 13:12:35 +0200
Subject: [PATCH] Revert "remove all accessibility attributes"

This reverts commit e3a8fe85e3481b7fcbd986ba6e9506ba0c5bad0d.
---
 files/assets/css/main.css                     |  4 ++--
 files/assets/js/casino/roulette_screen.js     |  2 ++
 files/templates/admin/app.html                |  4 ++--
 files/templates/admin/apps.html               |  4 ++--
 files/templates/casino/blackjack_screen.html  |  2 +-
 files/templates/casino/game_screen.html       |  6 ++---
 files/templates/casino/slots_screen.html      |  2 +-
 files/templates/comments.html                 | 22 ++++++++---------
 files/templates/default.html                  |  6 ++---
 files/templates/email/2fa_remove.html         |  6 ++---
 files/templates/email/default.html            |  6 ++---
 files/templates/email/email_change.html       | 10 ++++----
 files/templates/email/email_verify.html       | 10 ++++----
 files/templates/email/password_reset.html     | 10 ++++----
 files/templates/header.html                   |  2 ++
 files/templates/log.html                      |  2 +-
 files/templates/login/sign_up.html            |  4 ++++
 files/templates/login/sign_up_failed_ref.html |  2 +-
 files/templates/lottery.html                  |  9 +++++++
 files/templates/modals/award.html             |  8 +++----
 files/templates/modals/ban.html               |  8 +++----
 files/templates/modals/delete_post.html       |  4 ++--
 files/templates/modals/emoji.html             |  4 ++--
 files/templates/modals/expanded_image.html    |  4 ++--
 files/templates/modals/gif.html               |  4 ++--
 files/templates/modals/report_post.html       |  4 ++--
 files/templates/notifications.html            |  2 +-
 files/templates/popover.html                  |  2 +-
 .../templates/post_admin_actions_mobile.html  |  4 ++--
 files/templates/settings.html                 |  6 ++---
 files/templates/settings/apps.html            |  2 +-
 files/templates/settings/common.html          |  2 +-
 files/templates/settings/personal.html        |  4 ++--
 files/templates/settings/security.html        | 13 +++++-----
 files/templates/settings2.html                |  8 +++----
 files/templates/submission.html               | 18 +++++++-------
 files/templates/submission_listing.html       | 24 +++++++++----------
 files/templates/submit.html                   |  4 ++--
 files/templates/transfers.html                |  2 +-
 files/templates/userpage/admintools.html      |  2 +-
 files/templates/util/macros.html              |  4 ++--
 41 files changed, 132 insertions(+), 114 deletions(-)

diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index 6501e5025..78a44a541 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -301,7 +301,7 @@ a:hover {
 	color: var(--primary);
 	text-decoration: underline;
 }
-a:not([href])
+a:not([href], [role="button"])
 {
 	color: inherit;
 	text-decoration: none;
@@ -5112,7 +5112,7 @@ code {
 .noshadow {
 	box-shadow: none !important;
 }
-:not(textarea)[onclick], :not(textarea)[data-onclick], th {
+[role="button"], :not(textarea)[onclick], :not(textarea)[data-onclick], th {
 	cursor: pointer !important;
 }
 
diff --git a/files/assets/js/casino/roulette_screen.js b/files/assets/js/casino/roulette_screen.js
index 898855cf0..c419acb98 100644
--- a/files/assets/js/casino/roulette_screen.js
+++ b/files/assets/js/casino/roulette_screen.js
@@ -227,6 +227,7 @@ function buildRouletteBets(bets) {
 			data-bs-toggle="tooltip"
 			data-bs-placement="bottom"
 			title=""
+			aria-label="Coin"
 			data-bs-original-title="Coin">
 	`;
 	const marseybuxImgHtml = `
@@ -236,6 +237,7 @@ function buildRouletteBets(bets) {
 			data-bs-toggle="tooltip"
 			data-bs-placement="bottom"
 			title=""
+			aria-label="Marseybux"
 			width="32" class="mr-1 ml-1" 
 			data-bs-original-title="Marseybux">
 	`;
diff --git a/files/templates/admin/app.html b/files/templates/admin/app.html
index 1e3d5d716..296cabcc6 100644
--- a/files/templates/admin/app.html
+++ b/files/templates/admin/app.html
@@ -63,12 +63,12 @@
 </div>
 </div>
 
-<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body bg-success text-center text-white">
 		<i class="fas fa-comment-alt-smile mr-2"></i><span id="toast-post-success-text">Action successful!</span>
 	</div>
 </div>
-<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body bg-danger text-center text-white">
 		<i class="fas fa-exclamation-circle mr-2"></i><span id="toast-post-error-text">Error, please try again later.</span>
 	</div>
diff --git a/files/templates/admin/apps.html b/files/templates/admin/apps.html
index 97649589a..8ae130ac7 100644
--- a/files/templates/admin/apps.html
+++ b/files/templates/admin/apps.html
@@ -51,12 +51,12 @@
 </div>
 </div>
 
-<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body bg-success text-center text-white">
 		<i class="fas fa-comment-alt-smile mr-2"></i><span id="toast-post-success-text">Action successful!</span>
 	</div>
 </div>
-<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body bg-danger text-center text-white">
 		<i class="fas fa-exclamation-circle mr-2"></i><span id="toast-post-error-text">Error, please try again later.</span>
 	</div>
diff --git a/files/templates/casino/blackjack_screen.html b/files/templates/casino/blackjack_screen.html
index a8534150e..8b3558366 100644
--- a/files/templates/casino/blackjack_screen.html
+++ b/files/templates/casino/blackjack_screen.html
@@ -13,7 +13,7 @@
 {% block actions %}
 <link rel="stylesheet" href="{{('css/casino/blackjack_screen.css') | asset}}">
 
-<div class="btn-group">
+<div role="group" class="btn-group">
 	<button type="button" id="twentyone-DEAL" class="btn btn-primary twentyone-btn" data-nonce="{{g.nonce}}" data-onclick="deal()">Deal</button>
 	<button type="button" id="twentyone-HIT" class="btn btn-primary twentyone-btn" data-nonce="{{g.nonce}}" data-onclick="hit()" style="display: none;">Hit</button>
 	<button type="button" id="twentyone-STAY" class="btn btn-primary twentyone-btn" data-nonce="{{g.nonce}}" data-onclick="stay()"
diff --git a/files/templates/casino/game_screen.html b/files/templates/casino/game_screen.html
index 4891735aa..7704da8d4 100644
--- a/files/templates/casino/game_screen.html
+++ b/files/templates/casino/game_screen.html
@@ -14,13 +14,13 @@
 		</div>
 		<div class="col">{% block screen %} {% endblock %}</div>
 		<div class="col">
-			<div id="casinoGameResult" class="alert">
+			<div id="casinoGameResult" class="alert" role="alert">
 				{% block result %}{% endblock %}
 			</div>
 		</div>
 		<div class="col">
 			{% set stats_alert_class = 'success' if v_stats[0] >= v_stats[2] else 'danger' %}
-			<div id="casinoGameStats" class="alert alert-{{stats_alert_class}}">
+			<div id="casinoGameStats" class="alert alert-{{stats_alert_class}}" role="alert">
 				{{v_stats[0]}} win{{macros.plural(v_stats[0])}}{% if v_stats[1] %} - {{v_stats[1]}} tie{{macros.plural(v_stats[1])}}{% endif %} - {{v_stats[2]}} loss{{macros.plural(v_stats[2], 'es')}}
 			</div>
 		</div>
@@ -38,7 +38,7 @@
 						<h5>Currency</h5>
 						<hr>
 					</div>
-					<div class="btn-group">
+					<div class="btn-group" role="group">
 						<input type="radio" class="btn-check" name="wagerCurrency" autocomplete="off" id="wagerCoins"
 							value="coin" checked>
 						<label for="wagerCoins" class="btn btn-primary">
diff --git a/files/templates/casino/slots_screen.html b/files/templates/casino/slots_screen.html
index da12c2f4e..cd197ca9f 100644
--- a/files/templates/casino/slots_screen.html
+++ b/files/templates/casino/slots_screen.html
@@ -21,7 +21,7 @@
 {% endblock %}
 
 {% block actions %}
-	<div class="btn-group">
+	<div class="btn-group" role="group">
 		<button
 			type="button"
 			id="casinoSlotsPull"
diff --git a/files/templates/comments.html b/files/templates/comments.html
index c515ca902..a07d5cf8a 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -312,12 +312,12 @@
 								{% elif v %}
 									<li id="voting-{{c.id}}-mobile" class="voting list-inline-item d-md-none">
 								
-										<span tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('comment-mobile', '{{c.id}}', '1')" class="comment-mobile-{{c.id}}-up mx-0 pr-1 arrow-up upvote-button comment-{{c.id}}-up {% if voted==1 %}active{% endif %}">
+										<span tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('comment-mobile', '{{c.id}}', '1')" class="comment-mobile-{{c.id}}-up mx-0 pr-1 arrow-up upvote-button comment-{{c.id}}-up {% if voted==1 %}active{% endif %}">
 										</span>
 								
 										<span class="comment-mobile-score-{{c.id}} score comment-score-{{c.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if c.controversial %} controversial{% endif %}"{% if not c.is_banned %} data-bs-toggle="tooltip" data-bs-placement="top" title="+{{ups}} | -{{downs}}"{% endif %}style="cursor: default">{{score}}</span>
 								
-										<span {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('comment-mobile', '{{c.id}}', '-1')" class="comment-mobile-{{c.id}}-down mx-0 pl-1 my-0 arrow-down downvote-button comment-{{c.id}}-down {% if voted==-1 %}active{% endif %}">
+										<span {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('comment-mobile', '{{c.id}}', '-1')" class="comment-mobile-{{c.id}}-down mx-0 pl-1 my-0 arrow-down downvote-button comment-{{c.id}}-down {% if voted==-1 %}active{% endif %}">
 										</span>
 								
 									</li>
@@ -520,7 +520,7 @@
 						<input type="hidden" name="formkey" value="{{v|formkey}}"> 
 						<textarea required autocomplete="off" minlength="1" maxlength="10000" name="body" form="reply-to-c_{{c.id}}" data-id="{{c.id}}" class="comment-box form-control rounded" id="reply-form-body-{{c.id}}" rows="3" data-preview="message-reply-{{c.id}}" data-nonce="{{g.nonce}}" data-oninput="markdown(this)"></textarea> 
 						<div class="comment-format" id="comment-format-bar-{{c.id}}"> 
-							<button data-nonce="{{g.nonce}}" data-onclick="loadEmojis('reply-form-body-{{c.id}}')" class="btn btn-secondary m-0 mt-3 mr-1" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>
+							<button role="button" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('reply-form-body-{{c.id}}')" class="btn btn-secondary m-0 mt-3 mr-1" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>
 
 							{% if c.sentto == MODMAIL_ID %}
 								<label class="btn btn-secondary m-0 mt-3" for="file-upload">
@@ -543,8 +543,8 @@
 	</div>
 
 
-<div class="modal fade d-md-none" id="actionsModal-{{c.id}}" tabindex="-1">
-	<div class="modal-dialog modal-dialog-centered">
+<div class="modal fade d-md-none" id="actionsModal-{{c.id}}" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h6 class="modal-title">More options</h6>
@@ -627,8 +627,8 @@
 
 
 {% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION_TOOLS_VISIBLE'] %}
-	<div class="modal fade d-md-none" id="adminModal-{{c.id}}" tabindex="-1">
-		<div class="modal-dialog modal-dialog-centered">
+	<div class="modal fade d-md-none" id="adminModal-{{c.id}}" tabindex="-1" role="dialog">
+		<div class="modal-dialog modal-dialog-centered" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
 					<h6 class="modal-title">Admin options</h6>
@@ -691,8 +691,8 @@
 			{% include "modals/ban.html" %}
 		{% endif %}
 
-<div class="modal fade" id="deleteCommentModal" tabindex="-1">
-	<div class="modal-dialog modal-dialog-centered">
+<div class="modal fade" id="deleteCommentModal" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header d-none d-md-flex">
 				<h5 class="modal-title">Delete comment?</h5>
@@ -720,8 +720,8 @@
 	</div>
 </div>
 
-		<div class="modal fade" id="reportCommentModal" tabindex="-1">
-			<div class="modal-dialog modal-dialog-centered">
+		<div class="modal fade" id="reportCommentModal" tabindex="-1" role="dialog">
+			<div class="modal-dialog modal-dialog-centered" role="document">
 				<div class="modal-content">
 					<div class="modal-header">
 						<h5 class="modal-title">Report <span id="comment-author"></span>'s comment</h5>
diff --git a/files/templates/default.html b/files/templates/default.html
index e0d4d366d..b3401291b 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -57,17 +57,17 @@
 {% block reportCommentModal %}{% endblock %}
 {% block GIFtoast %}{% endblock %}
 {% block GIFpicker %}{% endblock %}
-<div class="toast clipboard" id="toast-success" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast clipboard" id="toast-success" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body text-center">
 		<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
 	</div>
 </div>
-<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body bg-success text-center text-white">
 		<i class="fas fa-comment-alt-smile mr-2"></i><span id="toast-post-success-text">Action successful!</span>
 	</div>
 </div>
-<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body bg-danger text-center text-white">
 		<i class="fas fa-exclamation-circle mr-2"></i><span id="toast-post-error-text">Error, please try again later.</span>
 	</div>
diff --git a/files/templates/email/2fa_remove.html b/files/templates/email/2fa_remove.html
index 86dd82ec8..8367eca62 100644
--- a/files/templates/email/2fa_remove.html
+++ b/files/templates/email/2fa_remove.html
@@ -7,10 +7,10 @@
 {% block content %}
 	<p>We received a request to remove two-factor authentication from your account. In 72 hours, click the link below.</p>
 	<p>If you didn't make this request, change your password and use the Log Out Everywhere feature in your <a href="/settings/security">Security Settings</a> to permanently invalidate the link.</p>
-		<div class="overflow-x-auto"><table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0">
+		<div class="overflow-x-auto"><table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 		<tr>
 			<td align="center">
-				<div class="overflow-x-auto><table width="100%" border="0" cellspacing="0" cellpadding="0">
+				<div class="overflow-x-auto><table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
 					<tr>
 						<td align="center">
 							<a href="{{action_url}}" class="f-fallback button" target="_blank">Remove 2FA</a>
@@ -21,7 +21,7 @@
 		</tr>
 	</table>
 	<p>Please note that {{SITE_NAME}} will never ask you for your email, password, or two-factor token via email, text, or phone.</p>
-	<div class="overflow-x-auto"><table class="body-sub">
+	<div class="overflow-x-auto"><table class="body-sub" role="presentation">
 		<tr>
 			<td>
 				<p class="f-fallback sub">If you're having trouble with the button above, copy and paste the URL below into your web browser.</p>
diff --git a/files/templates/email/default.html b/files/templates/email/default.html
index 3b6495b2e..d2bb03a1b 100644
--- a/files/templates/email/default.html
+++ b/files/templates/email/default.html
@@ -367,10 +367,10 @@
 	</head>
 	<body>
 		<span class="preheader">{% block preheader %}Thanks for joining {{SITE_NAME}}! Please take a sec to verify the email you used to sign up.{% endblock %}</span>
-		<div class="overflow-x-auto"><table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0">
+		<div class="overflow-x-auto"><table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 			<tr>
 				<td align="center">
-					<div class="overflow-x-auto"><table class="email-content" width="100%" cellpadding="0" cellspacing="0">
+					<div class="overflow-x-auto"><table class="email-content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 						<tr>
 							<td class="email-masthead">
 								<a href="/" class="f-fallback email-masthead_name">
@@ -380,7 +380,7 @@
 						</tr>
 												<tr>
 							<td class="email-body" width="100%" cellpadding="0" cellspacing="0">
-								<div class="overflow-x-auto"><table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0">
+								<div class="overflow-x-auto"><table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
 																		<tr>
 										<td class="content-cell">
 											<div class="f-fallback">
diff --git a/files/templates/email/email_change.html b/files/templates/email/email_change.html
index 9a295a7ca..4bb1c11ed 100644
--- a/files/templates/email/email_change.html
+++ b/files/templates/email/email_change.html
@@ -6,10 +6,10 @@
 
 {% block content %}
 												<p>You told us you wanted to change your {{SITE_NAME}} account email. To finish this process, please verify your new email address:</p>
-																								<div class="overflow-x-auto"><table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0">
+																								<div class="overflow-x-auto"><table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 													<tr>
 														<td align="center">
-															<div class="overflow-x-auto><table width="100%" border="0" cellspacing="0" cellpadding="0">
+															<div class="overflow-x-auto><table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
 																<tr>
 																	<td align="center">
 																		<a href="{{action_url}}" class="f-fallback button" target="_blank">Verify email</a>
@@ -20,10 +20,10 @@
 													</tr>
 												</table>
 												<p>For reference, here's your current information:</p>
-												<div class="overflow-x-auto"><table class="attributes" width="100%" cellpadding="0" cellspacing="0">
+												<div class="overflow-x-auto"><table class="attributes" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 													<tr>
 														<td class="attributes_content">
-															<div class="overflow-x-auto><table width="100%" cellpadding="0" cellspacing="0">
+															<div class="overflow-x-auto><table width="100%" cellpadding="0" cellspacing="0" role="presentation">
 																<tr>
 																	<td class="attributes_item">
 																		<span class="f-fallback">
@@ -43,7 +43,7 @@
 													</tr>
 												</table>
 												<p>Please note that {{SITE_NAME}} will never ask you for your email, password, or two-factor token via email, text, or phone.</p>
-												<div class="overflow-x-auto"><table class="body-sub">
+												<div class="overflow-x-auto"><table class="body-sub" role="presentation">
 													<tr>
 														<td>
 															<p class="f-fallback sub">If you're having trouble with the button above, copy and paste the URL below into your web browser.</p>
diff --git a/files/templates/email/email_verify.html b/files/templates/email/email_verify.html
index a642a5464..62fb8ecb8 100644
--- a/files/templates/email/email_verify.html
+++ b/files/templates/email/email_verify.html
@@ -4,10 +4,10 @@
 
 {% block content %}
 												<p>Thanks for joining {{SITE_NAME}}. We're happy to have you on board. To get the most out of {{SITE_NAME}}, please verify your account email:</p>
-																								<div class="overflow-x-auto"><table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0">
+																								<div class="overflow-x-auto"><table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 													<tr>
 														<td align="center">
-															<div class="overflow-x-auto><table width="100%" border="0" cellspacing="0" cellpadding="0">
+															<div class="overflow-x-auto><table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
 																<tr>
 																	<td align="center">
 																		<a href="{{action_url}}" class="f-fallback button" target="_blank">Verify email</a>
@@ -18,10 +18,10 @@
 													</tr>
 												</table>
 												<p>For reference, here's your username.</p>
-												<div class="overflow-x-auto"><table class="attributes" width="100%" cellpadding="0" cellspacing="0">
+												<div class="overflow-x-auto"><table class="attributes" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 													<tr>
 														<td class="attributes_content">
-															<div class="overflow-x-auto><table width="100%" cellpadding="0" cellspacing="0">
+															<div class="overflow-x-auto><table width="100%" cellpadding="0" cellspacing="0" role="presentation">
 																<tr>
 																	<td class="attributes_item">
 																		<span class="f-fallback">
@@ -41,7 +41,7 @@
 													</tr>
 												</table>
 												<p>Please note that {{SITE_NAME}} will never ask you for your email, password, or two-factor token via email, text, or phone.</p>
-																								<div class="overflow-x-auto"><table class="body-sub">
+																								<div class="overflow-x-auto"><table class="body-sub" role="presentation">
 													<tr>
 														<td>
 															<p class="f-fallback sub">If you're having trouble with the button above, copy and paste the URL below into your web browser.</p>
diff --git a/files/templates/email/password_reset.html b/files/templates/email/password_reset.html
index 7d1936f17..b35c8e837 100644
--- a/files/templates/email/password_reset.html
+++ b/files/templates/email/password_reset.html
@@ -5,10 +5,10 @@
 
 {% block content %}
 												<p>To reset your password, click the button below:</p>
-																								<div class="overflow-x-auto"><table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0">
+																								<div class="overflow-x-auto"><table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 													<tr>
 														<td align="center">
-															<div class="overflow-x-auto><table width="100%" border="0" cellspacing="0" cellpadding="0">
+															<div class="overflow-x-auto><table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
 																<tr>
 																	<td align="center">
 																		<a href="{{action_url}}" class="f-fallback button" target="_blank">Reset password</a>
@@ -19,10 +19,10 @@
 													</tr>
 												</table>
 												<p>For reference, here's your login information:</p>
-												<div class="overflow-x-auto"><table class="attributes" width="100%" cellpadding="0" cellspacing="0">
+												<div class="overflow-x-auto"><table class="attributes" width="100%" cellpadding="0" cellspacing="0" role="presentation">
 													<tr>
 														<td class="attributes_content">
-															<div class="overflow-x-auto><table width="100%" cellpadding="0" cellspacing="0">
+															<div class="overflow-x-auto><table width="100%" cellpadding="0" cellspacing="0" role="presentation">
 																<tr>
 																	<td class="attributes_item">
 																		<span class="f-fallback">
@@ -41,7 +41,7 @@
 														</td>
 													</tr>
 												</table>
-												<div class="overflow-x-auto"><table class="body-sub">
+												<div class="overflow-x-auto"><table class="body-sub" role="presentation">
 													<tr>
 														<td>
 															<p class="f-fallback sub">If you're having trouble with the button above, copy and paste the URL below into your web browser.</p>
diff --git a/files/templates/header.html b/files/templates/header.html
index 092f0c5e6..db9fb76ba 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -121,6 +121,7 @@
 			{% endif %}
 
 			<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
+			aria-controls="navbarResponsive">
 			<span class="navbar-toggler-icon {% if v and v.notifications_count %}position-relative{% endif %}"><i class="fas fa-bars align-middle text-gray-500 black"></i>
 			</span>
 		</button>
@@ -192,6 +193,7 @@
 				<li class="nav-item d-flex align-items-center justify-content-center text-center">
 					<div class="dropdown" id="header--dropdown">
 						<a href="{{v.url}}" class="nav-link bg-transparent py-0 pr-0" id="dropdownMenuLink" data-bs-toggle="dropdown"
+						aria-haspopup="true">
 						<div class="d-flex">
 							<div class="profile-pic-35-wrapper">
 								<img loading="lazy" src="{{v.profile_url}}" class="profile-pic-35">
diff --git a/files/templates/log.html b/files/templates/log.html
index b1c3e6d14..473e5561d 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -116,7 +116,7 @@
 	</div>
 </div>
 
-<div class="toast clipboard" id="toast-success" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast clipboard" id="toast-success" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body text-center">
 		<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
 	</div>
diff --git a/files/templates/login/sign_up.html b/files/templates/login/sign_up.html
index 584923ebb..fbdfb3990 100644
--- a/files/templates/login/sign_up.html
+++ b/files/templates/login/sign_up.html
@@ -68,6 +68,7 @@
 	<label for="username-register" class="mt-3">Username</label>
 
 	<input autocomplete="off" class="form-control" id="username-register"
+	aria-describedby="usernameHelpRegister" type="text" name="username" pattern="[a-zA-Z0-9_\-]{3,25}" min="3" max="25" required {% if username %}value="{{username}}"{% endif %}>
 	<small id="usernameHelpRegister"></small>
 
 	<label for="email-register" class="mt-3">Email Address</label>
@@ -75,10 +76,12 @@
 	<small class="d-inline-block text-muted ml-1">(optional)</small>
 
 	<input style="background-color: var(--gray-800)" autocomplete="off" class="form-control" id="email-register"
+	aria-describedby="emailHelpRegister" type="email" pattern='{{EMAIL_REGEX_PATTERN}}' name="email" readonly data-nonce="{{g.nonce}}" {% if email %}value="{{email}}"{% endif %}>
 
 	<label for="password-register" class="mt-3">Password</label>
 
 	<input autocomplete="off" class="form-control" id="password-register"
+	aria-describedby="passwordHelpReigster" type="password" name="password" required>
 	<small id="passwordHelpRegister" class="form-text font-weight-bold text-muted d-none mt-1">Minimum of 8
 		characters
 	required.</small>
@@ -88,6 +91,7 @@
 	<label for="password_confirm" class="mt-3">Confirm Password</label>
 
 	<input autocomplete="off" class="form-control" id="password_confirm"
+	aria-describedby="passwordConfirmHelp" type="password" name="password_confirm"
 	required>
 	<div class="custom-control custom-checkbox mt-4">
 		<input autocomplete="off" type="checkbox" class="custom-control-input" id="termsCheck" required>
diff --git a/files/templates/login/sign_up_failed_ref.html b/files/templates/login/sign_up_failed_ref.html
index 717fb89bb..cf13de9b0 100644
--- a/files/templates/login/sign_up_failed_ref.html
+++ b/files/templates/login/sign_up_failed_ref.html
@@ -18,7 +18,7 @@
 </div>
 {% endblock %}
 {% block scripts %}		
-<div class="toast clipboard" id="toast-success" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast clipboard" id="toast-success" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 <div class="toast-body text-center">
 	<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
 </div>
diff --git a/files/templates/lottery.html b/files/templates/lottery.html
index c1aee1ec5..12388e0dc 100644
--- a/files/templates/lottery.html
+++ b/files/templates/lottery.html
@@ -68,6 +68,7 @@
 				data-bs-placement="bottom"
 				height="13"
 				src="{{'coins.webp' | asset_siteimg}}"
+				aria-label="coins"
 				title="Coins"
 				style="display: none; position: relative; top: -2px"
 			>
@@ -104,6 +105,7 @@
 				value="1"
 				min="1"
 				step="1"
+				aria-label="Quantity"
 				name="ticketPurchaseQuantity"
 				type="number"
 				style="flex: 1; max-width: 100px; text-align: center"
@@ -127,6 +129,7 @@
 			data-bs-placement="bottom"
 			height="13"
 			src="{{'coins.webp' | asset_siteimg}}"
+			aria-label="coins"
 			title="Coins"
 		>
 
@@ -148,6 +151,9 @@
 		z-index: 1000;
 		height: auto !important;
 		"
+		role="alert"
+		aria-live="assertive"
+		aria-atomic="true"
 		data-bs-animation="true"
 		data-bs-autohide="true"
 		data-bs-delay="5000"
@@ -172,6 +178,9 @@
 		z-index: 1000;
 		height: auto !important;
 		"
+		role="alert"
+		aria-live="assertive"
+		aria-atomic="true"
 		data-bs-animation="true"
 		data-bs-autohide="true"
 		data-bs-delay="5000"
diff --git a/files/templates/modals/award.html b/files/templates/modals/award.html
index c5ea11d2b..f21fab96a 100644
--- a/files/templates/modals/award.html
+++ b/files/templates/modals/award.html
@@ -1,7 +1,7 @@
 <script defer src="{{'js/award_modal.js' | asset}}"></script>
 
-<div class="modal fade" id="awardModal" tabindex="-1">
-	<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered awardmodal pt-5">
+<div class="modal fade" id="awardModal" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered awardmodal pt-5" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h5 class="modal-title">Give Award</h5>
@@ -32,12 +32,12 @@
 		</div>
 	</div>
 
-	<div class="toast" id="toast-post-success2" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+	<div class="toast" id="toast-post-success2" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 		<div class="toast-body bg-success text-center text-white">
 			<i class="fas fa-comment-alt-smile mr-2"></i><span id="toast-post-success-text2">Action successful!</span>
 		</div>
 	</div>
-	<div class="toast" id="toast-post-error2" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+	<div class="toast" id="toast-post-error2" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 		<div class="toast-body bg-danger text-center text-white">
 			<i class="fas fa-exclamation-circle mr-2"></i><span id="toast-post-error-text2">Error, please try again later.</span>
 		</div>
diff --git a/files/templates/modals/ban.html b/files/templates/modals/ban.html
index 6c728a5da..ae0e4baf8 100644
--- a/files/templates/modals/ban.html
+++ b/files/templates/modals/ban.html
@@ -1,5 +1,5 @@
-<div class="modal fade" id="banModal" tabindex="-1">
-	<div class="modal-dialog modal-dialog-centered">
+<div class="modal fade" id="banModal" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header pt-3">
 				<h5 id="banModalTitle"></h5>
@@ -34,8 +34,8 @@
 	</div>
 </div>
 
-<div class="modal fade" id="chudModal" tabindex="-1">
-	<div class="modal-dialog modal-dialog-centered">
+<div class="modal fade" id="chudModal" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header pt-3">
 				<h5 id="chudModalTitle"></h5>
diff --git a/files/templates/modals/delete_post.html b/files/templates/modals/delete_post.html
index f6b9fb641..414223554 100644
--- a/files/templates/modals/delete_post.html
+++ b/files/templates/modals/delete_post.html
@@ -1,5 +1,5 @@
-<div class="modal fade" id="deletePostModal" tabindex="-1">
-	<div class="modal-dialog modal-dialog-centered">
+<div class="modal fade" id="deletePostModal" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header d-none d-md-flex">
 				<h5 class="modal-title">Delete post?</h5>
diff --git a/files/templates/modals/emoji.html b/files/templates/modals/emoji.html
index d1027104c..0557ba00f 100644
--- a/files/templates/modals/emoji.html
+++ b/files/templates/modals/emoji.html
@@ -1,6 +1,6 @@
 <div id="form" class="d-none"></div>
-<div class="modal fade" id="emojiModal" tabindex="-1">
-	<div id="emojiModalInternalDivIDK" class="modal-dialog modal-dialog-scrollable modal-dialog-centered emoji-modal">
+<div class="modal fade" id="emojiModal" tabindex="-1" role="dialog">
+	<div id="emojiModalInternalDivIDK" class="modal-dialog modal-dialog-scrollable modal-dialog-centered emoji-modal" role="document">
 		<div class="modal-content" id="emojiTabs">
 			<div class="modal-header">
 				<div id="emoji-modal-tabs-container">
diff --git a/files/templates/modals/expanded_image.html b/files/templates/modals/expanded_image.html
index d66178805..fdd5a8c1e 100644
--- a/files/templates/modals/expanded_image.html
+++ b/files/templates/modals/expanded_image.html
@@ -1,5 +1,5 @@
-<div class="modal desktop-expanded-image-modal" id="expandImageModal" tabindex="-1">
-	<div class="modal-dialog modal-xl modal-dialog-centered mx-auto expandedimage">
+<div class="modal desktop-expanded-image-modal" id="expandImageModal" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-xl modal-dialog-centered mx-auto expandedimage" role="document">
 		<div class="modal-content bg-transparent shadow-none">
 			<div class="modal-body text-center p-0">
 				<div class="d-inline-block position-relative">
diff --git a/files/templates/modals/gif.html b/files/templates/modals/gif.html
index 484b53eff..366ba9685 100644
--- a/files/templates/modals/gif.html
+++ b/files/templates/modals/gif.html
@@ -1,5 +1,5 @@
-<div class="modal fade" id="gifModal" tabindex="-1">
-	<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-5" style="max-width:100% !important">
+<div class="modal fade" id="gifModal" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-5" style="max-width:100% !important" role="document">
 		<div class="modal-content">
 			<div class="modal-header border-bottom-0 shadow-md p-3">
 				<div class="form-group d-flex align-items-center w-100 mb-0">
diff --git a/files/templates/modals/report_post.html b/files/templates/modals/report_post.html
index 0bd5d136c..a86ffd626 100644
--- a/files/templates/modals/report_post.html
+++ b/files/templates/modals/report_post.html
@@ -1,5 +1,5 @@
-<div class="modal fade" id="reportPostModal" tabindex="-1">
-	<div class="modal-dialog modal-dialog-centered">
+<div class="modal fade" id="reportPostModal" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h5 class="modal-title">Report post</h5>
diff --git a/files/templates/notifications.html b/files/templates/notifications.html
index c93d94571..c7fa22cab 100644
--- a/files/templates/notifications.html
+++ b/files/templates/notifications.html
@@ -101,7 +101,7 @@
 				<div class="p-3">There's nothing here right now.</div>
 			{% endfor %}
 		</div>
-		<div class="toast clipboard" id="toast-success" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+		<div class="toast clipboard" id="toast-success" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 			<div class="toast-body text-center">
 				<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
 			</div>
diff --git a/files/templates/popover.html b/files/templates/popover.html
index 1c33b4034..ba22967ff 100644
--- a/files/templates/popover.html
+++ b/files/templates/popover.html
@@ -1,5 +1,5 @@
 <div style="display:none" id="popover">
-	<div class="popover-user-profile">
+	<div class="popover-user-profile" role="tooltip">
 		<img loading="lazy" class="pop-banner w-100 h-64 object-cover">
 		<div class="d-flex align-items-end px-3 mt-n6 mb-3">
 			<div class="profile-pic-75-wrapper">
diff --git a/files/templates/post_admin_actions_mobile.html b/files/templates/post_admin_actions_mobile.html
index a0e8bb6a0..d144b29dc 100644
--- a/files/templates/post_admin_actions_mobile.html
+++ b/files/templates/post_admin_actions_mobile.html
@@ -1,5 +1,5 @@
-<div class="modal fade d-md-none" id="adminModal-{{p.id}}" tabindex="-1">
-	<div class="modal-dialog modal-dialog-centered">
+<div class="modal fade d-md-none" id="adminModal-{{p.id}}" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header p-3">
 				<h6 class="col modal-title text-center">Admin options</h6>
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 54a3a8062..11107a904 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -40,18 +40,18 @@
 </div>
 </div>
 {% block clipboard %}
-<div class="toast clipboard" id="toast-success" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast clipboard" id="toast-success" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body text-center">
 		<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
 	</div>
 </div>
 {% endblock %}
-<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body bg-success text-center text-white">
 		<i class="fas fa-comment-alt-smile mr-2"></i><span id="toast-post-success-text">Action successful!</span>
 	</div>
 </div>
-<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body bg-danger text-center text-white">
 		<i class="fas fa-exclamation-circle mr-2"></i><span id="toast-post-error-text">Error, please try again later.</span>
 	</div>
diff --git a/files/templates/settings/apps.html b/files/templates/settings/apps.html
index 0b7f5dbe7..fe3493436 100644
--- a/files/templates/settings/apps.html
+++ b/files/templates/settings/apps.html
@@ -128,7 +128,7 @@
 </div>
 {% endblock %}
 {% block clipboard %}
-<div class="toast clipboard" id="toast-success" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast clipboard" id="toast-success" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body text-center">
 		<i class="fas fa-check-circle text-success mr-2"></i>Token copied to clipboard
 	</div>
diff --git a/files/templates/settings/common.html b/files/templates/settings/common.html
index e2014e1ff..c3ec46030 100644
--- a/files/templates/settings/common.html
+++ b/files/templates/settings/common.html
@@ -60,7 +60,7 @@
 				<input minlength={{minlength}} maxlength={{maxlength}} pattern="{{pattern}}" autocomplete="off" id="{{id}}-body" type="text" name="{{form_name}}" class="form-control" placeholder='{{placeholder_text}}' value="{% if contents %}{{contents}}{% endif %}" {% if disabled %}disabled{% endif %}>
 				<div class="d-flex mt-2">
 					{% if show_marseys %}
-						<div><i class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('{{id}}-body')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></i></div>
+						<div role="button"><i class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('{{id}}-body')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></i></div>
 					{% endif %}
 					<small class="ml-3">{{below_text}}</small>
 					<input autocomplete="off" class="btn btn-primary ml-auto" id="{{id}}-save" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="{{button_text}}" {% if disabled %}disabled{% endif %}>
diff --git a/files/templates/settings/personal.html b/files/templates/settings/personal.html
index aeea1b0b6..54062cfcc 100644
--- a/files/templates/settings/personal.html
+++ b/files/templates/settings/personal.html
@@ -274,8 +274,8 @@
 
 {% macro permanent_filter_modal(id, form_action, field, friendly_name, badge_name) %}
 {% if FEATURES['USERS_PERMANENT_WORD_FILTERS'] -%}
-<div class="modal fade" id="modal-{{id}}" tabindex="-1">
-	<div class="modal-dialog modal-dialog-centered">
+<div class="modal fade" id="modal-{{id}}" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<form class="m-auto" action="{{form_action}}" id="{{id}}-form" method="post">
 			<div class="modal-content">
 				<div class="modal-header">
diff --git a/files/templates/settings/security.html b/files/templates/settings/security.html
index 251fc2396..761489783 100644
--- a/files/templates/settings/security.html
+++ b/files/templates/settings/security.html
@@ -16,6 +16,7 @@
 							<label for="new-email" class="w-lg-25">Email</label>
 							<div class="w-lg-100">
 								<input autocomplete="off" class="form-control" id="new_email" {% if v.email %}placeholder="{{v.email}}"{% else %}placeholder="Your email"{% endif %}
+								aria-describedby="new_email" type="email" pattern='{{EMAIL_REGEX_PATTERN}}' name="new_email" required>
 								{% if v.email and not v.is_activated %}
 									<div class="text-danger text-small mt-1" id="email-verify-text">Email not verified. You will not be able to recover your account with this email until you verify it. <u><button type="button" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/verify_email');emailVerifyText()"class="text-primary font-weight-bold ml-1">Verify now.</button></u></div>
 								{% elif not v.email %}
@@ -180,8 +181,8 @@
 </div>
 </div>
 
-<div class="modal fade" id="2faModal" tabindex="-1">
-	<div class="modal-dialog modal-dialog-centered">
+<div class="modal fade" id="2faModal" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h5 class="modal-title">
@@ -215,7 +216,7 @@
 						<input autocomplete="off" type="password" class="form-control mb-2" id="2fa_input_password" name="password" data-nonce="{{g.nonce}}" data-undisable_element="toggle2faButton" required>
 						{% set action = "Enable" %}
 					{% else %}
-						<div class="alert alert-warning">
+						<div class="alert alert-warning" role="alert">
 							<i class="fas fa-info-circle"></i>
 							To disable two-step login, please enter your {{SITE_NAME}} account password and the 6-digit code generated in your authentication app. If you no longer have your two-step device, <a href="/lost_2fa">click here</a>.
 						</div>
@@ -237,8 +238,8 @@
 	</div>
 </div>
 
-<div class="modal fade" id="blockmodal" tabindex="-1">
-	<div class="modal-dialog modal-dialog-centered">
+<div class="modal fade" id="blockmodal" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h5 class="modal-title">Block user</h5>
@@ -258,7 +259,7 @@
 	</div>
 </div>
 
-<div class="toast error" id="toast-exile-error" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast error" id="toast-exile-error" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body text-center">
 		<i class="fas fa-exclamation-circle text-danger mr-2"></i><span id="toast-error-message">Error. Please try again.</span>
 	</div>
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index d2126eaf5..9d4428b31 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -79,24 +79,24 @@
  </div>
 
 
- <div class="toast clipboard" id="toast-clipboard-success" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+ <div class="toast clipboard" id="toast-clipboard-success" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body text-center">
 		<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
 	</div>
 </div>
 
-<div class="toast clipboard" id="toast-clipboard-error" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast clipboard" id="toast-clipboard-error" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body text-center">
 		<i class="fas fa-exclamation-circle mr-2"></i>Unable to copy link
 	</div>
 </div>
 
-<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body bg-success text-center text-white">
 		<i class="fas fa-comment-alt-smile mr-2"></i><span id="toast-post-success-text">Action successful!</span>
 	</div>
 </div>
-<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body bg-danger text-center text-white">
 		<i class="fas fa-exclamation-circle mr-2"></i><span id="toast-post-error-text">Error, please try again later.</span>
 	</div>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 6975acf80..b6a35e881 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -32,8 +32,8 @@
 {% block actionsModal %}
 
 {% if v %}
-	<div class="modal fade d-md-none" id="actionsModal" tabindex="-1">
-		<div class="modal-dialog modal-dialog-centered">
+	<div class="modal fade d-md-none" id="actionsModal" tabindex="-1" role="dialog">
+		<div class="modal-dialog modal-dialog-centered" role="document">
 			<div class="modal-content">
 				<div class="modal-header p-3">
 					<h6 class="col modal-title text-center">More options</h6>
@@ -181,7 +181,7 @@
 
 									<div class="comment-format">
 										<button type="button" class="format btn btn-secondary"><span class="font-weight-bolder text-uppercase" data-nonce="{{g.nonce}}" data-onclick="getGifs('post-edit-box-{{p.id}}')" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add GIF">GIF</span></button>
-										<button data-nonce="{{g.nonce}}" data-onclick="loadEmojis('post-edit-box-{{p.id}}')" class="format btn btn-secondary" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>	
+										<button role="button" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('post-edit-box-{{p.id}}')" class="format btn btn-secondary" role="button" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>	
 
 										<label class="format btn btn-secondary m-0 {% if v %}d-inline-block{% else %}d-none{% endif %}" for="file-upload-edit-{{p.id}}">
 											<div id="filename-show-edit-{{p.id}}"><i class="fas fa-file"></i></div>
@@ -232,19 +232,19 @@
 					</div>
 					{% if v %}
 					<div id="voting" class="voting d-mob-none mb-auto">
-						<div tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '1')" class="post-{{p.id}}-up mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
+						<div tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '1')" class="post-{{p.id}}-up mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
 
 						<span class="post-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}" data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"style="cursor: default">{{score}}</span>
-						<div {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
+						<div {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
 					</div>
 
 					{% else %}
 
 					<div id="voting" class="voting d-mob-none mb-auto">
-						<div tabindex="0" class="post-{{p.id}}-up arrow-up mx-auto" data-href="/login?redirect={{request.full_path | urlencode}}">
+						<div tabindex="0" role="button" class="post-{{p.id}}-up arrow-up mx-auto" data-href="/login?redirect={{request.full_path | urlencode}}">
 						</div>
 						<span class="post-{{p.id}}-score-none score text-muted{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"{% endif %}style="cursor: default">{{score}}</span>
-						<div {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down arrow-down mx-auto" data-href="/login?redirect={{request.full_path | urlencode}}"></div>
+						<div {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down arrow-down mx-auto" data-href="/login?redirect={{request.full_path | urlencode}}"></div>
 					</div>
 					{% endif %}
 				</div>
@@ -277,7 +277,7 @@
 				{% endif %}
 				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}">
 					{% if v %}
-						<span tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '1')" class="post-mobile-{{p.id}}-up mx-0 pr-1 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}">
+						<span tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '1')" class="post-mobile-{{p.id}}-up mx-0 pr-1 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}">
 						</span>
 					{% else %}
 						<span tabindex="0" class="arrow-{{p.id}}-mobile-up mx-0 pr-1 arrow-mobile-up" data-href="/login?redirect={{request.full_path | urlencode}}">
@@ -288,7 +288,7 @@
 					<span class="post-mobile-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}" data-bs-toggle="tooltip" data-bs-placement="top" title="+{{ups}} | -{{downs}}"style="cursor: default">{{score}}</span>
 
 					{% if v %}
-						<span {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '-1')" class="post-mobile-{{p.id}}-down mx-0 pl-1 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></span>
+						<span {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '-1')" class="post-mobile-{{p.id}}-down mx-0 pl-1 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></span>
 					{% else %}
 						<span {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" class="arrow-{{p.id}}-mobile-down arrow-mobile-down mx-0 pl-1 my-0" data-href="/login?redirect={{request.full_path | urlencode}}">
 							<i class="fas fa-arrow-alt-down mx-0"></i>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 8751da828..4e0795f4b 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -42,26 +42,26 @@
 	<div class="d-flex flex-row-reverse flex-md-row flex-nowrap" style="align-items:flex-start">
 		<div class="voting my-2 d-none d-md-flex pr-2">
 			{% if v and request.path.startswith('/@') and v.admin_level < PERMS['VIEW_VOTE_BUTTONS_ON_USER_PAGE'] %}
-				<div tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '1')" class="post-{{p.id}}-up mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% else %}d-none{% endif %}"></div>
+				<div tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '1')" class="post-{{p.id}}-up mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% else %}d-none{% endif %}"></div>
 
 				<span class="post-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"{% endif %}style="cursor: default">{{score}}</span>
 
-				<div tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% else %}d-none{% endif %}"></div>
+				<div tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% else %}d-none{% endif %}"></div>
 			{% elif v %}
 
-				<div tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '1')" class="post-{{p.id}}-up mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
+				<div tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '1')" class="post-{{p.id}}-up mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
 
 				<span class="post-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"{% endif %}style="cursor: default">{{score}}</span>
 
-				<div {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
+				<div {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
 
 			{% else %}
 
-				<div tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '1')" class="post-{{p.id}}-up mx-auto arrow-up" data-href="/login?redirect={{request.full_path | urlencode}}"></div>
+				<div tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '1')" class="post-{{p.id}}-up mx-auto arrow-up" data-href="/login?redirect={{request.full_path | urlencode}}"></div>
 
 				<span class="post-{{p.id}}-score-none score{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"{% endif %}style="cursor: default">{{score}}</span>
 
-				<div {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down text-muted mx-auto arrow-down" data-href="/login?redirect={{request.full_path | urlencode}}"></div>
+				<div {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down text-muted mx-auto arrow-down" data-href="/login?redirect={{request.full_path | urlencode}}"></div>
 
 			{% endif %}
 
@@ -159,20 +159,20 @@
 			{% if v and request.path.startswith('/@') and v.admin_level < PERMS['VIEW_VOTE_BUTTONS_ON_USER_PAGE'] %}
 				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
 
-					<span tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '1')" class="post-mobile-{{p.id}}-up mx-0 pr-1 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% else %}d-none{% endif %}"></span>
+					<span tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '1')" class="post-mobile-{{p.id}}-up mx-0 pr-1 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% else %}d-none{% endif %}"></span>
 
 					<span class="post-mobile-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="top" title="+{{ups}} | -{{downs}}"{% endif %}style="cursor: default">{{score}}</span>
 
-					<span tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '-1')" class="post-mobile-{{p.id}}-down mx-0 pl-1 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% else %}d-none{% endif %}"></span>
+					<span tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '-1')" class="post-mobile-{{p.id}}-down mx-0 pl-1 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% else %}d-none{% endif %}"></span>
 				</li>
 			{% elif v %}
 				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
 
-					<span tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '1')" class="post-mobile-{{p.id}}-up mx-0 pr-1 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></span>
+					<span tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '1')" class="post-mobile-{{p.id}}-up mx-0 pr-1 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></span>
 
 					<span class="post-mobile-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="top" title="+{{ups}} | -{{downs}}"{% endif %}style="cursor: default">{{score}}</span>
 
-					<span {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '-1')" class="post-mobile-{{p.id}}-down mx-0 pl-1 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></span>
+					<span {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" role="button" data-nonce="{{g.nonce}}" data-onclick="vote('post-mobile', '{{p.id}}', '-1')" class="post-mobile-{{p.id}}-down mx-0 pl-1 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></span>
 
 				</li>
 			{% else %}
@@ -193,8 +193,8 @@
 </div>
 
 {% if v %}
-	<div class="modal fade d-md-none" id="actionsModal-{{p.id}}" tabindex="-1">
-		<div class="modal-dialog modal-dialog-centered">
+	<div class="modal fade d-md-none" id="actionsModal-{{p.id}}" tabindex="-1" role="dialog">
+		<div class="modal-dialog modal-dialog-centered" role="document">
 			<div class="modal-content">
 				<div class="modal-header p-3">
 					<h6 class="col modal-title text-center">More options</h6>
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 34476d9e9..1f1486376 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -31,7 +31,7 @@
 												</div>
 												<label class='mt-4' for="title">Post Title</label>
 												<input autocomplete="off" class="form-control allow-emojis" id="post-title" type="text" name="title" placeholder="Required" value="{{title}}" minlength="1" maxlength="500" required data-nonce="{{g.nonce}}" data-oninput="checkForRequired();savetext()">
-												<button data-nonce="{{g.nonce}}" data-onclick="loadEmojis('post-title')" class="btn btn-secondary format d-inline-block m-0" id="emoji-reply-btn-2" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>												
+												<button role="button" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('post-title')" class="btn btn-secondary format d-inline-block m-0" id="emoji-reply-btn-2" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>												
 												<div id="urlblock">
 														<label for="URL" class="mt-3">URL</label>
 														<input autocomplete="off" class="form-control" id="post-url" name="url" type="url" placeholder="Optional if you have text." value="{{request.values.get('url','')}}" required data-nonce="{{g.nonce}}" data-oninput="checkForRequired();hide_image();savetext();checkRepost();autoSuggestTitle()">
@@ -59,7 +59,7 @@
 												</div>
 												<small class="btn btn-secondary format d-inline-block m-0"><span class="font-weight-bolder text-uppercase" data-nonce="{{g.nonce}}" data-onclick="getGifs('post-text')" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add GIF">GIF</span></small>
 												&nbsp;
-												<button data-nonce="{{g.nonce}}" data-onclick="loadEmojis('post-text')" class="btn btn-secondary format d-inline-block m-0" id="emoji-reply-btn" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>			
+												<button role="button" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('post-text')" class="btn btn-secondary format d-inline-block m-0" id="emoji-reply-btn" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>			
 												<label class="format btn btn-secondary m-0 ml-2 {% if v %}d-inline-block{% else %}d-none{% endif %}" for="file-upload-submit">
 													<div id="filename-show-submit"><i class="fas fa-file"></i></div>
 													<input autocomplete="off" id="file-upload-submit" multiple="multiple" accept="image/*, video/*, audio/*" type="file" name="file" {% if g.is_tor %}disabled{% endif %} data-nonce="{{g.nonce}}" data-onchange="changename('filename-show-submit','file-upload-submit');checkForRequired()" hidden>
diff --git a/files/templates/transfers.html b/files/templates/transfers.html
index 46b88f630..0eb35c78f 100644
--- a/files/templates/transfers.html
+++ b/files/templates/transfers.html
@@ -31,7 +31,7 @@
 		{% endif %}
 	</ul>
 </nav>
-<div class="toast clipboard" id="toast-success" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+<div class="toast clipboard" id="toast-success" role="alert" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
 	<div class="toast-body text-center">
 		<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
 	</div>
diff --git a/files/templates/userpage/admintools.html b/files/templates/userpage/admintools.html
index eae22265d..57d4a0810 100644
--- a/files/templates/userpage/admintools.html
+++ b/files/templates/userpage/admintools.html
@@ -30,7 +30,7 @@
 							<input type="hidden" name="formkey" value="{{v|formkey}}">
 							<input maxlength=100 autocomplete="off" id="customtitlebody-{{deviceType}}" type="text" name="title" class="form-control" placeholder='Enter a flair here' value="{% if u.customtitleplain %}{{u.customtitleplain}}{% endif %}">
 							<div class="d-flex mt-2">
-								<div class="format"><i class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('customtitlebody-{{deviceType}}')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></i></div>
+								<div class="format" role="button"><i class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('customtitlebody-{{deviceType}}')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></i></div>
 								<div class="custom-control custom-checkbox ml-3">
 									<input autocomplete="off" type="checkbox" class="custom-control-input" id="locked" name="locked" {% if u.flairchanged %}checked{% endif %}>
 									<label class="custom-control-label" for="locked">locked</label>
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index 6c1c40b14..8c32f32df 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -124,7 +124,7 @@
 					<span id="gif-reply-btn-{{target_fullname}}" class="font-weight-bolder text-uppercase" data-nonce="{{g.nonce}}" data-onclick="getGifs('reply-form-body-{{target_fullname}}')" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add GIF">GIF</span>
 				</button>
 				&nbsp;
-				<button style="padding: 0.55rem" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('reply-form-body-{{target_fullname}}')" class="btn btn-secondary format d-inline-block m-0" id="emoji-reply-btn-{{target_fullname}}" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>
+				<button role="button" style="padding: 0.55rem" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('reply-form-body-{{target_fullname}}')" class="btn btn-secondary format d-inline-block m-0" id="emoji-reply-btn-{{target_fullname}}" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"><i class="fas fa-smile-beam"></i></button>
 				&nbsp;
 				{% if allow_file_upload %}
 					<label style="padding: 0.55rem" class="format btn btn-secondary m-0 {% if v %}d-inline-block{% else %}d-none{% endif %}" for="file-upload-reply-{{target_fullname}}">
@@ -184,7 +184,7 @@
 {% endmacro %}
 
 {% macro alert(msg, error=false) %}
-<div class="alert {% if error %}alert-danger{% else %}alert-success{% endif %} alert-dismissible fade show mb-3 mt-4">
+<div class="alert {% if error %}alert-danger{% else %}alert-success{% endif %} alert-dismissible fade show mb-3 mt-4" role="alert">
 	<i class="fas {% if error %}fa-exclamation-circle{% else %}fa-check-circle{% endif %} my-auto"></i>
 	<span>{{msg}}</span>
 	<button type="button" class="close" data-bs-dismiss="alert">