diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 177a7945c2..fdfcd4bde6 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -101,16 +101,17 @@ class Nav
 		$tpl = Renderer::getMarkupTemplate('nav.tpl');
 
 		$nav .= Renderer::replaceMacros($tpl, [
-			'$sitelocation' => $nav_info['sitelocation'],
-			'$nav'          => $nav_info['nav'],
-			'$banner'       => $nav_info['banner'],
+			'$sitelocation'       => $nav_info['sitelocation'],
+			'$nav'                => $nav_info['nav'],
+			'$banner'             => $nav_info['banner'],
 			'$emptynotifications' => $this->l10n->t('Nothing new here'),
-			'$userinfo'     => $nav_info['userinfo'],
-			'$sel'          => self::$selected,
-			'$apps'         => $this->getAppMenu(),
-			'$home'         => $this->l10n->t('Go back'),
-			'$clear_notifs' => $this->l10n->t('Clear notifications'),
-			'$search_hint'  => $this->l10n->t('@name, !group, #tags, content')
+			'$userinfo'           => $nav_info['userinfo'],
+			'$sel'                => self::$selected,
+			'$apps'               => $this->getAppMenu(),
+			'$home'               => $this->l10n->t('Home'),
+			'$skip'               => $this->l10n->t('Skip to main content'),
+			'$clear_notifs'       => $this->l10n->t('Clear notifications'),
+			'$search_hint'        => $this->l10n->t('@name, !group, #tags, content')
 		]);
 
 		Hook::callAll('page_header', $nav);
@@ -220,7 +221,7 @@ class Nav
 			$nav['usermenu'][] = ['notes/', $this->l10n->t('Personal notes'), '', $this->l10n->t('Your personal notes')];
 
 			// user info
