diff --git a/html/footer.shtml b/html/footer.shtml
index 018c4c8..777d678 100644
--- a/html/footer.shtml
+++ b/html/footer.shtml
@@ -1,5 +1,4 @@
       </div>
-      <?php require ("includes/vars.php"); ?>
       <?php require ("includes/bwbar.php"); ?>
       <div id="copyright">
         Slackware UK logo, design and code &copy; Darren 'Tadgy' Austin
diff --git a/html/includes/bwbar.php b/html/includes/bwbar.php
index 145569c..dc942f2 100644
--- a/html/includes/bwbar.php
+++ b/html/includes/bwbar.php
@@ -1,6 +1,6 @@
 <div id="bwbar">
   <span class="bold">Mirror server bandwidth utilisation</span><br>
-  <?php if ($light) { ?>
+  <?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' -->">
diff --git a/html/includes/donate.php b/html/includes/donate.php
index 49b4b0a..3fcd857 100644
--- a/html/includes/donate.php
+++ b/html/includes/donate.php
@@ -1,5 +1,5 @@
 <div id="donatebuttons">
-  <?php if ($light) { ?>
+  <?php if ($_COOKIE['theme'] == "light") { ?>
     <a href="https://www.patreon.com/slackwareUK" title="Patreon"><img src="/html/patreon-black.png" title="Patreon" alt="Patreon Logo"></a>
     <a href="https://paypal.me/DonateToSlackwareUK" title="PayPal"><img src="/html/paypal-black.png" title="PayPal" alt="PayPal Logo"></a>
   <?php } else { ?>
diff --git a/html/includes/head.php b/html/includes/head.php
index 99aa4e3..ba86a77 100644
--- a/html/includes/head.php
+++ b/html/includes/head.php
@@ -1,5 +1,5 @@
 <head>
-  <?php if ($light) { ?>
+  <?php if ($_COOKIE['theme'] == "light") { ?>
     <link rel="stylesheet" href="/html/light.css" type="text/css">
   <?php } else { ?>
     <link rel="stylesheet" href="/html/dark.css" type="text/css">
diff --git a/html/includes/logo.php b/html/includes/logo.php
index 8cf8db9..7333f43 100644
--- a/html/includes/logo.php
+++ b/html/includes/logo.php
@@ -1,4 +1,4 @@
-<?php if ($light) { ?>
+<?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>
diff --git a/html/includes/sponsors.php b/html/includes/sponsors.php
index 1bec34a..495c00c 100644
--- a/html/includes/sponsors.php
+++ b/html/includes/sponsors.php
@@ -3,7 +3,7 @@ is kindly sponsored by:
   <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 ($light) { ?>
+<?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>
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/toggletheme.php b/html/toggletheme.php
index df15315..703a752 100644
--- a/html/toggletheme.php
+++ b/html/toggletheme.php
@@ -7,7 +7,7 @@
     "httponly" => true,
     "samesite" => "Lax"
   );
-  if (!$light) {
+  if ($_COOKIE['theme'] != "light") {
     $theme = "light";
   } else {
     $theme = "dark";
