diff --git a/html/dark.css b/html/dark.css
index 3c2db57..0ed978a 100644
--- a/html/dark.css
+++ b/html/dark.css
@@ -8,116 +8,274 @@ a:visited {
   text-decoration: none;
 }
 
-
 a:hover {
   text-decoration: underline;
 }
 
 body {
-  background-image: url("/html/circuit-dark.png");
   background-color: #000000;
+  background-image: url("/html/circuit-dark.png");
   color: #aeaeae;
-  margin-left: 15px;
-  margin-right: 15px;
-}
-
-form {
-  margin-left: 0;
-  margin-right: 0;
-  margin-top: 0;
-  margin-bottom: 0;
+  padding-top: 15px;
 }
 
 hr {
-  height: 2px;
-  border-width: 0;
-  color: #888888;
   background-color: #888888;
+  border: 0;
+  color: #888888;
+  height: 2px;
+}
+
+img {
+  border: 0;
 }
 
 pre {
+  font-size: 15px;
+}
+
+pre img {
+  vertical-align: bottom;
+}
+
+table {
+  margin-bottom: 5px;
+  margin-left: 5px;
+  margin-right: 5px;
+  margin-top: 5px;
+  width: 100%;
+}
+
+table, td {
+  border: 1px solid;
+  border-collapse: collapse;
+  color: #888888;
+}
+
+td {
+  padding-bottom: 5px;
+  padding-left: 5px;
+  padding-right: 5px;
+  padding-top: 5px;
+}
+
+
+.bold {
+  font-weight: bold;
+}
+
+.box {
   background: #060606;
   border: 2px solid #aaaaaa;
-  padding-left: 20;
-  padding-right: 20;
   box-shadow: 10px 10px 10px -5px rgba(128,128,128,0.5);
+  overflow-x: auto;
+}
+
+.boxmargins {
+  margin-bottom: 10px;
+}
+
+.boxpadding {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+
+.donatebutton {
+  margin-left: 100px;
+  margin-right: 100px;
 }
 
 .heading {
   font-size: 200%;
 }
 
+.motdcontent {
+}
+
+.motdheader {
+  font-weight: bold;
+  text-decoration: underline;
+}
+
+.notice {
+  display: block;
+  margin-left: auto;
+  margin-bottom: 25px;
+  margin-right: auto;
+  text-align: center;
+  width: 70%;
+}
+
+.searchinput {
+  background-color: #060606;
+  border: 0;
+  color: #888888;
+  font-size: 15px;
+  height: 15px;
+  outline: 0;
+  margin-left: 25px;
+  margin-right: 5px;
+}
+
+.searchresultsinput {
+  border: 1px;
+  border-color: #555555;
+  border-style: solid;
+  width: 500px;
+}
+
+.sponsor {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+
 .subheading {
   font-size: 125%;
 }
 
-.breadcrumbs {
-  font-size: 150%;
-  background: #060606;
-  border: 2px solid #aaaaaa;
-  padding-left: 10;
-  padding-top: 2;
-  padding-right: 10;
-  padding-bottom: 2;
-  box-shadow: 10px 10px 10px -5px rgba(128,128,128,0.5);
+.underline {
+  text-decoration: underline;
 }
 
-.header {
-  background: #060606;
-  border: 2px solid #aaaaaa;
-  margin: 20;
-  padding-left: 10;
-  padding-top: 10;
-  padding-right: 10;
-  padding-bottom: 10;
-  box-shadow: 10px 10px 10px -5px rgba(128,128,128,0.5);
+
+#breadcrumbs {
+  align-self: end;
+  display: flex;
+  min-height: 25px;
+  margin-left: auto;
+  margin-right: auto;
 }
 
-.navbar {
+#breadcrumbstext {
+  align-content: center;
+  font-size: 15px;
+  text-align: center;
+  margin-left: 5px;
+  margin-right: 5px;
+}
+
+#bwbar {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 30px;
+  text-align: center;
   width: 100%;
+}
+
+#copyright {
+  font-size: 10px;
   text-align: center;
 }
 
-.search {
-  background: #060606;
-  border: 2px solid #aaaaaa;
-  box-shadow: 10px 10px 10px -5px rgba(128,128,128,0.5);
+#donatebuttons {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  margin-bottom: 10px;
+  margin-top: 20px;
 }
 
-.searchinput {
-  border: none;
-  background: #060606;
-  outline: none;
-  color: #888888;
-  font-size: 11px;
-  box-sizing: border-box;
-  padding-left: 10;
-  padding-top: 2;
-  padding-right: 10;
-  padding-bottom: 2;
+#headingbox {
+  margin-left: auto;
+  margin-right: auto;
+  width: fit-content;
+}
+
+#headingtext {
+  text-align: center;
+  margin-bottom: 5px;
+  margin-left: 5px;
+  margin-right: 5px;
+  margin-top: 5px;
+}
+
+#donorslistbox {
+  margin-left: auto;
+  margin-right: auto;
+  width: 70%;
+  text-align: center;
+}
+
+#donorstable {
+}
+
+#logo {
+  display: flex;
+  justify-content: center;
+  margin-bottom: 30px;
+  width: 100%;
+}
+
+#motd {
+  column-gap: 40px;
+  display: grid;
+  grid-template-columns: auto auto;
+  margin-left: 30px;
+  margin-right: 30px;
+  row-gap: 15px;
+  text-align: left;
+}
+
+#page {
+  margin-left: auto;
+  margin-right: auto;
+  width: 90%;
+}
+
+#search {
+  align-content: center;
+  align-self: end;
   background-color: #060606;
   background-image: url('/html/search-white.png');
-  background-size: 15px 15px;
-  background-position: 2px 2px;
+  background-position: 5px 5px;
   background-repeat: no-repeat;
-  padding-left: 20px;
+  background-size: 15px 15px;
+  height: 25px;
+  margin-left: 0;
+  margin-right: auto;
+  max-height: 25px;
 }
 
-.searchresults {
-  background: #060606;
-  border: 2px solid #aaaaaa;
-  padding-left: 20;
-  padding-right: 20;
-  box-shadow: 10px 10px 10px -5px rgba(128,128,128,0.5);
+#searchbreadcrumbstheme {
+  display: grid;
+  column-gap: 50px;
+  grid-template-columns: auto auto auto;
 }
 
-.sponsorslist {
-  background: #060606;
-  border: 2px solid #777;
-  margin: 20;
-  padding-left: 10;
-  padding-top: 10;
-  padding-right: 10;
-  padding-bottom: 10;
-  box-shadow: 10px 10px 10px -5px rgba(128,128,128,0.5);
+#signature {
+  grid-column-start: 1;
+  grid-column-end: 3;
+  margin-bottom: 50px;
+  text-align: right;
+}
+
+#sponsorship {
+  font-weight: bold;
+  margin-bottom: 20px;
+  text-align: center;
+}
+
+#themetoggle {
+  align-self: end;
+  display: flex;
+  height: 25px;
+  margin-left: auto;
+  margin-right: 0;
+  max-height: 25px;
+  text-align: right;
+}
+
+#themetoggleimg {
+  height: 15px;
+  margin-right: 5px;
+  vertical-align: middle;
+}
+
+#themetoggletext {
+  align-content: center;
+  color: #888888;
+  font-size: 15px;
+  margin-left: 5px;
+  margin-right: 5px;
 }