-			$contact = $this->database->selectFirst('contact', ['id', 'url', 'avatar', 'micro', 'name', 'nick', 'baseurl', 'updated'], ['uid' => $this->session->getLocalUserId(), 'self' => true]);
+			$contact  = $this->database->selectFirst('contact', ['id', 'url', 'avatar', 'micro', 'name', 'nick', 'baseurl', 'updated'], ['uid' => $this->session->getLocalUserId(), 'self' => true]);
 			$userinfo = [
 				'icon' => Contact::getMicro($contact),
 				'name' => $contact['name'],
@@ -295,16 +296,16 @@ class Nav
 
 			// Don't show notifications for public communities
 			if ($this->session->get('page_flags', '') != User::PAGE_FLAGS_COMMUNITY) {
-				$nav['introductions'] = ['notifications/intros', $this->l10n->t('Introductions'), '', $this->l10n->t('Friend Requests')];
-				$nav['notifications'] = ['notifications',	$this->l10n->t('Notifications'), '', $this->l10n->t('Notifications')];
-				$nav['notifications']['all'] = ['notifications/system', $this->l10n->t('See all notifications'), '', ''];
+				$nav['introductions']         = ['notifications/intros', $this->l10n->t('Introductions'), '', $this->l10n->t('Friend Requests')];
+				$nav['notifications']         = ['notifications',	$this->l10n->t('Notifications'), '', $this->l10n->t('Notifications')];
+				$nav['notifications']['all']  = ['notifications/system', $this->l10n->t('See all notifications'), '', ''];
 				$nav['notifications']['mark'] = ['', $this->l10n->t('Mark as seen'), '', $this->l10n->t('Mark all system notifications as seen')];
 			}
 
-			$nav['messages'] = ['message', $this->l10n->t('Messages'), '', $this->l10n->t('Private mail')];
-			$nav['messages']['inbox'] = ['message', $this->l10n->t('Inbox'), '', $this->l10n->t('Inbox')];
+			$nav['messages']           = ['message', $this->l10n->t('Messages'), '', $this->l10n->t('Private mail')];
+			$nav['messages']['inbox']  = ['message', $this->l10n->t('Inbox'), '', $this->l10n->t('Inbox')];
 			$nav['messages']['outbox'] = ['message/sent', $this->l10n->t('Outbox'), '', $this->l10n->t('Outbox')];
-			$nav['messages']['new'] = ['message/new', $this->l10n->t('New Message'), '', $this->l10n->t('New Message')];
+			$nav['messages']['new']    = ['message/new', $this->l10n->t('New Message'), '', $this->l10n->t('New Message')];
 
 			if (User::hasIdentities($this->session->getSubManagedUserId() ?: $this->session->getLocalUserId())) {
 				$nav['delegation'] = ['delegation', $this->l10n->t('Accounts'), '', $this->l10n->t('Manage other pages')];
diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index a9f86dc68a..0d1e5864e8 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2025.02-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-03 21:49+0000\n"
+"POT-Creation-Date: 2025-02-04 04:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -210,7 +210,7 @@ msgstr ""
 msgid "Your password has been changed at %s"
 msgstr ""
 
-#: mod/message.php:33 mod/message.php:115 src/Content/Nav.php:307
+#: mod/message.php:33 mod/message.php:115 src/Content/Nav.php:308
 msgid "New Message"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Discard"
 msgstr ""
 
-#: mod/message.php:122 src/Content/Nav.php:304 view/theme/frio/theme.php:230
+#: mod/message.php:122 src/Content/Nav.php:305 view/theme/frio/theme.php:230
 msgid "Messages"
 msgstr ""
 
@@ -748,7 +748,7 @@ msgid "toggle mobile"
 msgstr ""
 
 #: src/App/Page.php:359 src/Module/Admin/Logs/View.php:92
-#: view/theme/frio/php/minimal.php:39 view/theme/frio/php/standard.php:139
+#: view/theme/frio/php/minimal.php:39 view/theme/frio/php/standard.php:138
 msgid "Close"
 msgstr ""
 
@@ -1712,7 +1712,7 @@ msgid "Display posts that have been created by accounts of the selected circle."
 msgstr ""
 
 #: src/Content/Feature.php:116 src/Content/GroupManager.php:128
-#: src/Content/Nav.php:264 src/Content/Text/HTML.php:868
+#: src/Content/Nav.php:265 src/Content/Text/HTML.php:868
 #: src/Content/Widget.php:555 src/Model/User.php:1393
 msgid "Groups"
 msgstr ""
@@ -1936,75 +1936,79 @@ msgstr ""
 msgid "Nothing new here"
 msgstr ""
 
-#: src/Content/Nav.php:111 src/Module/Special/HTTPException.php:64
-msgid "Go back"
+#: src/Content/Nav.php:111 src/Content/Nav.php:238 src/Content/Nav.php:295
+msgid "Home"
 msgstr ""
 
 #: src/Content/Nav.php:112
+msgid "Skip to main content"
+msgstr ""
+
+#: src/Content/Nav.php:113
 msgid "Clear notifications"
 msgstr ""
 
-#: src/Content/Nav.php:113 src/Content/Text/HTML.php:855
+#: src/Content/Nav.php:114 src/Content/Text/HTML.php:855
 msgid "@name, !group, #tags, content"
 msgstr ""
 
-#: src/Content/Nav.php:208 src/Module/Security/Login.php:146
+#: src/Content/Nav.php:209 src/Module/Security/Login.php:146
 msgid "Logout"
 msgstr ""
 
-#: src/Content/Nav.php:208
+#: src/Content/Nav.php:209
 msgid "End this session"
 msgstr ""
 
-#: src/Content/Nav.php:210 src/Module/Bookmarklet.php:30
+#: src/Content/Nav.php:211 src/Module/Bookmarklet.php:30
 #: src/Module/Security/Login.php:147
 msgid "Login"
 msgstr ""
 
-#: src/Content/Nav.php:210
+#: src/Content/Nav.php:211
 msgid "Sign in"
 msgstr ""
 
-#: src/Content/Nav.php:215 src/Module/BaseProfile.php:42
+#: src/Content/Nav.php:216 src/Module/BaseProfile.php:42
 #: src/Module/Contact.php:492
 msgid "Conversations"
 msgstr ""
 
-#: src/Content/Nav.php:215
+#: src/Content/Nav.php:216
 msgid "Conversations you started"
 msgstr ""
 
-#: src/Content/Nav.php:216 src/Module/BaseProfile.php:34
+#: src/Content/Nav.php:217 src/Module/BaseProfile.php:34
 #: src/Module/BaseSettings.php:86 src/Module/Contact.php:484
 #: src/Module/Contact/Profile.php:431 src/Module/Profile/Profile.php:259
 #: src/Module/Welcome.php:43 view/theme/frio/theme.php:219
 msgid "Profile"
 msgstr ""
 
-#: src/Content/Nav.php:216 view/theme/frio/theme.php:219
+#: src/Content/Nav.php:217 view/theme/frio/theme.php:219
 msgid "Your profile page"
 msgstr ""
 
-#: src/Content/Nav.php:217 src/Module/BaseProfile.php:50
+#: src/Content/Nav.php:218 src/Module/BaseProfile.php:50
 #: src/Module/Media/Photo/Browser.php:62 view/theme/frio/theme.php:223
 msgid "Photos"
 msgstr ""
 
-#: src/Content/Nav.php:217 view/theme/frio/theme.php:223
+#: src/Content/Nav.php:218 view/theme/frio/theme.php:223
 msgid "Your photos"
 msgstr ""
 
-#: src/Content/Nav.php:218 src/Module/BaseProfile.php:58
+#: src/Content/Nav.php:219 src/Module/BaseProfile.php:58
 #: src/Module/BaseProfile.php:61 src/Module/Contact.php:508
 #: view/theme/frio/theme.php:224
 msgid "Media"
 msgstr ""
 
-#: src/Content/Nav.php:218 view/theme/frio/theme.php:224
+#: src/Content/Nav.php:219 view/theme/frio/theme.php:224
 msgid "Your postings with media"
 msgstr ""
 
-#: src/Content/Nav.php:219 src/Content/Nav.php:279
+#: src/Content/Nav.php:220 src/Content/Nav.php:280
 #: src/Module/BaseProfile.php:70 src/Module/BaseProfile.php:73
 #: src/Module/BaseProfile.php:81 src/Module/BaseProfile.php:84
 #: src/Module/Settings/Display.php:324 view/theme/frio/theme.php:225
@@ -2012,36 +2016,32 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
-#: src/Content/Nav.php:219 view/theme/frio/theme.php:225
+#: src/Content/Nav.php:220 view/theme/frio/theme.php:225
 msgid "Your calendar"
 msgstr ""
 
-#: src/Content/Nav.php:220
+#: src/Content/Nav.php:221
 msgid "Personal notes"
 msgstr ""
 
-#: src/Content/Nav.php:220
+#: src/Content/Nav.php:221
 msgid "Your personal notes"
 msgstr ""
 
-#: src/Content/Nav.php:237 src/Content/Nav.php:294
-msgid "Home"
-msgstr ""
-
-#: src/Content/Nav.php:237 src/Module/Settings/OAuth.php:59
+#: src/Content/Nav.php:238 src/Module/Settings/OAuth.php:59
 msgid "Home Page"
 msgstr ""
 
-#: src/Content/Nav.php:241 src/Module/Register.php:161
+#: src/Content/Nav.php:242 src/Module/Register.php:161
 #: src/Module/Security/Login.php:113
 msgid "Register"
 msgstr ""
 
-#: src/Content/Nav.php:241
+#: src/Content/Nav.php:242
 msgid "Create an account"
 msgstr ""
 
-#: src/Content/Nav.php:247 src/Module/Help.php:53
+#: src/Content/Nav.php:248 src/Module/Help.php:53
 #: src/Module/Settings/TwoFactor/AppSpecific.php:118
 #: src/Module/Settings/TwoFactor/Index.php:125
 #: src/Module/Settings/TwoFactor/Recovery.php:96
@@ -2049,158 +2049,158 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/Content/Nav.php:247
+#: src/Content/Nav.php:248
 msgid "Help and documentation"
 msgstr ""
 
-#: src/Content/Nav.php:251
+#: src/Content/Nav.php:252
 msgid "Apps"
 msgstr ""
 
-#: src/Content/Nav.php:251
+#: src/Content/Nav.php:252
 msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: src/Content/Nav.php:255 src/Content/Text/HTML.php:853
+#: src/Content/Nav.php:256 src/Content/Text/HTML.php:853
 #: src/Module/Admin/Logs/View.php:74 src/Module/Search/Index.php:99
 msgid "Search"
 msgstr ""
 
-#: src/Content/Nav.php:255
+#: src/Content/Nav.php:256
 msgid "Search site content"
 msgstr ""
 
-#: src/Content/Nav.php:258 src/Content/Text/HTML.php:862
+#: src/Content/Nav.php:259 src/Content/Text/HTML.php:862
 msgid "Full Text"
 msgstr ""
 
-#: src/Content/Nav.php:259 src/Content/Text/HTML.php:863
+#: src/Content/Nav.php:260 src/Content/Text/HTML.php:863
 #: src/Content/Widget/TagCloud.php:54
 msgid "Tags"
 msgstr ""
 
-#: src/Content/Nav.php:260 src/Content/Nav.php:315
+#: src/Content/Nav.php:261 src/Content/Nav.php:316
 #: src/Content/Text/HTML.php:864 src/Module/BaseProfile.php:112
 #: src/Module/BaseProfile.php:115 src/Module/Contact.php:406
 #: src/Module/Contact.php:516 view/theme/frio/theme.php:232
 msgid "Contacts"
 msgstr ""
 
-#: src/Content/Nav.php:275
+#: src/Content/Nav.php:276
 msgid "Community"
 msgstr ""
 
-#: src/Content/Nav.php:275
+#: src/Content/Nav.php:276
 msgid "Conversations on this and other servers"
 msgstr ""
 
-#: src/Content/Nav.php:282
+#: src/Content/Nav.php:283
 msgid "Directory"
 msgstr ""
 
-#: src/Content/Nav.php:282
+#: src/Content/Nav.php:283
 msgid "People directory"
 msgstr ""
 
-#: src/Content/Nav.php:284 src/Module/BaseAdmin.php:71
+#: src/Content/Nav.php:285 src/Module/BaseAdmin.php:71
 #: src/Module/BaseModeration.php:97
 msgid "Information"
 msgstr ""
 
-#: src/Content/Nav.php:284
+#: src/Content/Nav.php:285
 msgid "Information about this friendica instance"
 msgstr ""
 
-#: src/Content/Nav.php:287 src/Module/Admin/Tos.php:64
+#: src/Content/Nav.php:288 src/Module/Admin/Tos.php:64
 #: src/Module/BaseAdmin.php:81 src/Module/Register.php:169
 #: src/Module/Tos.php:87
 msgid "Terms of Service"
 msgstr ""
 
-#: src/Content/Nav.php:287
+#: src/Content/Nav.php:288
 msgid "Terms of Service of this Friendica instance"
 msgstr ""
 
-#: src/Content/Nav.php:292 view/theme/frio/theme.php:228
+#: src/Content/Nav.php:293 view/theme/frio/theme.php:228
 msgid "Network"
 msgstr ""
 
-#: src/Content/Nav.php:292 view/theme/frio/theme.php:228
+#: src/Content/Nav.php:293 view/theme/frio/theme.php:228
 msgid "Conversations from your friends"
 msgstr ""
 
-#: src/Content/Nav.php:294 view/theme/frio/theme.php:218
+#: src/Content/Nav.php:295 view/theme/frio/theme.php:218
 msgid "Your posts and conversations"
 msgstr ""
 
-#: src/Content/Nav.php:298
+#: src/Content/Nav.php:299
 msgid "Introductions"
 msgstr ""
 
-#: src/Content/Nav.php:298
+#: src/Content/Nav.php:299
 msgid "Friend Requests"
 msgstr ""
 
-#: src/Content/Nav.php:299 src/Module/BaseNotifications.php:134
+#: src/Content/Nav.php:300 src/Module/BaseNotifications.php:134
 #: src/Module/Notifications/Introductions.php:61
 msgid "Notifications"
 msgstr ""
 
-#: src/Content/Nav.php:300
+#: src/Content/Nav.php:301
 msgid "See all notifications"
 msgstr ""
 
-#: src/Content/Nav.php:301 src/Module/Settings/Connectors.php:226
+#: src/Content/Nav.php:302 src/Module/Settings/Connectors.php:226
 msgid "Mark as seen"
 msgstr ""
 
-#: src/Content/Nav.php:301
+#: src/Content/Nav.php:302
 msgid "Mark all system notifications as seen"
 msgstr ""
 
-#: src/Content/Nav.php:304 view/theme/frio/theme.php:230
+#: src/Content/Nav.php:305 view/theme/frio/theme.php:230
 msgid "Private mail"
 msgstr ""
 
-#: src/Content/Nav.php:305
+#: src/Content/Nav.php:306
 msgid "Inbox"
 msgstr ""
 
-#: src/Content/Nav.php:306
+#: src/Content/Nav.php:307
 msgid "Outbox"
 msgstr ""
 
-#: src/Content/Nav.php:310
+#: src/Content/Nav.php:311
 msgid "Accounts"
 msgstr ""
 
-#: src/Content/Nav.php:310
+#: src/Content/Nav.php:311
 msgid "Manage other pages"
 msgstr ""
 
-#: src/Content/Nav.php:313 src/Module/Admin/Addons/Details.php:98
+#: src/Content/Nav.php:314 src/Module/Admin/Addons/Details.php:98
 #: src/Module/Admin/Themes/Details.php:85 src/Module/BaseSettings.php:177
 #: src/Module/Welcome.php:38 view/theme/frio/theme.php:231
 msgid "Settings"
 msgstr ""
 
-#: src/Content/Nav.php:313 view/theme/frio/theme.php:231
+#: src/Content/Nav.php:314 view/theme/frio/theme.php:231
 msgid "Account settings"
 msgstr ""
 
-#: src/Content/Nav.php:315 view/theme/frio/theme.php:232
+#: src/Content/Nav.php:316 view/theme/frio/theme.php:232
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: src/Content/Nav.php:320 src/Module/BaseAdmin.php:105
+#: src/Content/Nav.php:321 src/Module/BaseAdmin.php:105
 msgid "Admin"
 msgstr ""
 
-#: src/Content/Nav.php:320
+#: src/Content/Nav.php:321
 msgid "Site setup and configuration"
 msgstr ""
 
-#: src/Content/Nav.php:321 src/Module/BaseModeration.php:117
+#: src/Content/Nav.php:322 src/Module/BaseModeration.php:117
 #: src/Module/Moderation/Blocklist/Contact.php:98
 #: src/Module/Moderation/Blocklist/Server/Add.php:110
 #: src/Module/Moderation/Blocklist/Server/Import.php:105
@@ -2214,15 +2214,15 @@ msgstr ""
 msgid "Moderation"
 msgstr ""
 
-#: src/Content/Nav.php:321
+#: src/Content/Nav.php:322
 msgid "Content and user moderation"
 msgstr ""
 
-#: src/Content/Nav.php:324
+#: src/Content/Nav.php:325
 msgid "Navigation"
 msgstr ""
 
-#: src/Content/Nav.php:324
+#: src/Content/Nav.php:325
 msgid "Site map"
 msgstr ""
 
@@ -10756,6 +10756,10 @@ msgstr ""
 msgid "Possible reasons include:"
 msgstr ""
 
+#: src/Module/Special/HTTPException.php:64
+msgid "Go back"
+msgstr ""
+
 #: src/Module/Special/HTTPException.php:65
 msgid "Stack trace:"
 msgstr ""
@@ -12035,11 +12039,7 @@ msgstr ""
 msgid "Repeat image to fill the screen."
 msgstr ""
 
-#: view/theme/frio/php/default.php:71 view/theme/frio/php/standard.php:34
-msgid "Skip to main content"
-msgstr ""
-
-#: view/theme/frio/php/default.php:144 view/theme/frio/php/standard.php:85
+#: view/theme/frio/php/default.php:143 view/theme/frio/php/standard.php:84
 msgid "Back to top"
 msgstr ""
 
diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl
index 4c7bdebfdb..3f28ec3f43 100644
--- a/view/templates/item/compose.tpl
+++ b/view/templates/item/compose.tpl
@@ -65,7 +65,7 @@
 			</div>
 			<p class="comment-edit-submit-wrapper">
 {{if $type == 'post'}}
-				<span role="presentation" class="form-inline">
+				<span class="form-inline">
 					<button type="button" name="permissions" class="btn btn-sm template-icon" id="toggle-permissions" title="{{$l10n.toggle_permissions_tooltip}}" onclick="togglePermissions()" style="margin-right: 10px;" tabindex="5">
 						<i class="fa fa-ellipsis-h"></i> {{$l10n.toggle_permissions}}
 					</button>
@@ -81,10 +81,10 @@
 					</button>
 				</span>
 {{/if}}
-				<span role="presentation" id="profile-rotator-wrapper">
-					<img role="presentation" id="profile-rotator" src="images/rotator.gif" alt="{{$l10n.wait}}" title="{{$l10n.wait}}" style="display: none;" />
+				<span id="profile-rotator-wrapper">
+					<img id="profile-rotator" src="images/rotator.gif" alt="{{$l10n.wait}}" title="{{$l10n.wait}}" style="display: none;" />
 				</span>
-				<span role="presentation" id="character-counter" class="grey text-info"></span>
+				<span id="character-counter" class="grey text-info"></span>
 				<button type="button" class="btn btn-default" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" tabindex="8"><i class="fa fa-eye"></i> {{$l10n.preview}}</button>
 				<button type="submit" class="btn btn-primary" id="comment-edit-submit-{{$id}}" name="submit" tabindex="9"><i class="fa fa-envelope"></i> {{$l10n.submit}}</button>
 			</p>
diff --git a/view/theme/frio/js/mod_events.js b/view/theme/frio/js/mod_events.js
index bae61a0759..736c4d201b 100644
--- a/view/theme/frio/js/mod_events.js
+++ b/view/theme/frio/js/mod_events.js
@@ -218,7 +218,7 @@ function eventHoverBodyTemplate() {
 // The template for presenting the event location in the event hover-card
 function eventHoverLocationTemplate() {
 	var template =
-		'<span role="presentation" aria-hidden="true"> · </span>\
+		'<span aria-hidden="true"> · </span>\
 			<span class="event-card-location"> {0}</span></div>';
 	return template;
 }
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index 450d9aedc6..bfceee0f66 100644
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -68,7 +68,6 @@ echo '<meta name="theme-color" content="' . $nav_bg . '" />';
 	</head>
 
 	<body id="top" class="mod-<?php echo $page['module'] . " " . $is_singleuser_class . " " . $view_mode_class;?>">
-		<a href="<?php echo DI::args()->getCommand(); ?>/#content" class="sr-only sr-only-focusable"><?php echo DI::l10n()->t('Skip to main content'); ?></a>
 <?php
 	if (!empty($page['nav']) && !$minimal) {
 		echo str_replace(
@@ -115,7 +114,7 @@ if ($minimal) {
 						echo '
 					</aside>
 
-					<div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content">
+					<div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content" tabindex="0">
 						<section class="sectiontop ';
 						echo $page['section'] ?? '';
 						echo '-content-wrapper">';
diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php
index 52f41eb0f4..2e67828ea1 100644
--- a/view/theme/frio/php/standard.php
+++ b/view/theme/frio/php/standard.php
@@ -31,19 +31,18 @@ $frio = 'view/theme/frio';
 <?php if($_SERVER['REQUEST_URI'] == '/') {
 	header('Location: /login');
 } ?>
-<a href="<?php echo DI::args()->getCommand(); ?>/#content" class="sr-only sr-only-focusable"><?php echo DI::l10n()->t('Skip to main content'); ?></a>
 <?php
-	if(!empty($page['nav'])) {
-		echo	str_replace(
-			'~config.sitename~',
-			DI::config()->get('config', 'sitename'),
-			str_replace(
-				'~system.banner~',
-				DI::config()->get('system', 'banner'),
-				$page['nav']
-			)
-		);
-	};
+if(!empty($page['nav'])) {
+	echo	str_replace(
+		'~config.sitename~',
+		DI::config()->get('config', 'sitename'),
+		str_replace(
+			'~system.banner~',
+			DI::config()->get('system', 'banner'),
+			$page['nav']
+		)
+	);
+};
 ?>
 	<main>
 
@@ -65,7 +64,7 @@ include('includes/photo_side.php');
 echo'
 					</aside>
 
-					<div class="col-lg-8 col-md-8 col-sm-12 col-xs-12" id="content">
+					<div class="col-lg-8 col-md-8 col-sm-12 col-xs-12" id="content" tabindex="0">
 						<section class="sectiontop">
 								<div class="panel ' . DI::args()->get(0, 'generic') . '-content-wrapper">
 									<div class="panel-body">';
diff --git a/view/theme/frio/templates/admin/aside.tpl b/view/theme/frio/templates/admin/aside.tpl
index ba4798589d..4159076904 100644
--- a/view/theme/frio/templates/admin/aside.tpl
+++ b/view/theme/frio/templates/admin/aside.tpl
@@ -18,15 +18,15 @@
 </script>
 
 {{foreach $subpages as $page}}
-<div class="widget">
+<nav class="widget">
 	<h3>{{$page.0}}</h3>
-	<ul role="menu">
+	<ul>
 		{{foreach $page.1 as $item}}
-		<li role="menuitem" class="{{$item.2}}">
+		<li class="{{$item.2}}">
 			<a href="{{$item.0}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>
 				{{$item.1}}
 				{{if $name == "users"}}
-				 <span id="pending-update" class="badge pull-right"></span>
+				<span id="pending-update" class="badge pull-right"></span>
 				{{/if}}
 			</a>
 		</li>
@@ -42,11 +42,11 @@
 		</li>
 	</ul>
 	{{/if}}
-</div>
+</nav>
 {{/foreach}}
 
 {{if $admin.addons_admin}}
-<div class="widget">
+<nav class="widget">
 	<h3>{{$plugadmtxt}}</h3>
 	<ul role="menu">
 		{{foreach $admin.addons_admin as $name => $item}}
@@ -57,6 +57,6 @@
 		</li>
 		{{/foreach}}
 	</ul>
-</div>
+</nav>
 {{/if}}
 
diff --git a/view/theme/frio/templates/admin/logs/view.tpl b/view/theme/frio/templates/admin/logs/view.tpl
index b959a8291e..2ef960d7af 100644
--- a/view/theme/frio/templates/admin/logs/view.tpl
+++ b/view/theme/frio/templates/admin/logs/view.tpl
@@ -91,7 +91,7 @@
 </div>
 
 <div id="logdetail" class="modal fade" tabindex="-1" role="dialog">
-	<div class="modal-dialog modal-lg" style="width:90%" role="document">
+	<div class="modal-dialog modal-lg" style="width:90%">
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
diff --git a/view/theme/frio/templates/calendar/calendar.tpl b/view/theme/frio/templates/calendar/calendar.tpl
index c6578bcf5c..06535790a5 100644
--- a/view/theme/frio/templates/calendar/calendar.tpl
+++ b/view/theme/frio/templates/calendar/calendar.tpl
@@ -27,16 +27,16 @@
 						<i class="fa fa-angle-down" aria-hidden="true"></i> {{$view}}
 					</button>
 					<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="event-calendar-views">
-						<li role="presentation">
+						<li>
 							<button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'month');$('#events-calendar').fullCalendar('option', {contentHeight: '', aspectRatio: 1});">{{$month}}</button>
 						</li>
-						<li role="presentation">
+						<li>
 							<button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'agendaWeek');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$week}}</button>
 						</li>
-						<li role="presentation">
+						<li>
 							<button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'agendaDay');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$day}}</button>
 						</li>
