diff --git a/hub/calendar.php b/hub/calendar.php
index b0581b2..bb664d2 100644
--- a/hub/calendar.php
+++ b/hub/calendar.php
@@ -249,8 +249,6 @@ $next_show_date = date('Y-m-d', strtotime($show_array[$next_show_num - 1 ]["date
 $days_to_wait = floor((strtotime($next_show_date) - strtotime(gmdate('Y-m-d')))/(60*60*24));
 
 ?>
-<main id="maincontent">
-
 <h1>Upload Your Show</h1>
 
 <p>
@@ -360,9 +358,6 @@ If you wish to pick an available slot in the next 12 months then go directly to
 <h3 id="workflow">Workflow</h3>
 <p>
 The HPR statistics are regenerated every 15 minutes and are available in <a aria-label="Go to the stats json page" href="<?php echo "${hubBaseurl}"; ?>stats.json">json format</a>. Note the format is liable to change without notice.</p>
-
-</main>
-
 <?php
 include 'footer.php'; 
 ?>
diff --git a/hub/comment_confirm.php b/hub/comment_confirm.php
index 7cd6667..57d4caa 100644
--- a/hub/comment_confirm.php
+++ b/hub/comment_confirm.php
@@ -341,9 +341,6 @@ $body="give";
 include 'header.php'; 
 
 ?>
-
-<main id="maincontent">
-	<hr />
 	<article>
 		<header>
 				<h1>Thank you</h1>
@@ -360,8 +357,6 @@ include 'header.php';
 		<?php echo date('Y-m-d\TH:i:s') . "\n" . getUserIP() . "\n" . $_SERVER["HTTP_USER_AGENT"]; ?>
 		</pre>
 	</article>
-</main>
-
 <?php
 
 include 'footer.php';
diff --git a/hub/footer.php b/hub/footer.php
index ad6d446..105ab0b 100644
--- a/hub/footer.php
+++ b/hub/footer.php
@@ -1,89 +1,15 @@
-<footer id="footer_page">
-  <h1 class="thick_bar"><span style="padding-left: 1em;">More Information...</span></h1>
-  <div id="more_info">
-    <nav class="column">
-      <h2>Ancestry</h2>
-      <ul>
-        <li><a href="http://audio.textfiles.com/shows/radiofreekamerica/">Radio Freek America</a></li>
-        <li><a href="http://audio.textfiles.com/shows/binrev/">BinRev Radio</a></li>
-        <li><a href="http://audio.textfiles.com/shows/infonomicon/">Infonomicon</a></li>
-        <li><a href="http://audio.textfiles.com/shows/twat/">Talk With a Techie</a></li>
-      </ul>
-    </nav>
-    <nav class="column">
-      <h2>Social</h2>
-      <ul>
-        <li><a href="https://lists.hackerpublicradio.com/mailman/listinfo/hpr" >Mailing list</a></li>
-        <li><a href="https://botsin.space/@hpr" >Mastodon</a></li>
-        <li><a href="https://matrix.to/#/#hpr:matrix.org" >Matrix</a></li>
-        <li><a href="mumble://chatter.skyehaven.net:64738/Hacker%20Public%20Radio?version=1.2.0" >Mumble</a></li>
-        <li><a href="https://web.libera.chat/gamja/?channels=oggcastplanet" target="_blank">#oggcastplanet</a></li>
-        <li><a href="https://t.me/+6fEhQrf5IEc4ZGU8">Telegram</a></li>
-        <li><a href="https://twitter.com/HPR">Twitter.com</a></li>
-        <li><a href="https://www.facebook.com/HenryPartickReilly" target="_blank">Facebook</a></li>
-        <li><a href="https://www.linkedin.com/company/hackerpublicradio/" target="_blank">Linked-In</a></li>
-      </ul>
-    </nav>    
-    <nav class="column">
-      <h2>Unaffiliates</h2>
-      <ul>
-        <li><a href="https://archive.org/details/hackerpublicradio">Archive.org</a></li>
-        <li><a href="https://music.amazon.fr/podcasts/9d9e6211-ff78-4501-93b6-6a9e560c4dbd/hacker-public-radio">Amazon Music</a></li>
-        <li><a href="https://podcasts.google.com/feed/aHR0cDovL2hhY2tlcnB1YmxpY3JhZGlvLm9yZy9ocHJfcnNzLnBocA">Google Podcasts</a></li>
-        <li><a href="https://www.iheart.com/podcast/256-hacker-public-radio-30994513/" target="_blank">iHeart Radio</a></li>
-        <li><a href="https://podcasts.apple.com/us/podcast/hacker-public-radio/id281699640">iTunes</a></li>
-        <li><a href="https://www.listennotes.com/de/podcasts/hacker-public-radio-hacker-public-radio-mNH-jsI7LcJ/">Listen Notes</a></li>
-        <li><a href="https://www.mixcloud.com/hackerpublicradio/">MixCloud</a></li>
-        <li><a href="https://player.fm/series/hacker-public-radio">PlayerFM</a></li>
-        <li><a href="https://www.podchaser.com/podcasts/hacker-public-radio-76781">Podchaser</a></li>
-        <li><a href="https://nl.radio.net/podcast/hacker-public-radio">Radio.net</a></li>
-        <li><a href="https://open.spotify.com/show/7e2hYcnHj9vKgUzsIOf4r3">Spotify</a></li>
-        <li><a href="https://toppodcast.com/podcast_feeds/hacker-public-radio/">Top Podcasts</a></li>
-      </ul>
-    </nav>
-    <nav class="column">
-      <h2>Commons</h2>
-      <ul>
-        <li><a href="https://freeculturepodcasts.org/">Free Culture Podcasts</a></li>
-        <li><a href="https://archive.org/details/hackerpublicradio">archive.org</a></li>
-        <li><a href="https://repo.anhonesthost.net/HPR/">HPR Source Code</a></li>
-        <li><a href="https://cchits.net/">cchits.net</a></li>
-        <li><a href="https://freesound.org/">freesound.org</a></li>
-        <li><a href="https://librivox.org/">librivox.org</a></li>
-        <li><a href="https://openclipart.org/">openclipart.org</a></li>
-        <li><a href="https://openfontlibrary.org/">openfontlibrary.org</a></li>
-        <li><a href="https://www.openrouteservice.org/">openrouteservice.org/</a></li>
-        <li><a href="https://pixabay.com/">pixabay.com/</a></li>
-      </ul>
-    </nav>
-    <nav class="column">
-      <h2>Patrons</h2>
-      <ul>
-        <li><a href="https://anhonesthost.com/hosting/shared-hosting">AnHonestHost.com</a></li>
-        <li><a href="https://archive.org/donate/">Archive.org</a></li>
-        <li><a href="https://rsync.net/">rsync.net</a></li>
-      </ul>
-    </nav>
-  </div><!-- more_info -->
-  <h1 class="thick_bar"><span style="padding-left: 1em;">Copyright Information</span></h1>  
+</main>
+<footer role="contentinfo">
+  <hr class="no-css">
   <div id="copyright">
-    <p>
-    Unless otherwise stated, our shows are released under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
-    Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</a> license.</p>
-    <p>
+	  <span>Unless otherwise stated, our shows are released under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
+    Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</a> license.</span>
+    <span>
     The <span property="dct:title">HPR Website Design</span> is released to the <a rel="license" href="https://creativecommons.org/publicdomain/mark/1.0/">Public Domain</a>.
-    </p>
-    <hr />
-  </div><!-- copyright -->
-  <hr />
+    </span>
+  </div>
+  <div id="generated_by">This page was <a href="https://repo.anhonesthost.net/HPR/hpr_hub">generated</a> by <a href="mailto:<?php echo $generator_email ?>"><?php echo $generator_name ?></a> at <time dateTime="<?php echo date(DATE_ISO8601, strtotime(date("Y-m-d h:i:s a"))) ?>"><?php echo date("r") ?></time></em>
+ </div>
 </footer>
-</div>
-<!-- shadow -->
-<?php 
-if ( $connection ) {
-    mysqli_close($connection);
-}
-
-?>
 </body>
 </html>
diff --git a/hub/header.php b/hub/header.php
index 4bc05f2..631a818 100644
--- a/hub/header.php
+++ b/hub/header.php
@@ -5,73 +5,45 @@
   <base href="<?php echo $hubBaseurl ?>">
   <meta charset="utf-8" />
   <meta http-equiv="X-Clacks-Overhead" content="GNU Terry Pratchett" />
-  <meta http-equiv="last-modified" content="Thu, 28 Dec 2023 17:36:30 +0000">
+  <meta http-equiv="last-modified" content="Thu, 2 Oct 2025 20:45 +0000">
   <meta name="keywords" content="Technology, Tech News, Education, Training" />
   <meta name="description" content="Hacker Public Radio is a podcast that releases shows every weekday Monday through Friday. Our shows are produced by the community (you) and can be on any topic that is of interest to hackers and hobbyists." />
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <!-- Internal CSS -->
-  <style type="text/css">
-  article, aside, dialog, figure, footer, header, hgroup, menu, nav, section {
-          display: block;
-  }
-  #list1, #list2, #list3 {
-          display:none;
-  }
-  table.upload {
-	border-collapse: separate;
-    border-spacing: 0 0.75rem;
-  }
-  table.upload td {
-	  vertical-align: top;
-  }
-  </style>
-  <link rel="shortcut icon" href="https://hackerpublicradio.org/hpr.ico" >
+  <link rel="shortcut icon" href="<?php echo $baseurl ?>hpr.ico" >
   <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Opus RSS" href="<?php echo $baseurl ?>hpr_opus_rss.php" />
   <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Ogg Vorbis RSS" href="<?php echo $baseurl ?>hpr_ogg_rss.php" />
   <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio MP3 RSS" href="<?php echo $baseurl ?>hpr_mp3_rss.php" />
   <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Comments RSS" href="<?php echo $baseurl ?>comments.rss" />
   <link rel="license" title="CC BY-SA 4.0"  href="https://creativecommons.org/licenses/by-sa/4.0/" />
   <link href="<?php echo $baseurl ?>css/hpr.css" rel="stylesheet" />
-  <!--[if IE]>
-  <link rel="stylesheet" href="<?php echo $referrerurl ?>css/hpr.css" media="screen" type="text/css" />
-  <script src="/JavaScript/html5.js"></script>
-  <![endif]-->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.5, user-scalable=yes"/> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"/> 
 </head>
 
-<body id="give">
-<div id="container" class="shadow">
-<header>
-  <a href="<?php echo $referrerurl ?>"><img id="hprlogo" src="<?php echo $referrerurl ?>images/hpr_logo.png" alt="hprlogo"></a>
-  <div id="hpr_banner">
-    <p id="accessible_menu">
-      <a href="<?php echo $referrerurl ?>sitemap.html">Site Map</a>
-      - <a href="#maincontent">skip to main content</a>
-      </p>
-      <h1 id="sitename">
+<body>
+<div id="top_navigation" class="sr-only">
+	<nav id="accessible_menu">
+		<menu>
+			<li><a href="#main_content">Skip to Main Content</a></li>
+			<li><a href="<?php echo $referrerurl ?>sitemap.html#main_content">Site Map</a></li>
+		</menu>
+	</nav>
+	<hr class="no-css">
+</div>
+<header role="banner">
+<div class="bounding-box">
+  <hgroup id="title">
+	  <h1 id="site_acronym"><a href="<?php echo $referrerurl ?>index.html">HPR</a></h1>
+      <p id="site_name">
         <a href="<?php echo $referrerurl ?>correspondents/index.html">H</a>acker
         <a href="<?php echo $referrerurl ?>comments_viewer.html">P</a>ublic
         <a href="<?php echo $referrerurl ?>syndication.html">R</a>adio
-      </h1>
-    <h2>Your ideas, projects, opinions - podcasted.</h2>
-    <h3>New episodes every weekday Monday through Friday.<br />
-
-  </div>
-  <hr />
-  
-  <nav class="menu" role="navigation">		<ul>	
-			<li><a href="<?php echo $referrerurl ?>calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="<?php echo $referrerurl ?>index.html"><strong>Home »</strong></a></li>
-			<li><a href="<?php echo $referrerurl ?>syndication.html">Get Shows</a></li>
-			<li><a href="<?php echo $referrerurl ?>about.html#so_you_want_to_record_a_podcast">Give Shows</a></li>
-			<li><a href="<?php echo $referrerurl ?>about.html#how_to_help">Contribute</a></li>
-			<li><a href="<?php echo $referrerurl ?>tags.html">Tags</a></li>
-			<li><a href="<?php echo $referrerurl ?>about.html">About</a></li>
-			<li><a href="<?php echo $referrerurl ?>search.html">Search</a></li>
-		</ul>
-  </nav>
+      </p>
+  </hgroup>
+  <hgroup id="tag_line">
+    <h2 id="tag1">The Community Podcast</h2>
+	<p id="tag2">Sharing your ideas, projects, opinions since 2005</p>
+    <p id="tag3">New episodes every weekday </p>
+  </hgroup>
+</div>
 </header>
-
-
-<main id="maincontent">
+<main id="maincontent" role="main">
 
diff --git a/hub/request.php b/hub/request.php
index 5abbef0..b0abeff 100644
--- a/hub/request.php
+++ b/hub/request.php
@@ -155,8 +155,6 @@ $body="give";
 include 'header.php'; 
 
 ?>
-
-<main id="maincontent">
   <h1>Requesting a slot for your show.</h1>
   <p>Please select your desired slot, and enter a valid email address.<br />
   See our <a aria-label="Help on adding an episode" href="<?php echo "${referrerurl}about.html#adding_an_episode"; ?>">help page</a> for more information</a>
@@ -204,8 +202,6 @@ include 'header.php';
   <p>
   We will send you an email with a link to where you can upload your show.
   </p>
-</main>
-
 <?php
 include 'footer.php'; 
 ?>
diff --git a/hub/request_confirm.php b/hub/request_confirm.php
index 116e60d..f7c45ae 100644
--- a/hub/request_confirm.php
+++ b/hub/request_confirm.php
@@ -297,9 +297,6 @@ $body="give";
 include 'header.php'; 
 
 ?>
-
-<main id="maincontent">
-  <hr />
   <article>
     <header>
         <h1>Thank you</h1>
@@ -324,8 +321,6 @@ include 'header.php';
     <?php print date('Y-m-d\TH:i:s') . "\t" . getUserIP() . "\t" . $db_key . "\t" . $_SERVER["HTTP_USER_AGENT"]; ?>
     </pre>
   </article>
-</main>
-
 <?php
 include 'footer.php'; 
 ?>
diff --git a/hub/upload.php b/hub/upload.php
index 073aba8..d05ef23 100644
--- a/hub/upload.php
+++ b/hub/upload.php
@@ -113,8 +113,6 @@ include 'header.php';
 <body>
 <link href="quill.snow.css" rel="stylesheet"> 
 <script src="quill.js"></script>
-<main id="maincontent">
-  <hr />
   <?php 
   if ( $ep_num == 9999 ) {
     echo "<h2>Uploading to the Reserve Queue.</h2>\n";
@@ -334,7 +332,6 @@ include 'header.php';
   });
   </script>
   </form>
-</main>
 <?php
 include 'footer.php'; 
 ?>
diff --git a/hub/upload_confirm.php b/hub/upload_confirm.php
index 9f341fc..89bd7c6 100755
--- a/hub/upload_confirm.php
+++ b/hub/upload_confirm.php
@@ -404,9 +404,6 @@ $body="give";
 include 'header.php'; 
 
 ?>
-
-<main id="maincontent">
-  <hr />
   <article>
     <header>
         <h1>Thank you</h1>
@@ -426,8 +423,6 @@ include 'header.php';
     HPR Bot
     </p>
   </article>
-</main>
-
 <?php
 logextra( "Sending email" );