diff --git a/html/donors.php b/html/donors.php
index 2aea0fe..742106e 100644
--- a/html/donors.php
+++ b/html/donors.php
@@ -1,804 +1,308 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<?php
-  require ("includes/breadcrumbs.php");
-  require ("includes/vars.php");
-?>
-<html>
-  <?php require ("includes/head.php"); ?>
-  <body>
-    <center>
-      <?php require ("includes/logo.php"); ?>
-      <hr width="90%">
-      <table width="75%" cellspacing="0" align="center">
-        <tr>
-          <td align="center">
-            <b class="heading">Patronage & Donations</b><br>
-            If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-            <?php require ("includes/donate.php"); ?>
-          </td>
-        </tr>
-      </table>
-      <br>
-      <table class="header" border="0" align="center" id="title">
-        <tr>
-          <td align="center">
-            <b class="heading">Project Supporters</b><br>
-            <b class="subheading">The following people have kindly donated to <a href="https://slackware.uk/">slackware.uk</a>.<br>
-            Thank you very much for your support! :)</b>
-          </td>
-        </tr>
-      </table>
-      <table class="sponsorslist" width="60%" border="1" cellspacing="0" cellpadding="2" align="center">
-        <tr>
-          <td width="25%" align="left">
-            25th July 2024
-          </td>
-          <td align="left">
-            M W Magee
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            3rd June 2024
-          </td>
-          <td align="left">
-            Karl Gunnar Hammarlund
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            15th May 2024
-          </td>
-          <td align="left">
-            Tomasz Szewczyk
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            27th March 2024
-          </td>
-          <td align="left">
-            Raul Nevarez Garay
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            3rd March 2024
-          </td>
-          <td align="left">
-            Richard Barnes
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            30th November 2023
-          </td>
-          <td align="left">
-            Eduardo Alberto Castillo
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            20th September 2023
-          </td>
-          <td align="left">
-            Daniel Pompey
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            25th August 2023
-          </td>
-          <td align="left">
-            Syed Sajjad Rizvi
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            21st July 2023
-          </td>
-          <td align="left">
-            Jude DaShiell
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            4th June 2023
-          </td>
-          <td align="left">
-            Gerald Morris
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            3rd May 2023
-          </td>
-          <td align="left">
-            Syed Sajjad Rizvi
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            20th March 2023
-          </td>
-          <td align="left">
-            Luna Jernberg
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            8th February 2023
-          </td>
-          <td align="left">
-            Sergej Tjart
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            21st December 2022
-          </td>
-          <td align="left">
-            Karl Gunnar Hammarlund
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            5th November 2022
-          </td>
-          <td align="left">
-            David Melik
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            27th September 2022
-          </td>
-          <td align="left">
-            Miguel Angel González Moreno
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            23rd September 2022
-          </td>
-          <td align="left">
-            Christoph Koernig
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            8th September 2022
-          </td>
-          <td align="left">
-            Leeung-Jen
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            21st July 2022
-          </td>
-          <td align="left">
-            David Woodfall
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            18th July 2022
-          </td>
-          <td align="left">
-            Luke Dedek
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            14th July 2022
-          </td>
-          <td align="left">
-            Jack Leong
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            10th July 2022
-          </td>
-          <td align="left">
-            Charles Coffee
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            8th July 2022
-          </td>
-          <td align="left">
-            Randall Robinson
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            20th June 2022
-          </td>
-          <td align="left">
-            Richard Hoyle
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            7th June 2022
-          </td>
-          <td align="left">
-            Richard Hanser
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            7th June 2022
-          </td>
-          <td align="left">
-            Abehinichi
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            6th June 2022
-          </td>
-          <td align="left">
-            Keith Burnett
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            6th June 2022
-          </td>
-          <td align="left">
-            David Ian Allen
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            6th June 2022
-          </td>
-          <td align="left">
-            Duncan Wood
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            6th June 2022
-          </td>
-          <td align="left">
-            Robert Bresaz
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            4th June 2022
-          </td>
-          <td align="left">
-            Barry Grundy
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            4th June 2022
-          </td>
-          <td align="left">
-            Antoine Dierstein
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            4th June 2022
-          </td>
-          <td align="left">
-            Karl Gunnar Hammarlund
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            4th June 2022
-          </td>
-          <td align="left">
-            Matthew Dinslage
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            4th June 2022
-          </td>
-          <td align="left">
-            David Hall
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            27th April 2022
-          </td>
-          <td align="left">
-            Matthew Dinslage
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            4th April 2022
-          </td>
-          <td align="left">
-            Edward Rosenberg
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            2nd April 2022
-          </td>
-          <td align="left">
-            Matthew Dinslage
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            21th March 2022
-          </td>
-          <td align="left">
-            Theodore Allen
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            18th March 2022
-          </td>
-          <td align="left">
-            George Nielsen
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            18th March 2022
-          </td>
-          <td align="left">
-            Ioannis Anagnostakis
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            18th March 2022
-          </td>
-          <td align="left">
-            Karl Gunnar Hammarlund
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            18th March 2022
-          </td>
-          <td align="left">
-            Brian Lawrence
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            18th March 2022
-          </td>
-          <td align="left">
-            Dane Jensen
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            18th March 2022
-          </td>
-          <td align="left">
-            Matthew Dinslage
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            9th March 2022
-          </td>
-          <td align="left">
-            David Trudgian
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            7th March 2022
-          </td>
-          <td align="left">
-            Robert Bresaz
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            13th January 2022
-          </td>
-          <td align="left">
-            Rod Ziemski
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            21st December 2021
-          </td>
-          <td align="left">
-            Eric Trimmer
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            30th September 2021
-          </td>
-          <td align="left">
-            Brian Lawrence
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            17th August 2021
-          </td>
-          <td align="left">
-            Christoph Willing
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            14th July 2021
-          </td>
-          <td align="left">
-            Brian Lawrence
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            11th July 2021
-          </td>
-          <td align="left">
-            Don Boots
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            6th June 2021
-          </td>
-          <td align="left">
-            Cleverson Casarin Uliana
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            30th May 2021
-          </td>
-          <td align="left">
-            Klaus Gretland
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            25th May 2021
-          </td>
-          <td align="left">
-            Matthew Dinslage
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            25th May 2021
-          </td>
-          <td align="left">
-            Karl Bruns
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            18th May 2021
-          </td>
-          <td align="left">
-            Karl Gunnar Hammarlund
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            15th May 2021
-          </td>
-          <td align="left">
-            Christoph Koernig
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            20th April 2021
-          </td>
-          <td align="left">
-            Anthony McKenzie
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            18th April 2021
-          </td>
-          <td align="left">
-            Marcin Wolcendorf
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            10th April 2021
-          </td>
-          <td align="left">
-            Christoph Kühne
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            8th April 2021
-          </td>
-          <td align="left">
-            Patrick Volkerding
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            29th March 2021
-          </td>
-          <td align="left">
-            Anthony McKenzie
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            7th March 2021
-          </td>
-          <td align="left">
-            James Scott
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            2nd March 2021
-          </td>
-          <td align="left">
-            Alain Detal
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            15th February 2021
-          </td>
-          <td align="left">
-            Diniz Fernando Bortolotto Ferreira
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            22nd December 2020
-          </td>
-          <td align="left">
-            Peter Christy
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            22nd December 2020
-          </td>
-          <td align="left">
-            Karl Gunnar Hammarlund
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            15th December 2020
-          </td>
-          <td align="left">
-            Karol Jurica
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            14th December 2020
-          </td>
-          <td align="left">
-            Stanley Garvey
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            2nd October 2020
-          </td>
-          <td align="left">
-            Corby Roberts
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            24th August 2020
-          </td>
-          <td align="left">
-            Weber Kai
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            7th August 2020
-          </td>
-          <td align="left">
-            Brian Lawrence
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            6th August 2020
-          </td>
-          <td align="left">
-            Marcin Słodkiewicz
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            30th May 2020
-          </td>
-          <td align="left">
-            Ahmed Abbas
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            23rd May 2020
-          </td>
-          <td align="left">
-            Adam Purkrt
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            5th May 2020
-          </td>
-          <td align="left">
-            Clemens Sauerzopf
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            30th April 2020
-          </td>
-          <td align="left">
-            Gerard Lally
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            6th April 2020
-          </td>
-          <td align="left">
-            Peter Christy
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            3rd April 2020
-          </td>
-          <td align="left">
-            Tom Kosir
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            30th March 2020
-          </td>
-          <td align="left">
-            jwc1936
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            13th March 2020
-          </td>
-          <td align="left">
-            Gregory Guy Rozan
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            6th March 2020
-          </td>
-          <td align="left">
-            Brian Lawrence
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            5th March 2020
-          </td>
-          <td align="left">
-            Karl Gunnar Hammarlund
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            5th March 2020
-          </td>
-          <td align="left">
-            Pierre-Philipp Braun
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            4th March 2020
-          </td>
-          <td align="left">
-            Christoph Kühne
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            22nd February 2020
-          </td>
-          <td align="left">
-            Aaditya Bagga
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            20th October 2019
-          </td>
-          <td align="left">
-            Shuaidu Yang
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            12th October 2019
-          </td>
-          <td align="left">
-            Andrew Macks
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            9th October 2019
-          </td>
-          <td align="left">
-            Tapio Pätilä
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            30th August 2019
-          </td>
-          <td align="left">
-            Nora's Portal
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            18th July 2019
-          </td>
-          <td align="left">
-            Karl Gunnar Hammarlund
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            21st May 2019
-          </td>
-          <td align="left">
-            Brian Lawrence
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            16th May 2019
-          </td>
-          <td align="left">
-            Daniel Bowling
-          </td>
-        </tr>
-        <tr>
-          <td width="25%" align="left">
-            27th April 2019
-          </td>
-          <td align="left">
-            Antoniazzi Leonardo
-          </td>
-        </tr>
-      </table>
-    </center>
-    <?php require ("includes/bwbar.php"); ?>
-  </body>
-</html>
+<?php require ("header.php"); ?>
+<div class="box boxmargins" id="headingbox">
+  <div id="headingtext">
+    <span class="heading bold">Project Supporters</span><br>
+    <span class="subheading">
+      All those that make a monthly patronage via Patreon, and the following<br>
+      people have kindly donated to <a href="//slackware.uk/" title="Slackware UK">Slackware UK</a>.<br><br>
+      Thank you all very much for your support! :)
+    </span>
+  </div>
+</div>
+<br>
+<div class="box boxmargins" id="donorslistbox">
+  <table id="donorstable">
+    <tbody>
+      <tr>
+        <td>25th July 2024</td><td>M W Magee</td>
+      </tr>
+      <tr>
+        <td>3rd June 2024</td><td>Karl Gunnar Hammarlund</td>
+      </tr>
+      <tr>
+        <td>15th May 2024</td><td>Tomasz Szewczyk</td>
+      </tr>
+      <tr>
+        <td>27th March 2024</td><td>Raul Nevarez Garay</td>
+      </tr>
+      <tr>
+        <td>3rd March 2024</td><td>Richard Barnes</td>
+      </tr>
+      <tr>
+        <td>30th November 2023</td><td>Eduardo Alberto Castillo</td>
+      </tr>
+      <tr>
+        <td>20th September 2023</td><td>Daniel Pompey</td>
+      </tr>
+      <tr>
+        <td>25th August 2023</td><td>Syed Sajjad Rizvi</td>
+      </tr>
+      <tr>
+        <td>21st July 2023</td><td>Jude DaShiell</td>
+      </tr>
+      <tr>
+        <td>4th June 2023</td><td>Gerald Morris</td>
+      </tr>
+      <tr>
+        <td>3rd May 2023</td><td>Syed Sajjad Rizvi</td>
+      </tr>
+      <tr>
+        <td>20th March 2023</td><td>Luna Jernberg</td>
+      </tr>
+      <tr>
+        <td>8th February 2023</td><td>Sergej Tjart</td>
+      </tr>
+      <tr>
+        <td>21st December 2022</td><td>Karl Gunnar Hammarlund</td>
+      </tr>
+      <tr>
+        <td>5th November 2022</td><td>David Melik</td>
+      </tr>
+      <tr>
+        <td>27th September 2022</td><td>Miguel Angel González Moreno</td>
+      </tr>
+      <tr>
+        <td>23rd September 2022</td><td>Christoph Koernig</td>
+      </tr>
+      <tr>
+        <td>8th September 2022</td><td>Leeung-Jen</td>
+      </tr>
+      <tr>
+        <td>21st July 2022</td><td>David Woodfall</td>
+      </tr>
+      <tr>
+        <td>18th July 2022</td><td>Luke Dedek</td>
+      </tr>
+      <tr>
+        <td>14th July 2022</td><td>Jack Leong</td>
+      </tr>
+      <tr>
+        <td>10th July 2022</td><td>Charles Coffee</td>
+      </tr>
+      <tr>
+        <td>8th July 2022</td><td>Randall Robinson</td>
+      </tr>
+      <tr>
+        <td>20th June 2022</td><td>Richard Hoyle</td>
+      </tr>
+      <tr>
+        <td>7th June 2022</td><td>Richard Hanser</td>
+      </tr>
+      <tr>
+        <td>7th June 2022</td><td>Abehinichi</td>
+      </tr>
+      <tr>
+        <td>6th June 2022</td><td>Keith Burnett</td>
+      </tr>
+      <tr>
+        <td>6th June 2022</td><td>David Ian Allen</td>
+      </tr>
+      <tr>
+        <td>6th June 2022</td><td>Duncan Wood</td>
+      </tr>
+      <tr>
+        <td>6th June 2022</td><td>Robert Bresaz</td>
+      </tr>
+      <tr>
+        <td>4th June 2022</td><td>Barry Grundy</td>
+      </tr>
+      <tr>
+        <td>4th June 2022</td><td>Antoine Dierstein</td>
+      </tr>
+      <tr>
+        <td>4th June 2022</td><td>Karl Gunnar Hammarlund</td>
+      </tr>
+      <tr>
+        <td>4th June 2022</td><td>Matthew Dinslage</td>
+      </tr>
+      <tr>
+        <td>4th June 2022</td><td>David Hall</td>
+      </tr>
+      <tr>
+        <td>27th April 2022</td><td>Matthew Dinslage</td>
+      </tr>
+      <tr>
+        <td>4th April 2022</td><td>Edward Rosenberg</td>
+      </tr>
+      <tr>
+        <td>2nd April 2022</td><td>Matthew Dinslage</td>
+      </tr>
+      <tr>
+        <td>21th March 2022</td><td>Theodore Allen</td>
+      </tr>
+      <tr>
+        <td>18th March 2022</td><td>George Nielsen</td>
+      </tr>
+      <tr>
+        <td>18th March 2022</td><td>Ioannis Anagnostakis</td>
+      </tr>
+      <tr>
+        <td>18th March 2022</td><td>Karl Gunnar Hammarlund</td>
+      </tr>
+      <tr>
+        <td>18th March 2022</td><td>Brian Lawrence</td>
+      </tr>
+      <tr>
+        <td>18th March 2022</td><td>Dane Jensen</td>
+      </tr>
+      <tr>
+        <td>18th March 2022</td><td>Matthew Dinslage</td>
+      </tr>
+      <tr>
+        <td>9th March 2022</td><td>David Trudgian</td>
+      </tr>
+      <tr>
+        <td>7th March 2022</td><td>Robert Bresaz</td>
+      </tr>
+      <tr>
+        <td>13th January 2022</td><td>Rod Ziemski</td>
+      </tr>
+      <tr>
+        <td>21st December 2021</td><td>Eric Trimmer</td>
+      </tr>
+      <tr>
+        <td>30th September 2021</td><td>Brian Lawrence</td>
+      </tr>
+      <tr>
+        <td>17th August 2021</td><td>Christoph Willing</td>
+      </tr>
+      <tr>
+        <td>14th July 2021</td><td>Brian Lawrence</td>
+      </tr>
+      <tr>
+        <td>11th July 2021</td><td>Don Boots</td>
+      </tr>
+      <tr>
+        <td>6th June 2021</td><td>Cleverson Casarin Uliana</td>
+      </tr>
+      <tr>
+        <td>30th May 2021</td><td>Klaus Gretland</td>
+      </tr>
+      <tr>
+        <td>25th May 2021</td><td>Matthew Dinslage</td>
+      </tr>
+      <tr>
+        <td>25th May 2021</td><td>Karl Bruns</td>
+      </tr>
+      <tr>
+        <td>18th May 2021</td><td>Karl Gunnar Hammarlund</td>
+      </tr>
+      <tr>
+        <td>15th May 2021</td><td>Christoph Koernig</td>
+      </tr>
+      <tr>
+        <td>20th April 2021</td><td>Anthony McKenzie</td>
+      </tr>
+      <tr>
+        <td>18th April 2021</td><td>Marcin Wolcendorf</td>
+      </tr>
+      <tr>
+        <td>10th April 2021</td><td>Christoph Kühne</td>
+      </tr>
+      <tr>
+        <td>8th April 2021</td><td>Patrick Volkerding</td>
+      </tr>
+      <tr>
+        <td>29th March 2021</td><td>Anthony McKenzie</td>
+      </tr>
+      <tr>
+        <td>7th March 2021</td><td>James Scott</td>
+      </tr>
+      <tr>
+        <td>2nd March 2021</td><td>Alain Detal</td>
+      </tr>
+      <tr>
+        <td>15th February 2021</td><td>Diniz Fernando Bortolotto Ferreira</td>
+      </tr>
+      <tr>
+        <td>22nd December 2020</td><td>Peter Christy</td>
+      </tr>
+      <tr>
+        <td>22nd December 2020</td><td>Karl Gunnar Hammarlund</td>
+      </tr>
+      <tr>
+        <td>15th December 2020</td><td>Karol Jurica</td>
+      </tr>
+      <tr>
+        <td>14th December 2020</td><td>Stanley Garvey</td>
+      </tr>
+      <tr>
+        <td>2nd October 2020</td><td>Corby Roberts</td>
+      </tr>
+      <tr>
+        <td>24th August 2020</td><td>Weber Kai</td>
+      </tr>
+      <tr>
+        <td>7th August 2020</td><td>Brian Lawrence</td>
+      </tr>
+      <tr>
+        <td>6th August 2020</td><td>Marcin Słodkiewicz</td>
+      </tr>
+      <tr>
+        <td>30th May 2020</td><td>Ahmed Abbas</td>
+      </tr>
+      <tr>
+        <td>23rd May 2020</td><td>Adam Purkrt</td>
+      </tr>
+      <tr>
+        <td>5th May 2020</td><td>Clemens Sauerzopf</td>
+      </tr>
+      <tr>
+        <td>30th April 2020</td><td>Gerard Lally</td>
+      </tr>
+      <tr>
+        <td>6th April 2020</td><td>Peter Christy</td>
+      </tr>
+      <tr>
+        <td>3rd April 2020</td><td>Tom Kosir</td>
+      </tr>
+      <tr>
+        <td>30th March 2020</td><td>jwc1936</td>
+      </tr>
+      <tr>
+        <td>13th March 2020</td><td>Gregory Guy Rozan</td>
+      </tr>
+      <tr>
+        <td>6th March 2020</td><td>Brian Lawrence</td>
+      </tr>
+      <tr>
+        <td>5th March 2020</td><td>Karl Gunnar Hammarlund</td>
+      </tr>
+      <tr>
+        <td>5th March 2020</td><td>Pierre-Philipp Braun</td>
+      </tr>
+      <tr>
+        <td>4th March 2020</td><td>Christoph Kühne</td>
+      </tr>
+      <tr>
+        <td>22nd February 2020</td><td>Aaditya Bagga</td>
+      </tr>
+      <tr>
+        <td>20th October 2019</td><td>Shuaidu Yang</td>
+      </tr>
+      <tr>
+        <td>12th October 2019</td><td>Andrew Macks</td>
+      </tr>
+      <tr>
+        <td>9th October 2019</td><td>Tapio Pätilä</td>
+      </tr>
+      <tr>
+        <td>30th August 2019</td><td>Nora's Portal</td>
+      </tr>
+      <tr>
+        <td>18th July 2019</td><td>Karl Gunnar Hammarlund</td>
+      </tr>
+      <tr>
+        <td>21st May 2019</td><td>Brian Lawrence</td>
+      </tr>
+      <tr>
+        <td>16th May 2019</td><td>Daniel Bowling</td>
+      </tr>
+      <tr>
+        <td>27th April 2019</td><td>Antoniazzi Leonardo</td>
+      </tr>
+    </tbody>
+  </table>
+  Plus anyone who has donated that may have been missed above!
+</div>
+<?php require ("footer.shtml"); ?>
diff --git a/html/errordocs/400.php b/html/errordocs/400.php
index 21623e1..811a6b8 100644
--- a/html/errordocs/400.php
+++ b/html/errordocs/400.php
@@ -1,32 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<?php require ("../includes/vars.php"); ?>
-<html>
-  <?php require ("../includes/head.php"); ?>
-  <body>
-    <center>
-      <?php require ("../includes/logo.php"); ?>
-    </center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <b class="heading">Patronage & Donations</b><br>
-          If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          <?php require ("../includes/donate.php"); ?>
-          All <a href="/html/donors.php" title="Donors">donations</a> will be gratefully received - thank you!
-        </td>
-      </tr>
-    </table>
-    <br>
-    <center>
-      <table class="header" border="0" align="center">
-        <tr>
-          <td align="center">
-            <b class="heading">400 - Bad Request</b><br>
-            The server could not understand the request.
-          </td>
-        </tr>
-      </table>
-    </center>
-  </body>
-</html>
+<?php require ("../header.php"); ?>
+</div>
+<div class="box boxmargins" id="headingbox">
+  <div id="headingtext">
+    <span class="heading bold">400 - Bad Request</span><br>
+    <span class="subheading">The server could not understand the<br>request that your browser sent.</span>
+  </div>
+</div>
+<?php require ("../footer.shtml"); ?>
diff --git a/html/errordocs/400.shtml b/html/errordocs/400.shtml
deleted file mode 100644
index 924e3da..0000000
--- a/html/errordocs/400.shtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-  <head>
-    <title>Slackware UK: 400</title>
-    <link rel="stylesheet" href="/html/index.css" type="text/css">
-    <link rel="shortcut icon" href="/html/favicon.ico">
-    <meta name="author" content="Darren 'Tadgy' Austin">
-    <meta name="description" content="Slackware UK: Search Results">
-    <meta name="keywords" content="Linux, mirror, mirrors, hosting, Slackware, Slackware64, Slackware UK, Slackware64 UK">
-    <meta name="google-site-verification" content="NrTA5svYU1fXFm6RMVkVvsCXF84mkwfKTckHfsTUyVM">
-    <meta name="msvalidate.01" content="9E9AFC7E738EB5E9FF87F0EEBE1BDE8A">
-  </head>
-  <body>
-    <center><p><a href="/" title="Slackware UK" alt="** Slackware UK **"><img src="/html/slackwareuk.png" alt="** Slackware UK **" title="Slackware UK" border=0 align=center></a></p></center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <font size="+2"><b>Patronage & donations</b></font><br>
-          If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          <table width="100%" cellpadding="5">
-            <tr>
-              <td align="center" valign="center">
-                <a href="https://gofund.me/c1434479"><img src="/html/gofundme.png" alt="GoFundMe Campaign" title="GoFundMe"></a>
-              </td>
-              <td align="center" valign="center">
-                <a href="https://www.patreon.com/slackwareUK"><img src="/html/patreon.png" alt="Patreon Page" title="Patreon"></a>
-              </td>
-              <td align="center" valign="center">
-                <a href="https://paypal.me/DonateToSlackwareUK"><img src="/html/paypal.png" alt="PayPal Donation" title="PayPal"></a>
-              </td>
-            </tr>
-          </table>
-          All <a href="/html/project_supporters.html" title="Donations" alt="Donations">donations</a>  will be gratefully received - thank you!
-        </td>
-      </tr>
-    </table>
-    <br>
-    <center>
-      <table class="header" border="0" align="center" id="title">
-        <tr>
-          <td align="center">
-            <h1>400 - Bad Request</h1>
-            The server could not understand the request.
-          </td>
-        </tr>
-      </table>
-    </center>
-    <br>
-    <hr width="90%">
-<center>
-  <b>Mirror server bandwidth utilisation</b><br>
-  <img src="/html/bwbar.png" title="<!--#include virtual='/html/bwbar.txt' -->" alt="<!--#include virtual='/html/bwbar.txt' -->" border=0>
-</center>
diff --git a/html/errordocs/401.php b/html/errordocs/401.php
index 457b5d7..e312c0f 100644
--- a/html/errordocs/401.php
+++ b/html/errordocs/401.php
@@ -1,32 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<?php require ("../includes/vars.php"); ?>
-<html>
-  <?php require ("../includes/head.php"); ?>
-  <body>
-    <center>
-      <?php require ("../includes/logo.php"); ?>
-    </center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <b class="heading">Patronage & Donations</b><br>
-          If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          <?php require ("../includes/donate.php"); ?>
-          All <a href="/html/donors.php" title="Donors">donations</a> will be gratefully received - thank you!
-        </td>
-      </tr>
-    </table>
-    <br>
-    <center>
-      <table class="header" border="0" align="center">
-        <tr>
-          <td align="center">
-            <b class="heading">401 - Unauthorised</b><br>
-            Authentication is required.
-          </td>
-        </tr>
-      </table>
-    </center>
-  </body>
-</html>
+<?php require ("../header.php"); ?>
+</div>
+<div class="box boxmargins" id="headingbox">
+  <div id="headingtext">
+    <span class="heading bold">401 - Unauthorised</span><br>
+    <span class="subheading">Authentication is required.</span>
+  </div>
+</div>
+<?php require ("../footer.shtml"); ?>
diff --git a/html/errordocs/401.shtml b/html/errordocs/401.shtml
deleted file mode 100644
index b37b472..0000000
--- a/html/errordocs/401.shtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-  <head>
-    <title>Slackware UK: 401</title>
-    <link rel="stylesheet" href="/html/index.css" type="text/css">
-    <link rel="shortcut icon" href="/html/favicon.ico">
-    <meta name="author" content="Darren 'Tadgy' Austin">
-    <meta name="description" content="Slackware UK: Search Results">
-    <meta name="keywords" content="Linux, mirror, mirrors, hosting, Slackware, Slackware64, Slackware UK, Slackware64 UK">
-    <meta name="google-site-verification" content="NrTA5svYU1fXFm6RMVkVvsCXF84mkwfKTckHfsTUyVM">
-    <meta name="msvalidate.01" content="9E9AFC7E738EB5E9FF87F0EEBE1BDE8A">
-  </head>
-  <body>
-    <center><p><a href="/" title="Slackware UK" alt="** Slackware UK **"><img src="/html/slackwareuk.png" alt="** Slackware UK **" title="Slackware UK" border=0 align=center></a></p></center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <font size="+2"><b>Patronage & donations</b></font><br>
-          If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          <table width="100%" cellpadding="5">
-            <tr>
-              <td align="center" valign="center">
-                <a href="https://gofund.me/c1434479"><img src="/html/gofundme.png" alt="GoFundMe Campaign" title="GoFundMe"></a>
-              </td>
-              <td align="center" valign="center">
-                <a href="https://www.patreon.com/slackwareUK"><img src="/html/patreon.png" alt="Patreon Page" title="Patreon"></a>
-              </td>
-              <td align="center" valign="center">
-                <a href="https://paypal.me/DonateToSlackwareUK"><img src="/html/paypal.png" alt="PayPal Donation" title="PayPal"></a>
-              </td>
-            </tr>
-          </table>
-          All <a href="/html/project_supporters.html" title="Donations" alt="Donations">donations</a>  will be gratefully received - thank you!
-        </td>
-      </tr>
-    </table>
-    <br>
-    <center>
-      <table class="header" border="0" align="center" id="title">
-        <tr>
-          <td align="center">
-            <h1>401 - Unauthorised</h1>
-            Authentication is required.
-          </td>
-        </tr>
-      </table>
-    </center>
-    <br>
-    <hr width="90%">
-<center>
-  <b>Mirror server bandwidth utilisation</b><br>
-  <img src="/html/bwbar.png" title="<!--#include virtual='/html/bwbar.txt' -->" alt="<!--#include virtual='/html/bwbar.txt' -->" border=0>
-</center>
diff --git a/html/errordocs/403.php b/html/errordocs/403.php
index af30840..bf7a942 100644
--- a/html/errordocs/403.php
+++ b/html/errordocs/403.php
@@ -1,32 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<?php require ("../includes/vars.php"); ?>
-<html>
-  <?php require ("../includes/head.php"); ?>
-  <body>
-    <center>
-      <?php require ("../includes/logo.php"); ?>
-    </center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <b class="heading">Patronage & Donations</b><br>
-          If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          <?php require ("../includes/donate.php"); ?>
-          All <a href="/html/donors.php" title="Donors">donations</a> will be gratefully received - thank you!
-        </td>
-      </tr>
-    </table>
-    <br>
-    <center>
-      <table class="header" border="0" align="center">
-        <tr>
-          <td align="center">
-            <b class="heading">403 - Forbidden</b><br>
-            You do not have permission to access this resource.
-          </td>
-        </tr>
-      </table>
-    </center>
-  </body>
-</html>
+<?php require ("../header.php"); ?>
+</div>
+<div class="box boxmargins" id="headingbox">
+  <div id="headingtext">
+    <span class="heading bold">403 - Forbidden</span><br>
+    <span class="subheading">You do not have permission to access this resource.</span>
+  </div>
+</div>
+<?php require ("../footer.shtml"); ?>
diff --git a/html/errordocs/403.shtml b/html/errordocs/403.shtml
deleted file mode 100644
index d3e1c0b..0000000
--- a/html/errordocs/403.shtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-  <head>
-    <title>Slackware UK: 403</title>
-    <link rel="stylesheet" href="/html/index.css" type="text/css">
-    <link rel="shortcut icon" href="/html/favicon.ico">
-    <meta name="author" content="Darren 'Tadgy' Austin">
-    <meta name="description" content="Slackware UK: Search Results">
-    <meta name="keywords" content="Linux, mirror, mirrors, hosting, Slackware, Slackware64, Slackware UK, Slackware64 UK">
-    <meta name="google-site-verification" content="NrTA5svYU1fXFm6RMVkVvsCXF84mkwfKTckHfsTUyVM">
-    <meta name="msvalidate.01" content="9E9AFC7E738EB5E9FF87F0EEBE1BDE8A">
-  </head>
-  <body>
-    <center><p><a href="/" title="Slackware UK" alt="** Slackware UK **"><img src="/html/slackwareuk.png" alt="** Slackware UK **" title="Slackware UK" border=0 align=center></a></p></center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <font size="+2"><b>Patronage & donations</b></font><br>
-          If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          <table width="100%" cellpadding="5">
-            <tr>
-              <td align="center" valign="center">
-                <a href="https://gofund.me/c1434479"><img src="/html/gofundme.png" alt="GoFundMe Campaign" title="GoFundMe"></a>
-              </td>
-              <td align="center" valign="center">
-                <a href="https://www.patreon.com/slackwareUK"><img src="/html/patreon.png" alt="Patreon Page" title="Patreon"></a>
-              </td>
-              <td align="center" valign="center">
-                <a href="https://paypal.me/DonateToSlackwareUK"><img src="/html/paypal.png" alt="PayPal Donation" title="PayPal"></a>
-              </td>
-            </tr>
-          </table>
-          All <a href="/html/project_supporters.html" title="Donations" alt="Donations">donations</a>  will be gratefully received - thank you!
-        </td>
-      </tr>
-    </table>
-    <br>
-    <center>
-      <table class="header" border="0" align="center" id="title">
-        <tr>
-          <td align="center">
-            <h1>403 - Forbidden</h1>
-            You do not have permission to access this resource.
-          </td>
-        </tr>
-      </table>
-    </center>
-    <br>
-    <hr width="90%">
-<center>
-  <b>Mirror server bandwidth utilisation</b><br>
-  <img src="/html/bwbar.png" title="<!--#include virtual='/html/bwbar.txt' -->" alt="<!--#include virtual='/html/bwbar.txt' -->" border=0>
-</center>
diff --git a/html/errordocs/404.php b/html/errordocs/404.php
index 3a026f5..0d42524 100644
--- a/html/errordocs/404.php
+++ b/html/errordocs/404.php
@@ -1,32 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<?php require ("../includes/vars.php"); ?>
-<html>
-  <?php require ("../includes/head.php"); ?>
-  <body>
-    <center>
-      <?php require ("../includes/logo.php"); ?>
-    </center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <b class="heading">Patronage & Donations</b><br>
-          If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          <?php require ("../includes/donate.php"); ?>
-          All <a href="/html/donors.php" title="Donors">donations</a> will be gratefully received - thank you!
-        </td>
-      </tr>
-    </table>
-    <br>
-    <center>
-      <table class="header" border="0" align="center">
-        <tr>
-          <td align="center">
-            <b class="heading">404 - Not Found</b><br>
-            The requested page or file is not found.
-          </td>
-        </tr>
-      </table>
-    </center>
-  </body>
-</html>
+<?php require ("../header.php"); ?>
+</div>
+<div class="box boxmargins" id="headingbox">
+  <div id="headingtext">
+    <span class="heading bold">404 - Not Found</span><br>
+    <span class="subheading">The requested page or file is not found.</span>
+  </div>
+</div>
+<?php require ("../footer.shtml"); ?>
diff --git a/html/errordocs/404.shtml b/html/errordocs/404.shtml
deleted file mode 100644
index 808a15b..0000000
--- a/html/errordocs/404.shtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-  <head>
-    <title>Slackware UK: 404</title>
-    <link rel="stylesheet" href="/html/index.css" type="text/css">
-    <link rel="shortcut icon" href="/html/favicon.ico">
-    <meta name="author" content="Darren 'Tadgy' Austin">
-    <meta name="description" content="Slackware UK: Search Results">
-    <meta name="keywords" content="Linux, mirror, mirrors, hosting, Slackware, Slackware64, Slackware UK, Slackware64 UK">
-    <meta name="google-site-verification" content="NrTA5svYU1fXFm6RMVkVvsCXF84mkwfKTckHfsTUyVM">
-    <meta name="msvalidate.01" content="9E9AFC7E738EB5E9FF87F0EEBE1BDE8A">
-  </head>
-  <body>
-    <center><p><a href="/" title="Slackware UK" alt="** Slackware UK **"><img src="/html/slackwareuk.png" alt="** Slackware UK **" title="Slackware UK" border=0 align=center></a></p></center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <font size="+2"><b>Patronage & donations</b></font><br>
-          If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          <table width="100%" cellpadding="5">
-            <tr>
-              <td align="center" valign="center">
-                <a href="https://gofund.me/c1434479"><img src="/html/gofundme.png" alt="GoFundMe Campaign" title="GoFundMe"></a>
-              </td>
-              <td align="center" valign="center">
-                <a href="https://www.patreon.com/slackwareUK"><img src="/html/patreon.png" alt="Patreon Page" title="Patreon"></a>
-              </td>
-              <td align="center" valign="center">
-                <a href="https://paypal.me/DonateToSlackwareUK"><img src="/html/paypal.png" alt="PayPal Donation" title="PayPal"></a>
-              </td>
-            </tr>
-          </table>
-          All <a href="/html/project_supporters.html" title="Donations" alt="Donations">donations</a>  will be gratefully received - thank you!
-        </td>
-      </tr>
-    </table>
-    <br>
-    <center>
-      <table class="header" border="0" align="center" id="title">
-        <tr>
-          <td align="center">
-            <h1>404 - Not Found</h1>
-            The requested page or file is not found.
-          </td>
-        </tr>
-      </table>
-    </center>
-    <br>
-    <hr width="90%">
-<center>
-  <b>Mirror server bandwidth utilisation</b><br>
-  <img src="/html/bwbar.png" title="<!--#include virtual='/html/bwbar.txt' -->" alt="<!--#include virtual='/html/bwbar.txt' -->" border=0>
-</center>
diff --git a/html/errordocs/405.php b/html/errordocs/405.php
index a728372..5c3ef8a 100644
--- a/html/errordocs/405.php
+++ b/html/errordocs/405.php
@@ -1,32 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<?php require ("../includes/vars.php"); ?>
-<html>
-  <?php require ("../includes/head.php"); ?>
-  <body>
-    <center>
-      <?php require ("../includes/logo.php"); ?>
-    </center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <b class="heading">Patronage & Donations</b><br>
-          If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          <?php require ("../includes/donate.php"); ?>
-          All <a href="/html/donors.php" title="Donors">donations</a> will be gratefully received - thank you!
-        </td>
-      </tr>
-    </table>
-    <br>
-    <center>
-      <table class="header" border="0" align="center">
-        <tr>
-          <td align="center">
-            <b class="heading">405 - Method Forbidden</b><br>
-            Access method is not authorised.
-          </td>
-        </tr>
-      </table>
-    </center>
-  </body>
-</html>
+<?php require ("../header.php"); ?>
+</div>
+<div class="box boxmargins" id="headingbox">
+  <div id="headingtext">
+    <span class="heading bold">405 - Method Forbidden</span><br>
+    <span class="subheading">Access method is not authorised.</span>
+  </div>
+</div>
+<?php require ("../footer.shtml"); ?>
diff --git a/html/errordocs/405.shtml b/html/errordocs/405.shtml
deleted file mode 100644
index b021d4d..0000000
--- a/html/errordocs/405.shtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-  <head>
-    <title>Slackware UK: 405</title>
-    <link rel="stylesheet" href="/html/index.css" type="text/css">
-    <link rel="shortcut icon" href="/html/favicon.ico">
-    <meta name="author" content="Darren 'Tadgy' Austin">
-    <meta name="description" content="Slackware UK: Search Results">
-    <meta name="keywords" content="Linux, mirror, mirrors, hosting, Slackware, Slackware64, Slackware UK, Slackware64 UK">
-    <meta name="google-site-verification" content="NrTA5svYU1fXFm6RMVkVvsCXF84mkwfKTckHfsTUyVM">
-    <meta name="msvalidate.01" content="9E9AFC7E738EB5E9FF87F0EEBE1BDE8A">
-  </head>
-  <body>
-    <center><p><a href="/" title="Slackware UK" alt="** Slackware UK **"><img src="/html/slackwareuk.png" alt="** Slackware UK **" title="Slackware UK" border=0 align=center></a></p></center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <font size="+2"><b>Patronage & donations</b></font><br>
-          If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          <table width="100%" cellpadding="5">
-            <tr>
-              <td align="center" valign="center">
-                <a href="https://gofund.me/c1434479"><img src="/html/gofundme.png" alt="GoFundMe Campaign" title="GoFundMe"></a>
-              </td>
-              <td align="center" valign="center">
-                <a href="https://www.patreon.com/slackwareUK"><img src="/html/patreon.png" alt="Patreon Page" title="Patreon"></a>
-              </td>
-              <td align="center" valign="center">
-                <a href="https://paypal.me/DonateToSlackwareUK"><img src="/html/paypal.png" alt="PayPal Donation" title="PayPal"></a>
-              </td>
-            </tr>
-          </table>
-          All <a href="/html/project_supporters.html" title="Donations" alt="Donations">donations</a>  will be gratefully received - thank you!
-        </td>
-      </tr>
-    </table>
-    <br>
-    <center>
-      <table class="header" border="0" align="center" id="title">
-        <tr>
-          <td align="center">
-            <h1>405 - Method Forbidden</h1>
-            Access method is not authorised.
-          </td>
-        </tr>
-      </table>
-    </center>
-    <br>
-    <hr width="90%">
-<center>
-  <b>Mirror server bandwidth utilisation</b><br>
-  <img src="/html/bwbar.png" title="<!--#include virtual='/html/bwbar.txt' -->" alt="<!--#include virtual='/html/bwbar.txt' -->" border=0>
-</center>
diff --git a/html/footer.shtml b/html/footer.shtml
index 518738b..777d678 100644
--- a/html/footer.shtml
+++ b/html/footer.shtml
@@ -1,7 +1,8 @@
-          </td>
-        </tr>
-      </table>
-    </center>
-    <?php require ("includes/bwbar.php"); ?>
+      </div>
+      <?php require ("includes/bwbar.php"); ?>
+      <div id="copyright">
+        Slackware UK logo, design and code &copy; Darren 'Tadgy' Austin
+      </div>
+    </div>
   </body>
 </html>