-						<li role="presentation">
+						<li>
 							<button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'listMonth');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$list}}</button>
 						</li>
 					</ul>
diff --git a/view/theme/frio/templates/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl
index fa28c938ec..f1d2d6959e 100644
--- a/view/theme/frio/templates/common_tabs.tpl
+++ b/view/theme/frio/templates/common_tabs.tpl
@@ -4,14 +4,14 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<div class="tabbar-wrapper">
+	<div class="tabbar-wrapper" role="menubar" >
 	{{* Tab navigation bar for tablets and computer *}}
-	<ul role="menubar" class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs">
+	<ul class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs">
 		{{* The normal tabbar *}}
 		<li>
-			<ul class="tabs flex-nav" role="menu">
+			<ul class="tabs flex-nav">
 				{{foreach $tabs as $tab}}
-					<li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+					<li id="{{$tab.id}}" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
 						<a role="menuitem" class="tabbar-wrapper__link" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}" {{/if}}
 							{{if $tab.title}} title="{{$tab.title}}" {{/if}}>
 							{{$tab.label}}
@@ -25,7 +25,7 @@
 			doesn't fit in the available space. This is done through flexMenu.js *}}
 		<li class="pull-right">
 			<ul class="tabs tabs-extended" role="menu">
-				<li role="presentation" class="dropdown flex-target">
+				<li class="dropdown flex-target">
 					<button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown"
 						aria-expanded="false" title="{{$more}}">
 						<i class="fa fa-chevron-down" aria-hidden="true"></i>
@@ -42,7 +42,7 @@
 			<ul class="tabs" role="menu">
 				{{foreach $tabs as $tab}}
 					{{if $tab.sel}}
