diff --git a/footer.php b/footer.php
index e69de29..8b13789 100644
--- a/footer.php
+++ b/footer.php
@@ -0,0 +1 @@
+
diff --git a/head.php b/head.php
index 5ab2d1d..9577681 100644
--- a/head.php
+++ b/head.php
@@ -1,18 +1,31 @@
-<meta name="viewport" content="initial-scale=1, width=device-width" />
+<?php
+    function renderHead()
+    {
+        ?>
 
-<link rel="stylesheet" href="/files/bootstrap-5.3.8-dist/css/bootstrap.min.css" />
-<link rel="stylesheet" href="/files/fontawesome-free-7.0.0-web/css/all.min.css" />
+            <meta name="viewport" content="initial-scale=1, width=device-width" />
 
-<script src="/files/jquery-3.7.1.min.js"></script>
-<script src="/files/bootstrap-5.3.8-dist/js/bootstrap.min.js"></script>
-<script src="/files/fontawesome-free-7.0.0-web/js/all.min.js"></script>
-<script src="/files/datatables-2.3.3/datatables.min.js"></script>
-<script src="/files/moment-2.30.1.js"></script>
+            <link rel="stylesheet" href="/files/bootstrap-5.3.8-dist/css/bootstrap.min.css" />
+            <link rel="stylesheet" href="/files/fontawesome-free-7.0.0-web/css/all.min.css" />
 
-<script src="/js/Extensions.js"></script>
+            <script src="/files/jquery-3.7.1.min.js"></script>
+            <script src="/files/bootstrap-5.3.8-dist/js/bootstrap.min.js"></script>
+            <script src="/files/fontawesome-free-7.0.0-web/js/all.min.js"></script>
+            <script src="/files/datatables-2.3.3/datatables.min.js"></script>
+            <script src="/files/moment-2.30.1.js"></script>
 
-<script>
-    $(function() {
-        $("body").attr("data-bs-theme", "");
-    });
-</script>
+            <script src="/js/Extensions.js"></script>
+
+            <script>
+                $(function() {
+                    const colorSchemeQuery = window.matchMedia("(prefers-color-scheme: dark)").matches;
+
+                    if (colorSchemeQuery)
+                        $("body").attr("data-bs-theme", "dark");
+                });
+            </script>
+        <?php
+    }
+?>
+
+<?php renderHead(); ?>
diff --git a/pages/run.php b/pages/run.php
index 24109a4..015fd5b 100644
--- a/pages/run.php
+++ b/pages/run.php
@@ -216,7 +216,7 @@
     </div>
 </div>
 
-        <div class="navbar navbar-expand bg-light navbar-light d-print-none" id="title-navbar">
+        <div class="navbar navbar-expand bg-secondary-subtle navbar-light d-print-none" id="title-navbar">
             <div class="container-fluid justify-content-between">
                 <div class="d-inline-flex align-items-center">
                     <span class="navbar-brand text-wrap"><?= $strTitle; ?></span>
@@ -438,7 +438,7 @@
                         <div class="mb-3">
                             <label>Source</label>
                             <div class="w-100">
-                                <textarea class="w-100 border-0 bg-light p-3" id="source-preview" readonly><?= $strFileDataSource; ?></textarea>
+                                <textarea class="w-100 border-0 bg-secondary-subtle p-3" id="source-preview" readonly><?= $strFileDataSource; ?></textarea>
                             </div>
                         </div>
                     </div>