diff --git a/html/header.php b/html/header.php
index e12c496..2d2edae 100644
--- a/html/header.php
+++ b/html/header.php
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!DOCTYPE html>
 <?php
   require ("includes/breadcrumbs.php");
   require ("includes/vars.php");
@@ -6,121 +6,85 @@
 <html>
   <?php require ("includes/head.php"); ?>
   <body>
-    <?php if ($_SERVER['REQUEST_URI'] == "/") { ?>
-    <center>
-      <?php require ("includes/logo.php"); ?>
-      <?php require ("includes/sponsors.php"); ?>
-      <hr width="90%">
-      <table width="90%" cellspacing="5">
-        <tr>
-          <td align="left" valign="top" width="15%">
-            <b>Access:</b>
-          </td>
-          <td align="left" valign="top">
-            This service can be accessed via:<br>
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;HTTP:&nbsp;&nbsp;<a href="http://slackware.uk/" title="HTTP" alt="HTTP">http://slackware.uk/</a><br>
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;HTTPS:&nbsp;&nbsp;<a href="https://slackware.uk/" title="HTTPS" alt="HTTPS">https://slackware.uk/</a><br>
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;FTP:&nbsp;&nbsp;<a href="ftp://slackware.uk/" title="FTP" alt="FTP">ftp://slackware.uk/</a><br>
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Rsync:&nbsp;&nbsp;<a href="rsync://slackware.uk/" title="Rsync" alt="Rsync">rsync://slackware.uk/</a>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="15%">
-            <b>Notice:</b>
-          </td>
-          <td align="left" valign="top">
+    <div id="page">
+      <div id="logo">
+        <?php require ("includes/logo.php"); ?>
+      </div>
+      <?php if ($_SERVER['REQUEST_URI'] == "/") { ?>
+        <div id="sponsorship">
+          <?php require ("includes/sponsors.php"); ?>
+        </div>
+        <hr>
+        <div id="motd">
+          <div class="motdheader">
+            Access
+          </div>
+          <div class="motdcontent">
+            <span class="bold">HTTP:</span> <a href="http://slackware.uk/" title="HTTP URI">http://slackware.uk/</a><br>
+            <span class="bold">HTTPS:</span> <a href="https://slackware.uk/" title="HTTPS URI">https://slackware.uk/</a><br>
+            <span class="bold">FTP:</span> <a href="ftp://slackware.uk/" title="FTP URI">ftp://slackware.uk/</a><br>
+            <span class="bold">Rsync:</span> <a href="rsync://slackware.uk/" title="Rsync URI">rsync://slackware.uk/</a>
+          </div>
+          <div class="motdheader">
+            Notice
+          </div>
+          <div class="motdcontent">
             All connections and transfers are logged.  By accessing this service you implicitly agree to our collecting your IP address for analytics purposes.<br>
             We do not collect or hold any user identifying data, but do set a cookie in your browser for your choice of theme.<br>
             Do not use multiple concurrent connections or "make your downloads faster" applications.<br>
             Access to this service is a privilege, not a right - abusive users will be firewalled without warning.
-          </td>
-        </tr>
-   <!-- <tr>
-          <td align="left" valign="top" width="15%">
-            <b>Notice to mirrors:</b>
-          </td>
-          <td align="left" valign="top">
+          </div>
+          <!-- <div class="motdheader">
+            Notice to mirrors
+          </div>
+          <div class="motdcontent">
             If you are running a mirroring service and pulling data from multiple repositories on a regular basis, please email for access to the top-level repo - so you can pull everything in one go.  We do not operate any blacklisting or whitelisting on access to repositories at this time.
-          </td>
-        </tr> -->
-        <tr>
-          <td align="left" valign="top" width="15%">
-            <b>Mirroring requests:</b>
-          </td>
-          <td align="left" valign="top">
-            This service is primarily intended to provide a mirror service for <a href="http://www.slackware.com/" title="Slackware Linux" alt="Slackware Linux">Slackware Linux</a> based projects. If you run a Slackware based project, or have a suggestion for a project which may benefit from being mirrored here, please message with full details.
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="15%">
-            <b>Speedtest:</b>
-          </td>
-          <td align="left" valign="top">
-            Curious about the speed you might get downloading from Slackware UK?  Try the new <a href="//speedtest.slackware.uk/" title="Slackware UK Speedtest" alt="Slackware UK Speedtest">speedtest</a>!
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="15%">
-            <b>Patronage & Donations:</b>
-          </td>
-          <td align="left" valign="top">
+          </div> -->
+          <div class="motdheader">
+            Speedtest
+          </div>
+          <div class="motdcontent">
+            Curious about the speed you might get downloading from Slackware UK?  Try the new <a href="//speedtest.slackware.uk/" title="Slackware UK Speedtest">speedtest</a>!
+          </div>
+          <div class="motdheader">
+            Mirroring requests
+          </div>
+          <div class="motdcontent">
+            This service is primarily intended to provide a mirror service for <a href="http://www.slackware.com/" title="Slackware Linux">Slackware Linux</a> based projects. If you run a Slackware based project, or have a suggestion for a project which may benefit from being mirrored here, please message with full details.
+          </div>
+          <div class="motdheader">
+            Patronage & Donations
+          </div>
+          <div class="motdcontent">
             If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <!-- This cell is intentionally empty -->
-          </td>
-          <td>
             <?php require ("includes/donate.php"); ?>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <!-- This cell is intentionally empty -->
-          </td>
-          <td align="left" valign="top">
             All <a href="/html/donors.php" title="Donors">donations</a> will be gratefully received - thank you!
-          </td>
-        </tr>
-        <tr>
-          <td align="right" valign="top" colspan="2">
-            <b>Darren 'Tadgy' Austin</b><br>
-            <b>Email:</b> <a href="mailto:mirrors (at) slackware.uk" title="Send email">mirrors (at) slackware.uk</a><br>
-            <b>IRC:</b> On <a href="http://libera.chat/" title="Libera.Chat IRC Network">Libera.Chat</a>, join #slackware.uk channel or PM 'Tadgy'
-          </td>
-        </tr>
-      </table>
-    </center>
-    <br>
-    <?php } else { ?>
-    <center>
-      <?php require ("includes/logo.php"); ?>
-    </center>
-    <hr width="90%">
-    <table width="75%" cellspacing="0" align="center">
-      <tr>
-        <td align="center" valign="top">
-          <b class="heading">Patronage & Donations</b><br>
+          </div>
+          <div id="signature">
+            --<br>
+            <div class="bold">Darren 'Tadgy' Austin</div>
+            <span class="bold">Email:</span> <a href="mailto:mirrors (at) slackware.uk" title="Send email">mirrors (at) slackware.uk</a><br>
+            <span class="bold">IRC:</span> On <a href="http://libera.chat/" title="Libera.Chat IRC Network">Libera.Chat</a>, join #slackware.uk channel or PM 'Tadgy'
+          </div>
+        </div>
+      <?php } else { ?>
+        <hr>
+        <div class="notice">
+          <span class="heading bold">Patronage & Donations</span><br>
           If you use the Slackware UK services on a regular basis, and would like to contribute to running costs, make a continuing patronage (and receive special benefits), or make a one off PayPal payment, please use one of the following buttons:
           <?php require ("includes/donate.php"); ?>
           All <a href="/html/donors.php" title="Donors">donations</a> will be gratefully received - thank you!
-        </td>
-      </tr>
-      <?php if (preg_match (":^/slackware/slackware-iso/.*:", $_SERVER['REQUEST_URI'])) { ?>
-      <tr>
-        <td align="center" valign="top">
-          <hr width="100%">
-          <b class="heading">A Faster Way to Download Slackware Linux ISOs</b><br>
-          Slackware UK now offers a <a href="https://seedbox.slackware.uk/" title="Bittorrent seeding service">Bittorrent seeding service</a> which may allow you to download the Slackware ISOs at a much faster speed (<b>especially immediately following a new stable release</b>) - all that is required is a Bittorrent client.
-        </td>
-      </tr>
+        </div>
+        <?php if (preg_match (":^/slackware/slackware-iso/.*:", $_SERVER['REQUEST_URI'])) { ?>
+          <hr>
+          <div class="notice">
+            <span class="heading bold">A Faster Way to Download Slackware Linux ISOs</span><br>
+            Slackware UK now offers a <a href="//seedbox.slackware.uk/" title="Bittorrent Seedbox">Bittorrent seeding service</a> which may allow you to download the Slackware ISOs at a much faster speed (<span class="bold">especially immediately following a new stable release</span>) - all that is required is a Bittorrent client.
+          </div>
+        <?php }
+      }
+      require ("includes/search-breadcrumbs-theme.php");
+      if (! preg_match (":^/((html/)?donors.php|(html/)?s(\.shtml)?(\?.*)?|(html/)?search(\.shtml)?(\?.*))$:", $_SERVER['REQUEST_URI']) && ! preg_match (":^4..$:", $_SERVER['REDIRECT_STATUS'])) {
+      ?>
+        <div class="box boxpadding">
       <?php } ?>
-    </table>
-    <br><br>
-    <?php } ?>
-    <?php if (! preg_match (":^/(html/)?s(earch)?(\.shtml)?:", $_SERVER['REQUEST_URI'])) { require ("includes/breadcrumbs-search-theme.php"); } ?>
-    <center>
-      <table width="90%" cellspacing="5">
-        <tr>
-          <td>
diff --git a/html/includes/breadcrumbs-search-theme.php b/html/includes/breadcrumbs-search-theme.php
deleted file mode 100644
index 44fb376..0000000
--- a/html/includes/breadcrumbs-search-theme.php
+++ /dev/null
@@ -1,25 +0,0 @@
-    <table width="90%" align="center" cellspacing="5">
-      <?php if (! preg_match (":^/$:", $_SERVER['REQUEST_URI'])) { ?>
-      <tr>
-        <td class="navbar" align="center" valign="bottom" colspan="3">
-          <code class="breadcrumbs">
-            <?php print (breadcrumbs(' &raquo; ', 'Index')); ?>
-          </code>
-        </td>
-      </tr>
-      <?php } ?>
-      <tr>
-        <td class="search" align="right" valign="center">
-          <form action="/search">
-            <input type="hidden" name="p" value="<?php print "$_SERVER[REQUEST_URI]" ?>">
-            <input class="searchinput" title="Search" alt="Search" type="text" name="q" placeholder="Search" autocomplete="on" required>
-          </form>
-        </td>
-        <td width="100%">
-          <!-- This cell is intentionally empty -->
-        </td>
-        <td class="search" align="left" valign="center">
-          <a href="/html/toggletheme.php" title="Toggle Theme"><img src="/html/toggletheme.png" title="Toggle Theme" alt="Toggle Theme Button"></a>
-        </td>
-      </tr>
-    </table>
diff --git a/html/includes/bwbar.php b/html/includes/bwbar.php
index c41b974..dc942f2 100644
--- a/html/includes/bwbar.php
+++ b/html/includes/bwbar.php
@@ -1,9 +1,8 @@
-    <?php require "includes/vars.php"; ?>
-    <center>
-      <b>Mirror server bandwidth utilisation</b><br>
-      <?php if ($light) { ?>
-      <img src="/html/bwbar-light.png" width="804" height="12" title="<!--#include virtual='/html/bwbar.txt' -->" alt="Bandwidth graph measuring <!--#include virtual='/html/bwbar.txt' -->" border="0">
-      <?php } else { ?>
-      <img src="/html/bwbar-dark.png" width="804" height="12" title="<!--#include virtual='/html/bwbar.txt' -->" alt="Bandwidth graph measuring <!--#include virtual='/html/bwbar.txt' -->" border="0">
-      <?php } ?>
-    </center>
+<div id="bwbar">
+  <span class="bold">Mirror server bandwidth utilisation</span><br>
+  <?php if ($_COOKIE['theme'] == "light") { ?>
+    <img src="/html/bwbar-light.png" title="<!--#include virtual='/html/bwbar.txt' -->" alt="Bandwidth graph measuring <!--#include virtual='/html/bwbar.txt' -->">
+  <?php } else { ?>
+    <img src="/html/bwbar-dark.png" title="<!--#include virtual='/html/bwbar.txt' -->" alt="Bandwidth graph measuring <!--#include virtual='/html/bwbar.txt' -->">
+  <?php } ?>
+</div>
diff --git a/html/includes/donate.php b/html/includes/donate.php
index cdca34b..25e1d96 100644
--- a/html/includes/donate.php
+++ b/html/includes/donate.php
@@ -1,22 +1,9 @@
-            <table width="100%" cellpadding="5">
-              <tr>
-           <!-- <td align="center" valign="center">
-                  <a href="https://gofund.me/c1434479" title="GoFundMe"><img src="/html/gofundme.png" title="GoFundMe" alt="GoFundMe Logo"></a>
-                </td> -->
-                <?php if ($light) { ?>
-                <td align="center" valign="center">
-                  <a href="https://www.patreon.com/slackwareUK" title="Patreon"><img src="/html/patreon-black.png" title="Patreon" alt="Patreon Logo"></a>
-                </td>
-                <td align="center" valign="center">
-                  <a href="https://paypal.me/DonateToSlackwareUK" title="PayPal"><img src="/html/paypal-black.png" title="PayPal" alt="PayPal Logo"></a>
-                </td>
-                <?php } else { ?>
-                <td align="center" valign="center">
-                  <a href="https://www.patreon.com/slackwareUK" title="Patreon"><img src="/html/patreon-white.png" title="Patreon" alt="Patreon Logo"></a>
-                </td>
-                <td align="center" valign="center">
-                  <a href="https://paypal.me/DonateToSlackwareUK" title="PayPal"><img src="/html/paypal-white.png" title="PayPal" alt="PayPal Logo"></a>
-                </td>
-                <?php } ?>
-              </tr>
-            </table>
+<div id="donatebuttons">
+  <?php if ($_COOKIE['theme'] == "light") { ?>
+    <a class="donatebutton" href="https://www.patreon.com/slackwareUK" title="Patreon"><img src="/html/patreon-black.png" title="Patreon" alt="Patreon Logo"></a>
+    <a class="donatebutton" href="https://paypal.me/DonateToSlackwareUK" title="PayPal"><img src="/html/paypal-black.png" title="PayPal" alt="PayPal Logo"></a>
+  <?php } else { ?>
+    <a class="donatebutton" href="https://www.patreon.com/slackwareUK" title="Patreon"><img src="/html/patreon-white.png" title="Patreon" alt="Patreon Logo"></a>
+    <a class="donatebutton" href="https://paypal.me/DonateToSlackwareUK" title="PayPal"><img src="/html/paypal-white.png" title="PayPal" alt="PayPal Logo"></a>
+  <?php } ?>
+</div>
diff --git a/html/includes/head.php b/html/includes/head.php
index 967304b..f0f92a0 100644
--- a/html/includes/head.php
+++ b/html/includes/head.php
@@ -1,14 +1,14 @@
-  <head>
-    <?php if ($light) { ?>
+<head>
+  <?php if ($_COOKIE['theme'] == "light") { ?>
     <link rel="stylesheet" href="/html/light.css" type="text/css">
-    <?php } else { ?>
+  <?php } else { ?>
     <link rel="stylesheet" href="/html/dark.css" type="text/css">
-    <?php } ?>
-    <link rel="shortcut icon" href="/html/favicon.ico">
-    <meta name="author" content="Darren 'Tadgy' Austin">
-    <meta name="description" content="<?php print ($description); ?>">
-    <meta name="keywords" content="<?php print ($keywords); ?>">
-    <meta name="google-site-verification" content="NrTA5svYU1fXFm6RMVkVvsCXF84mkwfKTckHfsTUyVM">
-    <meta name="msvalidate.01" content="9E9AFC7E738EB5E9FF87F0EEBE1BDE8A">
-    <?php print ("<title>" . $titleprefix . $title . "</title>" . "\n"); ?>
-  </head>
+  <?php } ?>
+  <link rel="shortcut icon" href="/html/favicon.ico">
+  <meta name="author" content="Darren 'Tadgy' Austin">
+  <meta name="description" content="<?php print ($description); ?>">
+  <meta name="keywords" content="<?php print ($keywords); ?>">
+  <meta name="google-site-verification" content="NrTA5svYU1fXFm6RMVkVvsCXF84mkwfKTckHfsTUyVM">
+  <meta name="msvalidate.01" content="9E9AFC7E738EB5E9FF87F0EEBE1BDE8A">
+  <title><?php print ($titleprefix . $title); ?></title>
+</head>
diff --git a/html/includes/logo.php b/html/includes/logo.php
index 2484d28..7333f43 100644
--- a/html/includes/logo.php
+++ b/html/includes/logo.php
@@ -1,5 +1,5 @@
-      <?php if ($light) { ?>
-      <p><a href="/" title="Slackware UK"><img src="/html/slackwareuk-black.png" title="Slackware UK" alt="Slackware UK Logo" border=0 align=center></a></p>
-      <?php } else { ?>
-      <p><a href="/" title="Slackware UK"><img src="/html/slackwareuk-white.png" title="Slackware UK" alt="Slackware UK Logo" border=0 align=center></a></p>
-      <?php } ?>
+<?php if ($_COOKIE['theme'] == "light") { ?>
+  <a href="/" title="Slackware UK"><img src="/html/slackwareuk-black.png" title="Slackware UK" alt="Slackware UK Logo"></a>
+<?php } else { ?>
+  <a href="/" title="Slackware UK"><img src="/html/slackwareuk-white.png" title="Slackware UK" alt="Slackware UK Logo"></a>
+<?php } ?>
diff --git a/html/includes/search-breadcrumbs-theme.php b/html/includes/search-breadcrumbs-theme.php
new file mode 100644
index 0000000..392261f
--- /dev/null
+++ b/html/includes/search-breadcrumbs-theme.php
@@ -0,0 +1,25 @@
+<div id="searchbreadcrumbstheme">
+  <?php if (! preg_match (":^/((html/)?donors.php|(html/)?s(\.shtml)?(\?.*)?|(html/)?search(\.shtml)?(\?.*))$:", $_SERVER['REQUEST_URI']) && ! preg_match (":^4..$:", $_SERVER['REDIRECT_STATUS'])) { ?>
+    <div class="box boxmargins" id="search">
+      <form action="/search">
+        <input type="hidden" name="p" value="<?php print "$_SERVER[REQUEST_URI]" ?>">
+        <input class="searchinput" title="Search" type="text" name="q" placeholder="Search" autocomplete="on" required>
+        <input type="submit" hidden>
+      </form>
+    </div>
+  <?php } else { ?>
+    <div></div>
+  <?php } ?>
+  <?php if (! preg_match (":^/((html/)?donors.php|(html/)?s(\.shtml)?(\?.*)?|(html/)?search(\.shtml)?(\?.*))?$:", $_SERVER['REQUEST_URI']) && ! preg_match (":^4..$:", $_SERVER['REDIRECT_STATUS'])) { ?>
+    <div class="box boxmargins" id="breadcrumbs">
+      <div id="breadcrumbstext">
+        <?php print (breadcrumbs(' &raquo; ', 'Index')); ?>
+      </div>
+    </div>
+  <?php } else { ?>
+    <div></div>
+  <?php } ?>
+  <div class="box boxmargins" id="themetoggle">
+    <span id="themetoggletext">Toggle&nbsp;theme:</span><a href="/html/toggletheme.php" title="Toggle Theme"><img id="themetoggleimg" src="/html/toggletheme.png" title="Toggle Theme" alt="Toggle Theme Button"></a>
+  </div>
+</div>
diff --git a/html/includes/sponsors.php b/html/includes/sponsors.php
index 822cbbf..495c00c 100644
--- a/html/includes/sponsors.php
+++ b/html/includes/sponsors.php
@@ -1,13 +1,16 @@
-      <p>
-        <b>is kindly sponsored by:</b>
-        <div align="center">
-          <a href="http://mailg.ukservers.com/c/eJxVjDkOwyAQAF8DJYLlLijS-B8LbGTLdhKBE5TfhzajKUdTk0fnNN8SSADplVETAGFUVqWCCmBiDETMyPfeqX2odVGeJ18TeQXag9W2uoAaCLyNeC9GZp-drfxI63W9OtM3Bst0jCH-Jy31b8d6bo_57weWfWCjGf0AmK0uIA" title="UK Servers"><img src="/html/ukservers.png" title="UK Servers" alt="UK Servers Logo" border="0" align="center" hspace="50"></a>
-          <?php if ($light) { ?>
-          <a href="http://www.uk2.net/" title="UK2"><img src="/html/uk2-black.png" title="UK2" alt="UK2 Logo" border="0" align="center" hspace="50"></a>
-          <?php } else { ?>
-          <a href="http://www.uk2.net/" title="UK2"><img src="/html/uk2-white.png" title="UK2" alt="UK2 Logo" border="0" align="center" hspace="50"></a>
-          <?php } ?>
-        </div>
-        <br>
-        <b>Please take a moment to visit the sponsors using the links above!</b>
-      </p>
+is kindly sponsored by:
+<div class="sponsor">
+  <a href="http://mailg.ukservers.com/c/eJxVjDkOwyAQAF8DJYLlLijS-B8LbGTLdhKBE5TfhzajKUdTk0fnNN8SSADplVETAGFUVqWCCmBiDETMyPfeqX2odVGeJ18TeQXag9W2uoAaCLyNeC9GZp-drfxI63W9OtM3Bst0jCH-Jy31b8d6bo_57weWfWCjGf0AmK0uIA" title="UK Servers"><img src="/html/ukservers.png" title="UK Servers" alt="UK Servers Logo"></a>
+</div>
+<!--
+<?php if ($_COOKIE['theme'] == "light") { ?>
+<div class="sponsor">
+  <a href="http://www.uk2.net/" title="UK2"><img src="/html/uk2-black.png" title="UK2" alt="UK2 Logo"></a>
+</div>
+<?php } else { ?>
+<div class="sponsor">
+  <a href="http://www.uk2.net/" title="UK2"><img src="/html/uk2-white.png" title="UK2" alt="UK2 Logo"></a>
+</div>
+<?php } ?>
+-->
+Please take a moment to visit the sponsor using the link above!
diff --git a/html/includes/vars.php b/html/includes/vars.php
index 7c60d9d..78db42d 100644
--- a/html/includes/vars.php
+++ b/html/includes/vars.php
@@ -189,10 +189,4 @@
     $description = "UK Slackware Linux and Slackware based project hosting & mirror service";
     $keywords = "Slackware Linux, Slackware mirror, Slackware mirrors, Slackware hosting, Slackware, Slackware64, Slackware UK, Slackware64 UK";
   }