-						<li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+						<li id="{{$tab.id}}-xs" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
 							<a role="menuitem" class="tabbar-wrapper__link" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}" {{/if}}>
 								{{$tab.label}}
 							</a>
@@ -64,7 +64,7 @@
 					</button>
 					<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenuTools">
 						{{foreach $exttabs as $tab}}
-							<li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+							<li id="{{$tab.id}}-xs" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
 								<a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}" {{/if}}>
 									{{$tab.label}}
 								</a>
diff --git a/view/theme/frio/templates/contact/entry.tpl b/view/theme/frio/templates/contact/entry.tpl
index e69f448793..93b3599d27 100644
--- a/view/theme/frio/templates/contact/entry.tpl
+++ b/view/theme/frio/templates/contact/entry.tpl
@@ -34,11 +34,11 @@
 				<ul class="contact-photo-menu menu-popup dropdown-menu hidden-lg hidden-md hidden-sm" id="contact-photo-menu-{{$contact.id}}" role="menu" aria-labelledby="contact-photo-menu-{{$contact.id}}">
 					{{foreach $contact.photo_menu as $c}}
 					{{if $c.2}}
-					<li role="presentation"><a role="menuitem" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+					<li><a role="menuitem" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
 					{{elseif $c.3}}
-					<li role="presentation"><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{{$c.1}}')">{{$c.0}}</button></li>
+					<li><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{{$c.1}}')">{{$c.0}}</button></li>
 					{{else}}
-					<li role="presentation"><a role="menuitem" href="{{$c.1}}">{{$c.0}}</a></li>
+					<li><a role="menuitem" href="{{$c.1}}">{{$c.0}}</a></li>
 					{{/if}}
 					{{/foreach}}
 				</ul>
diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index 85af4058e1..5753a1e229 100644
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -25,18 +25,18 @@
 						</button>
 
 						<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="contact-edit-actions-button" aria-haspopup="true" id="contact-actions-menu">
-							{{if $contact_actions.follow}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.follow.url}}" title="{{$contact_actions.follow.title}}">{{$contact_actions.follow.label}}</a></li>{{/if}}
-							{{if $contact_actions.unfollow}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.unfollow.url}}" title="{{$contact_actions.unfollow.title}}">{{$contact_actions.unfollow.label}}</a></li>{{/if}}
-							{{if $lblsuggest}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
-							{{if $poll_enabled}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
-							{{if $contact_actions.updateprofile}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
+							{{if $contact_actions.follow}}<li><a role="menuitem" href="{{$contact_actions.follow.url}}" title="{{$contact_actions.follow.title}}">{{$contact_actions.follow.label}}</a></li>{{/if}}
+							{{if $contact_actions.unfollow}}<li><a role="menuitem" href="{{$contact_actions.unfollow.url}}" title="{{$contact_actions.unfollow.title}}">{{$contact_actions.unfollow.label}}</a></li>{{/if}}
+							{{if $lblsuggest}}<li><a role="menuitem" href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
+							{{if $poll_enabled}}<li><a role="menuitem" href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
+							{{if $contact_actions.updateprofile}}<li><a role="menuitem" href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
 							{{if $lblsuggest || $poll_enabled || $contact_actions.updateprofile}}
-							<li role="presentation" class="divider"></li>
+							<li class="divider"></li>
 							{{/if}}
-							<li role="presentation"><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
-							<li role="presentation"><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
-							<li role="presentation"><a role="menuitem" href="{{$contact_actions.collapse.url}}" title="{{$contact_actions.collapse.title}}">{{$contact_actions.collapse.label}}</a></li>
-							{{if $contact_actions.revoke_follow.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.revoke_follow.title}}" onclick="addToModal('{{$contact_actions.revoke_follow.url}}');">{{$contact_actions.revoke_follow.label}}</button></li>{{/if}}
+							<li><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
+							<li><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
+							<li><a role="menuitem" href="{{$contact_actions.collapse.url}}" title="{{$contact_actions.collapse.title}}">{{$contact_actions.collapse.label}}</a></li>
+							{{if $contact_actions.revoke_follow.url}}<li><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.revoke_follow.title}}" onclick="addToModal('{{$contact_actions.revoke_follow.url}}');">{{$contact_actions.revoke_follow.label}}</button></li>{{/if}}
 						</ul>
 					</li>
 				</ul>
diff --git a/view/theme/frio/templates/event_stream_item.tpl b/view/theme/frio/templates/event_stream_item.tpl
index 3a1b4e6e1d..f8b3e85321 100644
--- a/view/theme/frio/templates/event_stream_item.tpl
+++ b/view/theme/frio/templates/event_stream_item.tpl
@@ -28,7 +28,7 @@
 							{{if $finish}} - <span class="event-end dtend" title="{{$dtend_title}}">{{if $same_date}}{{$end_time}}{{else}}{{$end_short}}{{/if}}</span>{{/if}}
 						</span>
 						{{if $location.name}}
-						<span role="presentation" aria-hidden="true"> · </span>
+						<span aria-hidden="true"> · </span>
 						<span class="event-location event-card-location">{{$location.name}}</span>
 						{{/if}}
 					</div>
diff --git a/view/theme/frio/templates/generic_links_widget.tpl b/view/theme/frio/templates/generic_links_widget.tpl
index 750e4cedc2..b0168ffd10 100644
--- a/view/theme/frio/templates/generic_links_widget.tpl
+++ b/view/theme/frio/templates/generic_links_widget.tpl
@@ -5,14 +5,14 @@
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
 
-<div class="widget{{if $class}} {{$class}}{{/if}}">
+<nav class="widget{{if $class}} {{$class}}{{/if}}">
 	{{if $title}}<h3>{{$title}}</h3>{{/if}}
 	{{if $desc}}<div class="desc">{{$desc nofilter}}</div>{{/if}}
 
-	<ul role="menu">
+	<ul>
 		{{foreach $items as $item}}
-			<li role="menuitem" class="{{if $item.selected}}selected{{/if}}"><a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>{{$item.label}}</a></li>
+			<li class="{{if $item.selected}}selected{{/if}}"><a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>{{$item.label}}</a></li>
 		{{/foreach}}
 	</ul>
 
-</div>
+</nav>
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index e49e55ad07..b2ef49ba91 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -20,14 +20,14 @@
 			<ul class="nav nav-tabs hidden-xs jot-nav" role="tablist" data-tabs="tabs">
 				{{* Mark the first list entry as active because it is the first which is active after opening
 					the modal. Changing of the activity status is done by js in jot.tpl-header *}}
-				<li class="active" role="presentation">
+				<li class="active">
 					<a href="#profile-jot-wrapper" class="jot-text-lnk jot-nav-lnk" id="jot-text-lnk" role="tab" aria-controls="profile-jot-wrapper">
 						<i class="fa fa-file-text-o" aria-hidden="true"></i>
 						{{$message}}
 					</a>
 				</li>
 				{{if $acl}}
-				<li role="presentation">
+				<li>
 					<a href="#profile-jot-acl-wrapper" class="jot-perms-lnk jot-nav-lnk" id="jot-perms-lnk" role="tab" aria-controls="profile-jot-acl-wrapper">
 						<i class="fa fa-shield" aria-hidden="true"></i>
 						{{$shortpermset}}
@@ -35,14 +35,14 @@
 				</li>
 				{{/if}}
 				{{if $preview}}
-				<li role="presentation">
+				<li>
 					<a href="#jot-preview-content" class="jot-preview-lnk jot-nav-lnk" id="jot-preview-lnk" role="tab" aria-controls="jot-preview-content">
 						<i class="fa fa-eye" aria-hidden="true"></i>
 						{{$preview}}
 					</a>
 				</li>
 				{{/if}}
-				<li role="presentation">
+				<li>
 					<a href="#jot-fbrowser-wrapper" class="jot-browser-lnk jot-nav-lnk" id="jot-browser-link" role="tab" aria-controls="jot-fbrowser-wrapper">
 						<i class="fa fa-picture-o" aria-hidden="true"></i>
 						{{$browser}}
@@ -56,20 +56,20 @@
 				<ul class="dropdown-menu nav nav-pills" aria-label="submenu">
 					{{* mark the first list entry as active because it is the first which is active after opening
 					the modal. Changing of the activity status is done by js in jot.tpl-header *}}
-					<li role="presentation" style="display: none;">
+					<li style="display: none;">
 						<button class="jot-text-lnk btn-link jot-nav-lnk jot-nav-lnk-mobile" id="jot-text-lnk-mobile" aria-controls="profile-jot-wrapper" role="menuitem">{{$message}}</button>
 					</li>
 					{{if $acl}}
-					<li role="presentation">
+					<li>
 						<button class="jot-perms-lnk btn-link jot-nav-lnk jot-nav-lnk-mobile" id="jot-perms-lnk-mobile" aria-controls="profile-jot-acl-wrapper" role="menuitem">{{$shortpermset}}</button>
 					</li>
 					{{/if}}
 					{{if $preview}}
-					<li role="presentation">
+					<li>
 						<button class="jot-preview-lnk btn-link jot-nav-lnk jot-nav-lnk-mobile" id="jot-preview-lnk-mobile" aria-controls="jot-preview-content" role="menuitem">{{$preview}}</button>
 					</li>
 					{{/if}}
-					<li role="presentation">
+					<li>
 						<button class="jot-browser-lnk-mobile btn-link jot-nav-lnk jot-nav-lnk-mobile" id="jot-browser-lnk-mobile" aria-controls="jot-fbrowser-wrapper" role="menuitem">{{$browser}}</button>
 					</li>
 				</ul>
@@ -110,29 +110,29 @@
 					</div>
 
 					<ul id="profile-jot-submit-wrapper" class="jothidden nav nav-pills">
-						<li role="presentation"><button type="button" class="hidden-xs btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormattingToPost('u');"><i class="fa fa-underline"></i></button></li>
-						<li role="presentation"><button type="button" class="hidden-xs btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormattingToPost('i');"><i class="fa fa-italic"></i></button></li>
-						<li role="presentation"><button type="button" class="hidden-xs btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormattingToPost('b');"><i class="fa fa-bold"></i></button></li>
-						<li role="presentation"><button type="button" class="hidden-xs btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormattingToPost('quote');"><i class="fa fa-quote-left"></i></button></li>
-						<li role="presentation"><button type="button" class="hidden-xs btn-link icon emojis" style="cursor: pointer;" aria-label="{{$edemojis}}" title="{{$edemojis}}"><i class="fa fa-smile-o"></i></button></li>
-						<li role="presentation"><button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormattingToPost('url');"><i class="fa fa-link"></i></button></li>
-						<li role="presentation"><button type="button" class="btn-link" id="profile-attach"  ondragenter="return linkDropper(event);" ondragover="return linkDropper(event);" ondrop="linkDrop(event);" onclick="jotGetLink();" title="{{$edattach}}"><i class="fa fa-paperclip"></i></button></li>
-						<li role="presentation"><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker" aria-hidden="true"></i></button></li>
-						<li role="presentation"><button type="button" class="hidden-xs btn-link icon underline" style="cursor: pointer;" aria-label="{{$contentwarn}}" title="{{$contentwarn}}" onclick="insertFormattingToPost('abstract');"><i class="fa fa-eye"></i></button></li>
+						<li><button type="button" class="hidden-xs btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormattingToPost('u');"><i class="fa fa-underline"></i></button></li>
+						<li><button type="button" class="hidden-xs btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormattingToPost('i');"><i class="fa fa-italic"></i></button></li>
+						<li><button type="button" class="hidden-xs btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormattingToPost('b');"><i class="fa fa-bold"></i></button></li>
+						<li><button type="button" class="hidden-xs btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormattingToPost('quote');"><i class="fa fa-quote-left"></i></button></li>
+						<li><button type="button" class="hidden-xs btn-link icon emojis" style="cursor: pointer;" aria-label="{{$edemojis}}" title="{{$edemojis}}"><i class="fa fa-smile-o"></i></button></li>
+						<li><button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormattingToPost('url');"><i class="fa fa-link"></i></button></li>
+						<li><button type="button" class="btn-link" id="profile-attach"  ondragenter="return linkDropper(event);" ondragover="return linkDropper(event);" ondrop="linkDrop(event);" onclick="jotGetLink();" title="{{$edattach}}"><i class="fa fa-paperclip"></i></button></li>
+						<li><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker" aria-hidden="true"></i></button></li>
+						<li><button type="button" class="hidden-xs btn-link icon underline" style="cursor: pointer;" aria-label="{{$contentwarn}}" title="{{$contentwarn}}" onclick="insertFormattingToPost('abstract');"><i class="fa fa-eye"></i></button></li>
 						<!-- TODO: waiting for a better placement
 						<li><button type="button" class="btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
 						-->
 
-						<li role="presentation" class="pull-right">
+						<li class="pull-right">
 							<button class="btn btn-primary" type="submit" id="profile-jot-submit" name="submit" data-loading-text="{{$loading}}">
 								<i class="fa fa-paper-plane fa-fw" aria-hidden="true"></i> {{$share}}
 							</button>
 						</li>
 						<li id="character-counter" class="grey jothidden text-info pull-right"></li>
-						<li role="presentation" id="profile-rotator-wrapper" class="pull-right" style="display: {{$visitor}};">
-							<img role="presentation" id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+						<li id="profile-rotator-wrapper" class="pull-right" style="display: {{$visitor}};">
+							<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 						</li>
-						<li role="presentation" id="profile-jot-plugin-wrapper">
+						<li id="profile-jot-plugin-wrapper">
 							{{$jotplugins nofilter}}
 						</li>
 					</ul>
@@ -149,7 +149,7 @@
 
 				<div id="jot-preview-share" class="minimize" aria-labelledby="jot-preview-lnk" role="tabpanel" aria-hidden="true">
 					<ul id="profile-jot-preview-submit-wrapper" class="jothidden nav nav-pills">
-						<li role="presentation" class="pull-right">
+						<li class="pull-right">
 							<button class="btn btn-primary" type="submit" id="profile-jot-preview-submit" name="submit" data-loading-text="{{$loading}}">
 								<i class="fa fa-paper-plane fa-fw" aria-hidden="true"></i> {{$share}}
 							</button>
diff --git a/view/theme/frio/templates/media/browser.tpl b/view/theme/frio/templates/media/browser.tpl
index 8ddc9bb6bc..366bbc8944 100644
--- a/view/theme/frio/templates/media/browser.tpl
+++ b/view/theme/frio/templates/media/browser.tpl
@@ -16,7 +16,7 @@
 		{{* The breadcrumb navigation *}}
 		<ol class="path breadcrumb" aria-label="Breadcrumb" role="menu">
 		{{foreach $path as $folder => $name}}
-			<li role="presentation">
+			<li>
 				<button type="button" class="btn btn-link" data-folder="{{$folder}}" role="menuitem">{{$name}}</button>
 			</li>
 		{{/foreach}}
@@ -36,15 +36,15 @@
 
 			{{* List of photo albums *}}
 			{{if $folders }}
-			<div class="folders media-left" role="navigation" aria-label="Album Navigation">
+			<nav class="folders media-left" aria-label="Album Navigation">
 				<ul role="menu">
 					{{foreach $folders as $folder}}
-					<li role="presentation">
-						<button class="btn btn-default" type="button" data-folder="{{$folder}}" role="menuitem">{{$folder}}</button>
+					<li>
+						<button type="button" data-folder="{{$folder}}" role="menuitem">{{$folder}}</button>
 					</li>
 					{{/foreach}}
 				</ul>
-			</div>
+			</nav>
 			{{/if}}
 
 			{{* The main content (images or files) *}}
diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index 2569e95be3..0f2c30e2f3 100644
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -9,29 +9,29 @@
 	<header>
 		{{* {{$langselector}} *}}
 
-		<div id="site-location">{{$sitelocation}}</div>
+		<div id="site-location" aria-hidden="true">{{$sitelocation}}</div>
 		<div id="banner" class="hidden-sm hidden-xs">
 			{{* show on remote/visitor connections another logo which symbols that fact*}}
 			{{if $nav.remote}}
-				<a href="{{$baseurl}}">
+				<a href="{{$baseurl}}" aria-hidden="true">
 					<div id="remote-logo-img" aria-label="{{$home}}"></div>
 				</a>
 			{{else}}
 				{{* #logo-img is the placeholder to insert a mask (friendica logo) into this div
 				For Firefox we have to call the paths of the mask (look at the bottom of this file).
 				Because for FF we need relative paths we apply them with js after the page is loaded (look at theme.js *}}
-				<a href="{{$baseurl}}">
+				<a href="{{$baseurl}}" aria-hidden="true">
 					<div id="logo-img" aria-label="{{$home}}"></div>
 				</a>
 			{{/if}}
 		</div>
 	</header>
-	<nav id="topbar-first" class="topbar">
+	<nav id="topbar-first" class="topbar" role="menubar">
 		<div class="container">
 			<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 no-padding">
 				<!-- div for navbar width-->
 				<!-- Brand and toggle get grouped for better mobile display -->
-				<div class="topbar-nav" role="navigation">
+				<nav class="topbar-nav">
 
 					{{* Buttons for the mobile view *}}
 					<button type="button" class="navbar-toggle offcanvas-right-toggle pull-right"
@@ -51,7 +51,13 @@
 					</button>
 
 					{{* Left section of the NavBar with navigation shortcuts/icons *}}
-					<ul class="nav navbar-left" role="menubar">
+					<ul class="nav navbar-left">
+						<li class="sr-only">
+							<button class="sr-only" onclick="document.getElementById('content').scrollIntoView(); document.getElementById('content').focus();">{{$skip}}</button>
+						</li>
+						<li class="sr-only">
+							<a class="sr-only" href="{{$baseurl}}">{{$home}}</a>
+						</li>
 						{{if $nav.network}}
 							<li class="nav-segment">
 								<a accesskey="n" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}"
@@ -115,7 +121,7 @@
 
 						{{* The notifications dropdown *}}
 						{{if $nav.notifications}}
-							<li id="nav-notification" class="nav-segment dropdown" role="presentation">
+							<li id="nav-notification" class="nav-segment dropdown">
 								<button id="nav-notifications-menu-btn" class="btn-link dropdown-toggle" data-toggle="dropdown"
 									type="button" aria-haspopup="true" aria-expanded="false"
 									aria-controls="nav-notifications-menu">
@@ -126,7 +132,7 @@
 								<ul id="nav-notifications-menu" class="dropdown-menu menu-popup" role="menu"
 									aria-labelledby="nav-notifications-menu-btn">
 									{{* the following list entry must have the id "nav-notifications-mark-all". Without it this isn't visible. ....strange behavior :-/ *}}
-									<li role="presentation" id="nav-notifications-mark-all" class="dropdown-header">
+									<li id="nav-notifications-mark-all" class="dropdown-header">
 										<div class="arrow"></div>
 										{{$nav.notifications.1}}
 										<div class="dropdown-header-link">
@@ -138,7 +144,7 @@
 
 									</li>
 
-									<li role="presentation">
+									<li>
 										<p role="menuitem" class="text-muted"><i>{{$emptynotifications}}</i></p>
 									</li>
 								</ul>
@@ -146,7 +152,7 @@
 						{{/if}}
 
 					</ul>
-				</div>
+				</nav>
 
 				{{* This is the right part of the NavBar. It includes the search and the user menu *}}
 				<div class="topbar-actions pull-right">
@@ -188,20 +194,20 @@
 									{{if $nav.remote}}
 										{{if $nav.sitename}}
 											<li id="nav-sitename" role="menuitem">{{$nav.sitename}}</li>
-											<li role="presentation" class="divider"></li>
+											<li class="divider"><hr></li>
 										{{/if}}
 									{{/if}}
 									{{foreach $nav.usermenu as $usermenu}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem" class="{{$usermenu.2}}" href="{{$usermenu.0}}"
 												title="{{$usermenu.3}}">
 												{{$usermenu.1}}
 											</a>
 										</li>
 									{{/foreach}}
-									<li role="presentation" class="divider"></li>
+									<li class="divider"><hr></li>
 									{{if $nav.notifications}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}">
 												<i class="fa fa-bell fa-fw" aria-hidden="true"></i>
 												{{$nav.notifications.1}}
@@ -209,7 +215,7 @@
 										</li>
 									{{/if}}
 									{{if $nav.messages}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem"
 												class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}"
 												href="{{$nav.messages.0}}" title="{{$nav.messages.3}}">
@@ -219,9 +225,9 @@
 											</a>
 										</li>
 									{{/if}}
-									<li role="presentation" class="divider"></li>
+									<li class="divider"><hr></li>
 									{{if $nav.contacts}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem" id="nav-menu-contacts-link"
 												class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}"
 												title="{{$nav.contacts.3}}">
@@ -231,7 +237,7 @@
 										</li>
 									{{/if}}
 									{{if $nav.delegation}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem" id="nav-delegation-link"
 												class="nav-commlink {{$nav.delegation.2}} {{$sel.delegation}}"
 												href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}">
@@ -239,24 +245,24 @@
 											</a>
 										</li>
 									{{/if}}
-									<li role="presentation">
+									<li>
 										<a role="menuitem" id="nav-directory-link" class="nav-link {{$nav.directory.2}}"
 											href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">
 											<i class="fa fa-sitemap fa-fw" aria-hidden="true"></i>{{$nav.directory.1}}
 										</a>
 									</li>
-									<li role="presentation" class="divider"></li>
+									<li class="divider"><hr></li>
 									{{if $nav.apps}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem" id="nav-apps-link" class="nav-link {{$nav.apps.2}}"
 												href="{{$nav.apps.0}}" title="{{$nav.apps.3}}">
 												<i class="fa fa-puzzle-piece fa-fw" aria-hidden="true"></i> {{$nav.apps.1}}
 											</a>
 										</li>
-										<li role="presentation" class="divider"></li>
+										<li class="divider"><hr></li>
 									{{/if}}
 									{{if $nav.help}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem" id="nav-help-link" class="nav-link {{$nav.help.2}}"
 												href="{{$nav.help.0}}" title="{{$nav.help.3}}">
 												<i class="fa fa-question-circle fa-fw" aria-hidden="true"></i> {{$nav.help.1}}
@@ -264,7 +270,7 @@
 										</li>
 									{{/if}}
 									{{if $nav.settings}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem" id="nav-settings-link" class="nav-link {{$nav.settings.2}}"
 												href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">
 												<i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}
@@ -272,7 +278,7 @@
 										</li>
 									{{/if}}
 									{{if $nav.admin}}
-										<li role="presentation">
+										<li>
 											<a accesskey="a" role="menuitem" id="nav-admin-link"
 												class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}"
 												title="{{$nav.admin.3}}"><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i>
@@ -281,7 +287,7 @@
 										</li>
 									{{/if}}
 									{{if $nav.moderation}}
-										<li role="presentation">
+										<li>
 											<a accesskey="m" role="menuitem" id="nav-moderation-link"
 												class="nav-link {{$nav.moderation.2}}" href="{{$nav.moderation.0}}"
 												title="{{$nav.moderation.3}}"><i class="fa fa-gavel fa-fw" aria-hidden="true"></i>
@@ -289,24 +295,24 @@
 											</a>
 										</li>
 									{{/if}}
-									<li role="presentation" class="divider"></li>
-									<li role="presentation">
+									<li class="divider"><hr></li>
+									<li>
 										<a role="menuitem" id="nav-about-link" class="nav-link {{$nav.about.2}}"
 											href="{{$nav.about.0}}" title="{{$nav.about.3}}">
 											<i class="fa fa-info fa-fw" aria-hidden="true"></i> {{$nav.about.1}}
 										</a>
 									</li>
 									{{if $nav.tos}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem" id="nav-tos-link" class="nav-link {{$nav.tos.2}}"
 												href="{{$nav.tos.0}}" title="{{$nav.tos.3}}"><i class="fa fa-file-text"
 													aria-hidden="true"></i> {{$nav.tos.1}}
 											</a>
 										</li>
 									{{/if}}
-									<li role="presentation" class="divider"></li>
+									<li class="divider"><hr></li>
 									{{if $nav.logout}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem" id="nav-logout-link"
 												class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}"
 												title="{{$nav.logout.3}}"><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i>
@@ -314,7 +320,7 @@
 											</a>
 										</li>
 									{{else}}
-										<li role="presentation">
+										<li>
 											<a role="menuitem" id="nav-login-link"
 												class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}"
 												title="{{$nav.login.3}}"><i class="fa fa-power-off fa-fw" aria-hidden="true"></i>
@@ -343,23 +349,23 @@
 									<li role="menuitem" class="nav-sitename list-group-item">{{$nav.sitename}}</li>
 								{{/if}}
 							{{/if}}
-							<li role="presentation" class="list-group-item">
+							<li class="list-group-item">
 								<img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"
 									style="max-width:15px; max-height:15px; min-width:15px; min-height:15px; width:15px; height:15px;">
 								{{$userinfo.name}}{{if $nav.remote}} ({{$nav.remote}}){{/if}}
 							</li>
 							{{foreach $nav.usermenu as $usermenu}}
-								<li role="presentation" class="list-group-item">
+								<li class="list-group-item">
 									<a role="menuitem" class="{{$usermenu.2}}"
 										href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}
 									</a>
 								</li>
 							{{/foreach}}
 							{{if $nav.notifications || $nav.contacts || $nav.messages || $nav.delegation}}
-								<li role="presentation" class="divider"></li>
+								<li class="divider"><hr></li>
 							{{/if}}
 							{{if $nav.notifications}}
-								<li role="presentation" class="list-group-item">
+								<li class="list-group-item">
 									<a role="menuitem"
 										href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i
 											class="fa fa-bell fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}
@@ -367,7 +373,7 @@
 								</li>
 							{{/if}}
 							{{if $nav.contacts}}
-								<li role="presentation" class="list-group-item">
+								<li class="list-group-item">
 									<a role="menuitem"
 										class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}"
 										title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i>
@@ -376,7 +382,7 @@
 								</li>
 							{{/if}}
 							{{if $nav.messages}}
-								<li role="presentation" class="list-group-item">
+								<li class="list-group-item">
 									<a role="menuitem"
 										class="nav-link {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}"
 										title="{{$nav.messages.3}}"><i class="fa fa-envelope fa-fw" aria-hidden="true"></i>
@@ -385,7 +391,7 @@
 								</li>
 							{{/if}}
 							{{if $nav.delegation}}
-								<li role="presentation" class="list-group-item">
+								<li class="list-group-item">
 									<a role="menuitem"
 										class="nav-commlink {{$nav.delegation.2}} {{$sel.delegation}}"
 										href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}"><i class="fa fa-flag fa-fw"
@@ -394,10 +400,10 @@
 								</li>
 							{{/if}}
 							{{if $nav.settings || $nav.admin || $nav.logout}}
-								<li role="presentation" class="divider"></li>
+								<li class="divider"><hr></li>
 							{{/if}}
 							{{if $nav.settings}}
-								<li role="presentation" class="list-group-item">
+								<li class="list-group-item">
 									<a role="menuitem" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}"
 										title="{{$nav.settings.3}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i>
 										{{$nav.settings.1}}
@@ -405,7 +411,7 @@
 								</li>
 							{{/if}}
 							{{if $nav.admin}}
-								<li role="presentation" class="list-group-item">
+								<li class="list-group-item">
 									<a role="menuitem"
 										class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}"><i
 											class="fa fa-user-secret fa-fw" aria-hidden="true"></i>