-
-  if ($_COOKIE['theme'] == "light") {
-    $light = true;
-  } else {
-    $light = false;
-  }
 ?>
diff --git a/html/light.css b/html/light.css
index 2753152..63caab4 100644
--- a/html/light.css
+++ b/html/light.css
@@ -13,110 +13,269 @@ a:hover {
 }
 
 body {
-  background-image: url("/html/circuit-light.png");
   background-color: #ffffff;
+  background-image: url("/html/circuit-light.png");
   color: #000000;
-  margin-left: 15px;
-  margin-right: 15px;
-}
-
-form {
-  margin-left: 0;
-  margin-right: 0;
-  margin-top: 0;
-  margin-bottom: 0;
+  padding-top: 15px;
 }
 
 hr {
-  height: 2px;
-  border-width: 0;
-  color: #070707;
   background-color: #070707;
+  border: 0;
+  color: #070707;
+  height: 2px;
+}
+    
+img {
+  border: 0;
 }
 
 pre {
+  font-size: 15px;
+}
+
+pre img {
+  vertical-align: bottom;
+}
+
+table {
+  margin-bottom: 5px;
+  margin-left: 5px;
+  margin-right: 5px;
+  margin-top: 5px;
+  width: 100%;
+}
+
+table, td {
+  border: 1px solid;
+  border-collapse: collapse;
+  color: #070707;
+}
+
+td {
+  padding-bottom: 5px;
+  padding-left: 5px;
+  padding-right: 5px;
+  padding-top: 5px;
+}
+
+
+.bold {
+  font-weight: bold;
+}
+
+.box {
   background: #f0f0f0;
   border: 2px solid #070707;
-  padding-left: 20;
-  padding-right: 20;
   box-shadow: 10px 10px 10px -5px rgba(0,0,0,0.5);
+  overflow-x: auto;
+}
+
+.boxmargins {
+  margin-bottom: 10px;
+}
+
+.boxpadding {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+
+.donatebutton {
+  margin-left: 100px;
+  margin-right: 100px;
 }
 
 .heading {
   font-size: 200%;
 }
 
+.motdcontent {
+}
+
+.motdheader {
+  font-weight: bold;
+  text-decoration: underline;
+}
+
+.notice {
+  display: block;
+  margin-left: auto;
+  margin-bottom: 25px;
+  margin-right: auto;
+  text-align: center;
+  width: 70%;
+}
+
+.searchinput {
+  background-color: #f0f0f0;
+  border: 0;
+  color: #000000;
+  font-size: 15px;
+  height: 15px;
+  outline: 0;
+  margin-left: 25px;
+  margin-right: 5px;
+}
+
+.searchresultsinput {
+  border: 1px;
+  border-color: #000000;
+  border-style: solid;
+  width: 500px;
+}
+
+.sponsor {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+
 .subheading {
   font-size: 125%;
 }
 
-.breadcrumbs {
-  font-size: 150%;
-  background: #f0f0f0;
-  border: 2px solid #070707;
-  padding-left: 10;
-  padding-top: 2;
-  padding-right: 10;
-  padding-bottom: 2;
-  box-shadow: 10px 10px 10px -5px rgba(0,0,0,0.5);
+.underline {
+  text-decoration: underline;
 }
 
-.header {
-  background: #F0F0F0;
-  border: 2px solid #777;
-  margin: 20;
-  padding-left: 10;
-  padding-top: 10;
-  padding-right: 10;
-  padding-bottom: 10;
-  box-shadow: 10px 10px 10px -5px rgba(0,0,0,0.5);
+
+#breadcrumbs {
+  align-self: end;
+  display: flex;
+  min-height: 25px;
+  margin-left: auto;
+  margin-right: auto;
 }
 
-.navbar {
+#breadcrumbstext {
+  align-content: center;
+  font-size: 15px;
+  text-align: center;
+  margin-left: 5px;
+  margin-right: 5px;
+}
+
+#bwbar {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 30px;
+  text-align: center;
   width: 100%;
+}
+
+#copyright {
+  font-size: 10px;
   text-align: center;
 }
 
-.search {
-  background: #f0f0f0;
-  border: 2px solid #070707;
-  box-shadow: 10px 10px 10px -5px rgba(0,0,0,0.5);
+#donatebuttons {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  margin-bottom: 10px;
+  margin-top: 20px;
 }
 
-.searchinput {
-  border: none;
-  background: #f0f0f0;
-  outline: none;
-  color: #000000;
-  font-size: 11px;
-  box-sizing: border-box;
-  padding-left: 10;
-  padding-top: 2;
-  padding-right: 10;
-  padding-bottom: 2;
+#headingbox {
+  margin-left: auto;
+  margin-right: auto;
+  width: fit-content;
+}
+
+#headingtext {
+  text-align: center;
+  margin-bottom: 5px;
+  margin-left: 5px;
+  margin-right: 5px;
+  margin-top: 5px;
+}
+
+#donorslistbox {
+  margin-left: auto;
+  margin-right: auto;
+  width: 70%;
+  text-align: center;
+}
+
+#donorstable {
+}
+
+#logo {
+  display: flex;
+  justify-content: center;
+  margin-bottom: 30px;
+  width: 100%;
+}
+
+#motd {
+  column-gap: 40px;
+  display: grid;
+  grid-template-columns: auto auto;
+  margin-left: 30px;
+  margin-right: 30px;
+  row-gap: 15px;
+  text-align: left;
+}
+
+#page {
+  margin-left: auto;
+  margin-right: auto;
+  width: 90%;
+}
+
+#search {
+  align-content: center;
+  align-self: end;
   background-color: #f0f0f0;
   background-image: url('/html/search-black.png');