@@ -414,7 +420,7 @@
 								</li>
 							{{/if}}
 							{{if $nav.moderation}}
-								<li role="presentation" class="list-group-item">
+								<li class="list-group-item">
 									<a role="menuitem"
 										class="nav-link {{$nav.moderation.2}}" href="{{$nav.moderation.0}}" title="{{$nav.moderation.3}}"><i
 											class="fa fa-gavel fa-fw" aria-hidden="true"></i>
@@ -422,16 +428,16 @@
 									</a>
 								</li>
 							{{/if}}
-							<li role="presentation" class="divider"></li>
-							<li role="presentation" class="list-group-item">
+							<li class="divider"><hr></li>
+							<li class="list-group-item">
 								<a role="menuitem" class="nav-link {{$nav.about.2}}"
 								   href="{{$nav.about.0}}" title="{{$nav.about.3}}">
 									<i class="fa fa-info fa-fw" aria-hidden="true"></i> {{$nav.about.1}}
 								</a>
 							</li>
-							<li role="presentation" class="divider"></li>
+							<li class="divider"><hr></li>
 							{{if $nav.logout}}
-								<li role="presentation" class="list-group-item">
+								<li class="list-group-item">
 									<a role="menuitem"
 										class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}"><i
 											class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i>
@@ -439,7 +445,7 @@
 									</a>
 								</li>
 							{{else}}
-								<li role="presentation" class="list-group-item">
+								<li class="list-group-item">
 									<a role="menuitem"
 										class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}"
 										title="{{$nav.login.3}}"><i class="fa fa-power-off fa-fw" aria-hidden="true"></i>
@@ -473,13 +479,13 @@
 			</div>
 			<div class="pull-right">
 				<ul class="nav navbar-nav navbar-right">