-  background-size: 15px 15px;
-  background-position: 2px 2px;
+  background-position: 5px 5px;
   background-repeat: no-repeat;
-  padding-left: 20px;
+  background-size: 15px 15px;
+  height: 25px;
+  margin-left: 0;
+  margin-right: auto;
+  max-height: 25px;
 }
 
-.searchresults {
-  background: #f0f0f0;
-  border: 2px solid #070707;
-  padding-left: 20;
-  padding-right: 20;
-  box-shadow: 10px 10px 10px -5px rgba(0,0,0,0.5);
+#searchbreadcrumbstheme {
+  display: grid;
+  column-gap: 50px;
+  grid-template-columns: auto auto auto;
 }
 
-.sponsorslist {
-  background: #F0F0F0;
-  border: 2px solid #777;
-  margin: 20;
-  padding-left: 10;
-  padding-top: 10;
-  padding-right: 10;
-  padding-bottom: 10;
-  box-shadow: 10px 10px 10px -5px rgba(0,0,0,0.5);
+#signature {
+  grid-column-start: 1;
+  grid-column-end: 3;
+  margin-bottom: 50px;
+  text-align: right;
+}
+
+#sponsorship {
+  font-weight: bold;
+  margin-bottom: 20px;
+  text-align: center;
+}
+
+#themetoggle {
+  align-self: end;
+  display: flex;
+  height: 25px;
+  margin-left: auto;
+  margin-right: 0;
+  max-height: 25px;
+  text-align: right;
+}
+
+#themetoggleimg {
+  height: 15px;
+  margin-right: 5px;
+  vertical-align: middle;
+}
+
+#themetoggletext {
+  align-content: center;
+  color: #000000;
+  font-size: 15px;
+  margin-left: 5px;
+  margin-right: 5px;
 }
diff --git a/html/old/binary.png b/html/old/binary.png
deleted file mode 100644
index 7660d4d..0000000
Binary files a/html/old/binary.png and /dev/null differ
diff --git a/html/old/fileaway.png b/html/old/fileaway.png
deleted file mode 100644
index 84331f8..0000000
Binary files a/html/old/fileaway.png and /dev/null differ
diff --git a/html/old/gofundme.png b/html/old/gofundme.png
deleted file mode 100644
index f3d4176..0000000
Binary files a/html/old/gofundme.png and /dev/null differ
diff --git a/html/search.shtml b/html/search.shtml
index c814857..ef09ef4 100644
--- a/html/search.shtml
+++ b/html/search.shtml
@@ -3,114 +3,117 @@
 
   /* Output an error box */
   function writeerror (string $message, bool $link) {
-    print ("<center>");
-    print ("  <table class=\"header\" align=\"center\">");
-    print ("    <tr>");
-    print ("      <td align=\"center\">");
-    print ("        <b class=\"subheading\">$message</b>");
+?>
+    <div class="box boxmargins" id="headingbox">
+      <div id="headingtext">
+        <span class="heading bold">Search Error</span><br><br>
+        <span class="subheading"><?php print ($message); ?></span>
+<?php
     if ($link == true) {
-      printf ("       <br>Click <a href=\"https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]\" title=\"Retry Search\">here</a> to retry your search.");
+?>
+        <br><br>Click <a href="//<?php print ("$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"); ?>" title="Retry search">here</a> to retry your search.
+<?php
     }
-    print ("      </td>");
-    print ("    </tr>");
-    print ("  </table>");
-    print ("</center>");
-    print ("<br>");
+?>
+      </div>
+    </div>
+<?php
   }
 
   /* Construct the url */