-					<li role="presentation">
+					<li>
 						<a href="login?mode=none" id="nav-login" data-toggle="tooltip" aria-label="{{$nav.login.3}}"
 							title="{{$nav.login.3}}">
 							<i class="fa fa-sign-in fa-fw" aria-hidden="true"></i>
 						</a>
 					</li>
-					<li role="presentation">
+					<li>
 						<a href="{{$nav.about.0}}" id="nav-about" data-toggle="tooltip" aria-label="{{$nav.about.3}}"
 							title="{{$nav.about.3}}">
 							<i class="fa fa-info fa-fw" aria-hidden="true"></i>
diff --git a/view/theme/frio/templates/page_tabs.tpl b/view/theme/frio/templates/page_tabs.tpl
index 9045a4bbbd..3417229c8c 100644
--- a/view/theme/frio/templates/page_tabs.tpl
+++ b/view/theme/frio/templates/page_tabs.tpl
@@ -6,7 +6,7 @@
   *}}
 <ul class="nav nav-tabs">
 {{foreach $tabs as $tab}}
-	<li id="{{$tab.id}}" role="presentation"{{if $tab.sel}} class="{{$tab.sel}}"{{/if}}>
+	<li id="{{$tab.id}}"{{if $tab.sel}} class="{{$tab.sel}}"{{/if}}>
 		<a role="menuitem" href="{{$tab.url}}"{{if $tab.accesskey}} accesskey="{{$tab.accesskey}}"{{/if}}{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a>
 	</li>
 {{/foreach}}
diff --git a/view/theme/frio/templates/photo_item.tpl b/view/theme/frio/templates/photo_item.tpl
index 38a856cbfc..389f66eaf1 100644
--- a/view/theme/frio/templates/photo_item.tpl
+++ b/view/theme/frio/templates/photo_item.tpl
@@ -37,20 +37,20 @@
 	<div class="media-body">
 
 		{{* the header with the comment author name *}}
-		<div role="heading " class="contact-info-comment">
+		<div class="contact-info-comment">
 			<h5 class="media-heading">
 				<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link userinfo hover-card"><span class="btn-link">{{$name}}</span></a>
 			</h5>
 		</div>
 
 		{{* comment content *}}
-		<div class="wall-item-content" id="wall-item-content-{{$id}}">
+		<article class="wall-item-content" id="wall-item-content-{{$id}}">
 			{{if $title}}
 			<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
 			{{/if}}
 
 			<div class="wall-item-body {{if !$title}}p-name{{/if}}" id="wall-item-body-{{$id}}" dir="auto">{{$body}}</div>
-		</div>
+		</article>
 
 		<div class="wall-item-wrapper-end clear"></div>
 		<div class="wall-item-comment-separator"></div>
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index dbf8bf159d..45321a9e49 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -111,13 +111,13 @@
 			<hr />
 
 			{{* item content *}}
-			<div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
+			<article class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}" lang="{{$item.lang}}" aria-posinset="{{$item.id}}" aria-setsize="-1">
 				{{if $item.title}}
-				<span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h2 class="media-heading" dir="auto"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2><br /></span>
+				<span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3 class="media-heading" dir="auto"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h3><br /></span>
 				{{/if}}
 
 				<div class="wall-item-body" id="wall-item-body-{{$item.id}}" dir="auto">{{$item.body_html nofilter}}</div>
-			</div>
+			</article>
 
 			<!-- TODO -->
 			<div class="wall-item-bottom">
@@ -155,14 +155,14 @@
 					<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});"></button>
 						{{/if}}
 						{{if $item.vote.like AND $item.vote.dislike}}
-					<span role="presentation" class="separator">•</span>
+					<span class="separator"aria-hidden="true">•</span>
 						{{/if}}
 
 						{{if $item.vote.dislike}}
 					<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});"></button>
 						{{/if}}
 						{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}}
-					<span role="presentation" class="separator">•</span>
+					<span class="separator"aria-hidden="true">•</span>
 						{{/if}}
 					{{/if}}
 
@@ -175,7 +175,7 @@
 					{{if $item.vote}}
 						{{if $item.vote.share}}
 							{{if $item.vote.like OR $item.vote.dislike OR $item.comment_html}}
-					<span role="presentation" class="separator">•</span>
+					<span class="separator"aria-hidden="true">•</span>
 							{{/if}}
 					<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i></button>
 						{{/if}}
@@ -183,7 +183,7 @@
 
 				{{* Put additional actions in a dropdown menu *}}
 				{{if $item.menu && ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || $item.drop.dropping || $item.browsershare)}}
-					<span role="presentation" class="separator"></span>
+					<span class="separator"></span>
 					<span class="more-links btn-group{{if $item.thread_level> 1}} dropup{{/if}}">
 						<button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i>&nbsp;{{$item.menu}}</button>
 						<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenuOptions-{{$item.id}}">
@@ -242,7 +242,7 @@
 						{{/if}}
 
 						{{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || $item.drop.dropping)}}
-							<li role="separator" class="divider"></li>
+							<li class="divider"><hr></li>
 						{{/if}}
 
 						{{if $item.ignore}}
diff --git a/view/theme/frio/templates/settings/profile/index.tpl b/view/theme/frio/templates/settings/profile/index.tpl
index 5c60d4d897..41ce15a1ff 100644
--- a/view/theme/frio/templates/settings/profile/index.tpl
+++ b/view/theme/frio/templates/settings/profile/index.tpl
@@ -15,10 +15,10 @@
 					<i class="fa fa-angle-down" aria-hidden="true"></i>&nbsp;{{$l10n.profile_action}}
 				</button>
 				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">
-					<li role="presentation"><a role="menuitem" href="{{$profpiclink}}" id="profile-photo_upload-link"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$l10n.profpic}}</a></li>
-					<li role="presentation"><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$l10n.profile_photo}}</button></li>
-					<li role="presentation" class="divider"></li>
-					<li role="presentation"><a role="menuitem" href="profile/{{$nickname}}/profile" id="profile-edit-view-link">{{$l10n.viewprof}}</a></li>
+					<li><a role="menuitem" href="{{$profpiclink}}" id="profile-photo_upload-link"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$l10n.profpic}}</a></li>
+					<li><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$l10n.profile_photo}}</button></li>
+					<li class="divider"></li>
+					<li><a role="menuitem" href="profile/{{$nickname}}/profile" id="profile-edit-view-link">{{$l10n.viewprof}}</a></li>
 				</ul>
 			</li>
 		</ul>
diff --git a/view/theme/frio/templates/sub/direction.tpl b/view/theme/frio/templates/sub/direction.tpl
index 3498354151..0b48dad6e5 100644
--- a/view/theme/frio/templates/sub/direction.tpl
+++ b/view/theme/frio/templates/sub/direction.tpl
@@ -8,25 +8,25 @@
 <span class="direction">
 	<span aria-hidden="true">&bull;</span>
 	{{if $direction.direction == 1}}
-		<i class="fa fa-inbox" aria-hidden="true" title="{{$direction.title}}"></i>
+		<i class="fa fa-inbox" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 2}}
-		<i class="fa fa-download" aria-hidden="true" title="{{$direction.title}}"></i>
+		<i class="fa fa-download" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 3}}
-		<i class="fa fa-retweet" aria-hidden="true" title="{{$direction.title}}"></i>
+		<i class="fa fa-retweet" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 4}}
-		<i class="fa fa-hashtag" aria-hidden="true" title="{{$direction.title}}"></i>
+		<i class="fa fa-hashtag" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 5}}
-		<i class="fa fa-comment-o" aria-hidden="true" title="{{$direction.title}}"></i>
+		<i class="fa fa-comment-o" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 6}}
-		<i class="fa fa-user" aria-hidden="true" title="{{$direction.title}}"></i>
+		<i class="fa fa-user" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 7}}
-		<i class="fa fa-at" aria-hidden="true" title="{{$direction.title}}"></i>
+		<i class="fa fa-at" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 8}}
-		<i class="fa fa-share" aria-hidden="true" title="{{$direction.title}}"></i>
+		<i class="fa fa-share" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 9}}
-		<i class="fa fa-globe" aria-hidden="true" title="{{$direction.title}}"></i>
+		<i class="fa fa-globe" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 10}}
-		<i class="fa fa-inbox" aria-hidden="true" title="{{$direction.title}}"></i>
+		<i class="fa fa-inbox" title="{{$direction.title}}"></i>
 	{{/if}}
 </span>
 {{/if}}
diff --git a/view/theme/frio/templates/threaded_conversation.tpl b/view/theme/frio/templates/threaded_conversation.tpl
index 274de77dfa..6daa19a1ec 100644
--- a/view/theme/frio/templates/threaded_conversation.tpl
+++ b/view/theme/frio/templates/threaded_conversation.tpl
@@ -8,7 +8,6 @@
 {{if $mode == display}}<script type="text/javascript" src="view/theme/frio/js/mod_display.js?v={{$VERSION}}"></script>{{/if}}
 {{$live_update nofilter}}
 {{foreach $threads as $thread}}
-<hr class="sr-only" />
 <div id="tread-wrapper-{{$thread.uriid}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}} {{$thread.toplevel}} {{$thread.network}} {{if $thread.thread_level==1}}panel-default panel{{/if}} {{if $thread.thread_level!=1}}comment-wrapper{{/if}}" style="{{if $item.thread_level>2}}margin-left: -15px; margin-right:-16px; margin-bottom:-16px;{{/if}}"><!-- panel -->
 
 		{{* {{if $thread.type == tag}}
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 2c04ccde17..c573749baf 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -59,17 +59,17 @@ as the value of $top_child_total (this is done at the end of this file)
 <span class="created" style="display: none;">{{$item.created_date}}</span>
 <span class="uriid" style="display: none;">{{$item.uriid}}</span>
 {{/if}}
-	<div class="media {{$item.shiny}}">
+	<article class="media {{$item.shiny}}" aria-posinset="{{$item.id}}" aria-setsize="-1">
 	{{if $item.parentguid}}
 		<span class="visible-sm-inline visible-xs wall-item-responses time">
 			<i class="fa fa-reply" aria-hidden="true"></i> <a id="btn-{{$item.id}}" class="" href="javascript:;" onclick="scrollToItem('item-' + '{{$item.parentguid}}');">{{$item.inreplyto}}</a>
-			{{if $item.reshared}}<i class="hidden-xs">&#x2022;</i>{{/if}}
+			{{if $item.reshared}}<i class="hidden-xs "aria-hidden="true">&#x2022;</i>{{/if}}
 		</span>
 	{{else}}
 		{{if $item.thread_level!=1 && $item.isunknown}}
 		<span class="visible-sm-inline visible-xs wall-item-responses time">
 			<i title="{{$item.isunknown_label}}" aria-label="{{$item.isunknown_label}}">{{$item.isunknown}}</i>
-			{{if $item.reshared}}<i class="hidden-xs">&#x2022;</i>{{/if}}
+			{{if $item.reshared}}<i class="hidden-xs" aria-hidden="true">&#x2022;</i>{{/if}}
 		</span>
 		{{/if}}
 	{{/if}}
@@ -80,14 +80,14 @@ as the value of $top_child_total (this is done at the end of this file)
 		{{* The avatar picture and the photo-menu *}}
 		<div class="dropdown pull-left"><!-- Dropdown -->
 			{{if $item.thread_level==1}}
-			<div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
+			<div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" aria-hidden="true">
 				<a class="userinfo click-card u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
 					<div class="contact-photo-image-wrapper">
 						<img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}"  loading="lazy"/>
 					</div>
 				</a>
 			</div>
-			<div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
+			<div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" aria-hidden="true">
 				<a class="userinfo click-card u-url" id="wall-item-photo-menu-xs-{{$item.id}}" href="{{$item.profile_url}}">
 					<div class="contact-photo-image-wrapper">
 						<img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name}}"  loading="lazy"/>
@@ -108,7 +108,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
 			{{* The avatar picture for comments *}}
 			{{if $item.thread_level!=1}}
-			<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
+			<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" aria-hidden="true">
 				<a class="userinfo click-card u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
 					<div class="contact-photo-image-wrapper">
 						<img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-comment-{{$item.id}}" alt="{{$item.name}}" loading="lazy"/>
@@ -152,30 +152,28 @@ as the value of $top_child_total (this is done at the end of this file)
 
 				<div class="additional-info text-muted">
 					<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
-						<small>
-							<a href="{{$item.plink.orig}}">
-								<time class="time dt-published" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time>
-							</a>
-							{{if $item.owner_self}}
-								{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
-							{{/if}}
-							{{if $item.direction}}
-								{{include file="sub/direction.tpl" direction=$item.direction}}
-							{{/if}}
-							{{if $item.pinned}}
-								<span aria-hidden="true">&bull;</span> <i class="fa fa-thumb-tack" aria-hidden="true" title="{{$item.pinned}}"></i>
-								<span class="sr-only">{{$item.pinned}}</span>
-							{{/if}}
-							{{if $item.connector}}
-								<span aria-hidden="true">&bull;</span>
-								<small><i class="fa fa-plug" title="{{$item.connector}}" aria-hidden="true"></i></small>
-							{{else}}
-								<span aria-hidden="true">&bull;</span>
-								<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
-									<small><i class="fa {{if $item.private == 1}}fa-lock{{elseif $item.private == 0}}fa-globe{{else}}fa-low-vision{{/if}}" aria-hidden="true"></i></small>
-								</span>
-							{{/if}}
-						</small>
+						<a href="{{$item.plink.orig}}">
+							<time class="time dt-published" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time>
+						</a>
+						{{if $item.owner_self}}
+							{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
+						{{/if}}
+						{{if $item.direction}}
+							{{include file="sub/direction.tpl" direction=$item.direction}}
+						{{/if}}
+						{{if $item.pinned}}
+							<span aria-hidden="true">&bull;</span> <i class="fa fa-thumb-tack" aria-hidden="true" title="{{$item.pinned}}"></i>
+							<span class="sr-only">{{$item.pinned}}</span>
+						{{/if}}
+						{{if $item.connector}}
+							<span aria-hidden="true">&bull;</span>
+							<i class="fa fa-plug" title="{{$item.connector}}" aria-hidden="true"></i>
+						{{else}}
+							<span aria-hidden="true">&bull;</span>
+							<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
+								<i class="fa {{if $item.private == 1}}fa-lock{{elseif $item.private == 0}}fa-globe{{else}}fa-low-vision{{/if}}" aria-hidden="true"></i>
+							</span>
+						{{/if}}
 					</div>
 
 					{{if $item.location_html}}
@@ -205,7 +203,7 @@ as the value of $top_child_total (this is done at the end of this file)
 							{{/if}}
 							{{if $item.connector}}
 								<span aria-hidden="true">&bull;</span>
-								<small><i class="fa fa-plug" title="{{$item.connector}}" aria-hidden="true"></i></small>
+								<i class="fa fa-plug" title="{{$item.connector}}"></i>
 							{{else}}
 								<span aria-hidden="true">&bull;</span>
 								<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
@@ -227,13 +225,13 @@ as the value of $top_child_total (this is done at the end of this file)
 					{{if $item.parentguid}}
 						<span class="hidden-xs hidden-sm">
 							<a id="btn-{{$item.id}}" class="time" href="javascript:;" onclick="scrollToItem('item-' + '{{$item.parentguid}}');"><i class="fa fa-reply" aria-hidden="true"></i> {{$item.inreplyto}}</a>
-							<i class="hidden-xs">&#x2022;</i>
+							<i class="hidden-xs" aria-hidden="true">&#x2022;</i>
 						</span>
 					{{else}}
 						{{if $item.isunknown}}
 							<span class="hidden-xs hidden-sm time">
 								<i title="{{$item.isunknown_label}}" aria-label="{{$item.isunknown_label}}">{{$item.isunknown}}</i>
-								<i class="hidden-xs">&#x2022;</i>
+								<i class="hidden-xs" aria-hidden="true">&#x2022;</i>
 							</span>
 						{{/if}}
 					{{/if}}
@@ -249,11 +247,11 @@ as the value of $top_child_total (this is done at the end of this file)
 					{{/if}}
 					{{if $item.connector}}
 						<span aria-hidden="true">&bull;</span>
-						<small><i class="fa fa-plug" title="{{$item.connector}}" aria-hidden="true"></i></small>
+						<i class="fa fa-plug" title="{{$item.connector}}"></i>
 					{{else}}
 						<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
 							<span aria-hidden="true">&bull;</span>
-							<small><i class="fa {{if $item.private == 1}}fa-lock{{elseif $item.private == 0}}fa-globe{{else}}fa-low-vision{{/if}}" aria-hidden="true"></i></small>
+							<i class="fa {{if $item.private == 1}}fa-lock{{elseif $item.private == 0}}fa-globe{{else}}fa-low-vision{{/if}}" aria-hidden="true"></i>
 						</span>
 					{{/if}}
 				</small>
@@ -268,20 +266,20 @@ as the value of $top_child_total (this is done at the end of this file)
 		{{if $item.thread_level==1}}<span aria-hidden="true"><hr /></span>{{/if}}
 
 		{{* item content *}}
-		<div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
+		<div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}" lang="{{$item.lang}}">
 			{{if $item.title}}
 			<span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3 class="media-heading" dir="auto"><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name" target="_blank">{{$item.title}}</a></h3><br /></span>
 			{{/if}}
 			{{if $item.summary}}
 			<summary class="wall-item-summary" id="wall-item-summary-{{$item.id}}">{{$item.summary}}</summary>
 			{{/if}}
-			<div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}" id="wall-item-body-{{$item.id}}" dir="auto" lang="{{$item.lang}}">{{$item.body_html nofilter}}</div>
+			<div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}" id="wall-item-body-{{$item.id}}" dir="auto">{{$item.body_html nofilter}}</div>
 		</div>
 
 		<!-- TODO -->
 		<div class="wall-item-bottom">
 			<div class="wall-item-links"></div>
-			<div class="wall-item-tags">
+			<div class="wall-item-tags" lang="{{$item.lang}}">
 		{{if !$item.suppress_tags}}
 			{{foreach $item.hashtags as $tag}}
 				<span class="tag label btn-info sm">{{$tag nofilter}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
@@ -456,7 +454,7 @@ as the value of $top_child_total (this is done at the end of this file)
 				{{/if}}
 
 				{{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || ($item.drop && $item.drop.dropping))}}
-				<li role="separator" class="divider"></li>
+				<li class="divider"><hr></li>
 				{{/if}}
 
 				{{if $item.ignore}}
@@ -502,7 +500,7 @@ as the value of $top_child_total (this is done at the end of this file)
 			</ul>
 		</span>
 		{{if $item.drop.pagedrop}}
-		<span class="pull-right checkbox">
+		<span class="pull-right checkbox" aria-hidden="true">
 			{{if $item.drop}}
 				<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
 				<label for="checkbox-{{$item.id}}"></label>
@@ -637,7 +635,7 @@ as the value of $top_child_total (this is done at the end of this file)
 							</li>
 
 							{{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || ($item.drop && $item.drop.dropping))}}
-								<li role="separator" class="divider"></li>
+								<li class="divider"><hr></li>
 							{{/if}}
 
 							{{if $item.ignore}}
@@ -716,7 +714,7 @@ as the value of $top_child_total (this is done at the end of this file)
 		{{if $item.thread_level!=1}}
 		</div><!--./media-body from for comments-->
 		{{/if}}
-	</div>
+	</article>
 	{{foreach $item.children as $child}}
 		{{include file="{{$item.template}}" item=$child}}
 	{{/foreach}}