-  $url = "https://slackware.uk/cgi-bin/searchapi.cgi?";
+  if (isset ($_SERVER["HTTPS"])) {
+    $url = "https://";
+  } else {
+    $url = "http://";
+  }  
+  $url .= $_SERVER["HTTP_HOST"] . "/cgi-bin/searchapi.cgi?";
   if (isset ($_GET[l])) {
-    $url = $url . "l=$_GET[l]&";
+    $url .= "l=" . urlencode ($_GET["l"]) . "&";
   }
   if (isset ($_GET[p])) {
-    $url = $url . "p=$_GET[p]&";
+    $url .= "p=" . urlencode ($_GET["p"]) . "&";
   } else {
-    $url = $url . "p=/&";
+    $url .= "p=%2F&";
   }
   if (isset ($_GET[q])) {
-    $url = $url . "q=" . str_replace (" ", "+", $_GET[q]);
+    $url .= "q=" . urlencode ($_GET["q"]);
   } else {
-    $url = $url . "q=";
+    $url .= "q=";
   }
 
   /* Query the search API */
   if ($fh = fopen ($url, "r")) {
     /* Read and extract the status number */
-    $status_line = stream_get_line ($fh, 0, "\n");
+    $status_line = stream_get_line ($fh, 0, "\0");
     $status = explode (":", $status_line);
+
+    /* Process the status code and output content */
     if ($status[1] == "0") {
 ?>
-    <center>
-      <table class="header" align="center">
-        <tr>
-          <td align="center">
-            <b class="heading">Search Results</b><br><br>
-            <b class="subheading">Search query: <?php print ($_GET["q"]) ?></b><br>
-            Searches may contain multiple terms, include (basic) globs,<br>
-            and descend down from the current directory.
-          </td>
-        </tr>
-      </table>
-    </center>
-    <table width="90%" align="center" cellspacing="15">
-      <tr>
-        <td class="search" align="right" valign="center">
+<div class="box boxmargins" id="headingbox">
+  <div id="headingtext">
+    <span class="heading bold">Search Results</span><br>
+    <div class="subheading">
+      Searches may contain multiple terms, include globs (<code>man 7 <a href="https://man7.org/linux/man-pages/man7/glob.7.html" title="glob man pageg">glob</a></code>)<br>
+      and descend down from the current directory.<br><br>
+      <span class="bold">Adjust search:</span>
+      <div style="display: flex; justify-content: center;">
+        <div style="text-align: right;">
           <form action="/search">
-            <input type="hidden" name="p" value="<?php print ($_GET["p"]) ?>">
-            <input class="searchinput" title="Search" alt="Search Box" type="text" name="q" value="<?php print ($_GET["q"]) ?>" autocomplete="on" required>
+            <span class="bold">Search path:</span>
+            <input class="searchinput searchresultsinput" title="Search Path" type="text" name="p" value="<?php print ($_GET["p"]); ?>" autocomplete="on" required><br>
+            <span class="bold">Search query:</span>
+            <input class="searchinput searchresultsinput" title="Search Query" type="text" name="q" value="<?php print ($_GET["q"]); ?>" autocomplete="on" required>
+            <input type="submit" hidden>
           </form>
-        </td>
-        <td width="100%">
-          <!-- This cell is intentionally empty -->
-        </td>
-        <td class="search" align="left" valign="center">
-          <a href="/html/toggletheme.php" title="Toggle Theme" alt="Toggle Theme"><img src="/html/toggletheme.png" title="Toggle Theme" alt="Toggle Theme"></a>
-        </td>
-      </tr>
-      <tr>
-        <td class="searchresults" colspan="3">
-          <hr>
-          <code>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<br>
+<div class="box boxmargins boxpadding" id="searchresultsbox">
+  <hr>
+  <code>
 <?php
-      /* Read the results and turn into urls */
       $count = 0;
-      while ($result_line = stream_get_line ($fh, 0, "\n")) {
+
+      /* Read the results and turn them into urls */
+      while ($result_line = stream_get_line ($fh, 0, "\0")) {
         $type = strtok ($result_line, " ");
-        $entry = strtok ("\n");
+        $entry = strtok ("\0");
         if ($type == "f" || $type == "l" || $type == "o") {
           print ("&bull; <a href=\"$entry\" title=\"View $entry\">$entry</a><br>");
           $count++;
         } elseif ($type == "d") {
-          print ("&bull; <a href=\"$entry\" title=\"Directory $entry\">$entry</a>&nbsp;(<a href=\"/search?l=$_GET[l]&p=$entry&q=" . str_replace (" ", "+", $_GET[q]) . "\" title=\"Repeat search in this directory\">Repeat search in this directory</a>)<br>");
+          print ("&bull; <a href=\"$entry\" title=\"Directory $entry\">$entry</a>&nbsp;(<a href=\"/search?l=$_GET[l]&p=$entry&q=" . urlencode ($_GET[q]) . "\" title=\"Repeat search in this directory\">Repeat search in this directory</a>)<br>");
           $count++;
         }
       }
+
       /* Output a total */
       if ($count == 0) {
-        print ("            No results - try to widen your search.");
+        print ("No results - try to widen your search.");
       } elseif ($count == 1) {
-        print ("           " . $count . " result found.");
+        print ("1 result found.");
       } else {
-        print ("           " . $count . " results found.");
+        print ($count . " results found.");
       }
 ?>
-          </code>
-          <hr>
-        </td>
-      </tr>
-    </table>
+  </code>
+  <hr>
+</div>
 <?php
     } else {
       /* The status line indicates an error */
-      $error_line = stream_get_line ($fh, 0, "\n");
+      $error_line = stream_get_line ($fh, 0, "\0");
       $error = explode (":", $error_line);
       if ($status[1] == 1) {
         writeerror ($error[1], true);
       } elseif ($status[1] == 2) {
         writeerror ($error[1], false);
       } else {
-        writeerror ("An unexpected error occured", false);
+        writeerror ("An unexpected error occured!", false);
       }
     }
   } else {
diff --git a/html/toggletheme.php b/html/toggletheme.php
index df15315..aedcbbb 100644
--- a/html/toggletheme.php
+++ b/html/toggletheme.php
@@ -1,13 +1,12 @@
 <?php
-  require ("includes/vars.php");
   $cookie_data = array(
-    "expires" => "Tue, 31 Dec 2069 23:59:59 GMT",
+    "expires" => mktime (23, 59, 59, 12, 31, 2069),
     "domain" => ".slackware.uk",
     "path" => "/",
     "httponly" => true,
     "samesite" => "Lax"
   );
-  if (!$light) {
+  if ($_COOKIE['theme'] != "light") {
     $theme = "light";
   } else {
     $theme = "dark";
diff --git a/html/uk2-black.png b/html/uk2-black.png
deleted file mode 100644
index 6b4fe53..0000000
Binary files a/html/uk2-black.png and /dev/null differ
diff --git a/html/uk2-white.png b/html/uk2-white.png
deleted file mode 100644
index d81be41..0000000
Binary files a/html/uk2-white.png and /dev/null differ