diff --git a/config.php.example b/config.php
similarity index 100%
rename from config.php.example
rename to config.php
diff --git a/engines/ahmia/hidden_service.php b/engines/ahmia/hidden_service.php
index 5a840f7..3f43ff1 100644
--- a/engines/ahmia/hidden_service.php
+++ b/engines/ahmia/hidden_service.php
@@ -30,6 +30,7 @@
 
     function print_hidden_service_results($results)
     {
+        echo "<div class=\"result-container-inner\">";
         echo "<div class=\"text-result-container\">";
 
         foreach($results as $result)
diff --git a/engines/bittorrent/merge.php b/engines/bittorrent/merge.php
index 08e3c25..d9c2648 100644
--- a/engines/bittorrent/merge.php
+++ b/engines/bittorrent/merge.php
@@ -73,6 +73,7 @@
 
     function print_merged_torrent_results($results)
     {
+        echo "<div class=\"result-container-inner\">";
         echo "<div class=\"text-result-container\">";
 
         if (!empty($results)) 
diff --git a/engines/brave/video.php b/engines/brave/video.php
index f86523f..a099c04 100644
--- a/engines/brave/video.php
+++ b/engines/brave/video.php
@@ -38,6 +38,7 @@
 
     function print_video_results($results)
     {
+        echo "<div class=\"result-container-inner\">";
         echo "<div class=\"text-result-container\">";
 
             foreach($results as $result)
@@ -50,12 +51,15 @@
                 $thumbnail = $result["thumbnail"];
 
                 echo "<div class=\"text-result-wrapper\">";
-                echo "<a href=\"$url\">";
+                echo "<a class=\"video-link\" href=\"$url\">";
+                echo "<div class=\"video-thumbnail\">";
+                echo "<img class=\"video-img\" src=\"image_proxy.php?url=$thumbnail\">";
+                echo "</div>";
+                echo "<div class=\"video-properties\">";
                 echo "$base_url";
                 echo "<h2>$title</h2>";
-                echo "<img class=\"video-img\" src=\"image_proxy.php?url=$thumbnail\">";
-                echo "<br>";
                 echo "<span>$date - $views</span>";
+                echo "</div>";
                 echo "</a>";
                 echo "</div>";
             }
diff --git a/engines/google/text.php b/engines/google/text.php
index c5270b1..9102f63 100644
--- a/engines/google/text.php
+++ b/engines/google/text.php
@@ -140,20 +140,26 @@
             $response = $special["special_response"]["response"];
             $source = $special["special_response"]["source"];
 
-            echo "<p class=\"special-result-container\">";
+            echo "<div class=\"special-result-container\">";
             if (array_key_exists("image", $special["special_response"]))
             {
                 $image_url = $special["special_response"]["image"];
                 echo "<img src=\"image_proxy.php?url=$image_url\">";
             }
-            echo $response;
+            
+            echo "<div class=\"special-result-container-inner\">";
+
             if ($source)
                 echo "<a href=\"$source\" target=\"_blank\">$source</a>";
-            echo "</p>";
+            echo "<p>$response</p>";
+            
+            echo "</div>";
 
             array_shift($results);
         }
 
+        echo "</div>";
+        echo "<div class=\"result-container-inner\">";
         echo "<div class=\"text-result-container\">";
 
         foreach($results as $result)
diff --git a/engines/qwant/image.php b/engines/qwant/image.php
index d5b7a16..2d62fb4 100644
--- a/engines/qwant/image.php
+++ b/engines/qwant/image.php
@@ -42,6 +42,7 @@
 
     function print_image_results($results)
     {
+        echo "<div class=\"result-container-inner\">";
         echo "<div class=\"image-result-container\">";
 
             foreach($results as $result)
@@ -50,8 +51,20 @@
                 $alt = $result["alt"];
                 $url = $result["url"];
 
+                $parsed_url = parse_url($url);
+                $host = $parsed_url['host'];
+
+                // Extract the domain name from the host
+                $url_trunc = preg_replace('/^www\./', '', $host);
+
                 echo "<a title=\"$alt\" href=\"$url\" target=\"_blank\">";
+                echo "<div class=\"image-wrapper\">";
                 echo "<img src=\"image_proxy.php?url=$thumbnail\">";
+                echo "</div>";
+                echo "<span class=\"image-properties\">";
+                echo "<span class=\"image-url\">$url_trunc</span>";
+                echo "<h4 class=\"image-title\">$alt</h4>";
+                echo "</span>";
                 echo "</a>";
             }
 
diff --git a/index.php b/index.php
index 9146e9a..5eaaca1 100644
--- a/index.php
+++ b/index.php
@@ -5,7 +5,7 @@
     <body>
         <form class="search-container" action="search.php" method="get" autocomplete="off">
                 <h1>Libre<span class="X">X</span></h1>
-                <input type="text" name="q" autofocus/>
+                <input placeholder="Search..." type="text" name="q" autofocus/>
                 <input type="hidden" name="p" value="0"/>
                 <input type="hidden" name="t" value="0"/>
                 <input type="submit" class="hide"/>
diff --git a/misc/header.php b/misc/header.php
index 933364a..de72447 100644
--- a/misc/header.php
+++ b/misc/header.php
@@ -8,7 +8,7 @@
         <link rel="stylesheet" type="text/css" href="static/css/styles.css"/>
         <link title="LibreX search" type="application/opensearchdescription+xml" href="/opensearch.xml?method=POST" rel="search"/>
         <link rel="stylesheet" type="text/css" href="<?php
-                echo "static/css/";
+                echo "static/css/themes/";
                 if (isset($_COOKIE["theme"]) || isset($_REQUEST["theme"]))
                     echo htmlspecialchars((isset($_COOKIE["theme"]) ? $_COOKIE["theme"] : $_REQUEST["theme"]) . ".css");
                 else
diff --git a/opensearch.xml.example b/opensearch.xml
similarity index 100%
rename from opensearch.xml.example
rename to opensearch.xml
diff --git a/search.php b/search.php
index ae823f8..ed1f526 100644
--- a/search.php
+++ b/search.php
@@ -51,6 +51,7 @@
             $config = require "config.php";
             require "misc/tools.php";
 
+            echo "<div class=\"result-container\" data-type=\"$type\">";
 
             $page = isset($_REQUEST["p"]) ? (int) $_REQUEST["p"] : 0;
 
@@ -64,22 +65,22 @@
                         check_ddg_bang($query);
                     require "engines/google/text.php";
                     $results = get_text_results($query, $page);
-                    print_elapsed_time($start_time);
                     print_text_results($results);
+                    print_elapsed_time($start_time);
                     break;
 
                 case 1:
                     require "engines/qwant/image.php";
                     $results = get_image_results($query_encoded, $page);
-                    print_elapsed_time($start_time);
                     print_image_results($results);
+                    print_elapsed_time($start_time);
                     break;
 
                 case 2:
                     require "engines/brave/video.php";
                     $results = get_video_results($query_encoded);
-                    print_elapsed_time($start_time);
                     print_video_results($results);
+                    print_elapsed_time($start_time);
                     break;
 
                 case 3:
@@ -89,8 +90,8 @@
                     {
                         require "engines/bittorrent/merge.php";
                         $results = get_merged_torrent_results($query_encoded);
-                        print_elapsed_time($start_time);
                         print_merged_torrent_results($results);
+                        print_elapsed_time($start_time);
                     }
                     break;
 
@@ -101,8 +102,8 @@
                     {
                         require "engines/ahmia/hidden_service.php";
                         $results = get_hidden_service_results($query_encoded);
-                        print_elapsed_time($start_time);
                         print_hidden_service_results($results);
+                        print_elapsed_time($start_time);
                     }
                     break;
 
@@ -130,8 +131,11 @@
 
                     print_next_page_button("&gt;", $page + 10, $query, $type);
 
-                echo "</div>";
+                echo "</div>"; // .next-page-button-wrapper
             }
+
+            echo "</div>"; // .result-container-inner (text.php->print_x_results)
+            echo "</div>"; // .result-container
         ?>
 
 <?php require "misc/footer.php"; ?>
diff --git a/static/css/styles.css b/static/css/styles.css
index 3b56ac0..b4175fe 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -1,3 +1,19 @@
+/* Layout variables */
+:root {
+    --footer-height: 51px;
+}
+
+/* Color variables */
+:root {
+    /*
+        TODO: Variables here were magic colors
+              found scattered around in the primary CSS.
+              Move them to in their respective themes
+              in the future :v
+    */
+    --element-border-focus: #5f6368;
+}
+
 html {
     color: var(--main-fg);
     background-color: var(--main-bg);
@@ -40,12 +56,28 @@ a:hover,
 }
 
 .search-container {
+    /*  Make the search container take up 100% of the screen height
+        And cooperate with the footer */
+    height: calc(100vh - var(--footer-height));
+
+    /* Flex properties for correct alignment */
+    display: flex;
+    flex-direction: column;
+    
+    /* Align text & items in the middle */
     text-align: center;
-    margin-top: 10%;
+    justify-content: center;
+    align-items: center;
+
+    /* Gap between elements */
+    gap: 1rem
 }
 
 .search-container h1 {
     font-size: 70px;
+
+    /* Remove unnecessary margin */
+    margin-bottom: 0;
 }
 
 .search-container input,
@@ -53,11 +85,34 @@ a:hover,
     width: 500px;
     color: var(--search-container-text-color);
     background-color: var(--search-container-background-color);
-    padding: 10px;
     font-size: inherit;
     font-family: sans-serif;
     border: 1px solid var(--search-container-background-border);
     border-radius: 25px;
+    
+    /* Give a wider padding on the X axis to look more appealing */
+    padding: 10px 16px;
+}
+
+/* Input focus style for accessibility */
+.search-container input:focus,
+.sub-search-container input:focus {
+    border: 1px solid var(--element-border-focus);
+}
+
+/*  Make sure that we can differentiate the placeholder
+    from real input */
+.search-container input::placeholder,
+.sub-search-container input::placeholder {
+    font-style: italic;
+}
+
+/* Make the search button wrapper a flexbox */
+.search-button-wrapper {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 1rem;
 }
 
 .search-button-wrapper button,
@@ -68,12 +123,7 @@ a:hover,
     font-size: 14px;
     border: 1px solid var(--main-bg);
     border-radius: 4px;
-    padding: 13px 10px 13px 10px;
-}
-
-.search-button-wrapper button {
-
-    margin: 30px 60px 0px 60px;
+    padding: 10px 16px;
 }
 
 .sub-search-container {
@@ -116,7 +166,7 @@ a:hover,
 
 .search-button-wrapper button:hover,
 .misc-container button:hover {
-    border: 1px solid #5f6368;
+    border: 1px solid var(--element-border-focus);
     cursor: pointer;
 }
 
@@ -172,37 +222,85 @@ a:hover,
     padding: 5px;
     font-size: inherit;
     font-family: inherit;
-    border: 1px solid #5f6368;
+    border: 1px solid var(--element-border-focus);
     border-radius: 5px;
     float: right;
 }
 
-.text-result-container,
-#time,
+.result-container {
+    display: flex;
+    flex-direction: row-reverse;
+    gap: 2rem;
+    width: fit-content;
+    padding: calc(var(--footer-height) + 2rem) 170px;
+    padding-top: 1rem;
+    box-sizing: border-box;
+}
+
+.result-container-inner {
+    display: flex;
+    flex-direction: column;
+}
+
+/* Allow the video wrapper to be a bit bigger */
+.result-container[data-type="2"] .text-result-wrapper {
+    max-width: 700px;
+}
+
+#time {
+    font-size: 13px;
+    opacity: 0.65;
+    order: 0;
+}
+
+.image-result-container,
+.text-result-container {
+    order: 1;
+}
+
 .next-page-button-wrapper {
-    margin-left: 170px;
+    order: 2;
 }
 
 .text-result-container {
-    margin-bottom: 100px;
+    margin-bottom: 2rem;
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
 }
 
 .special-result-container {
-    padding: 10px;
+    padding: 18px;
     border: 1px solid var(--special-result-border);
     width: 500px;
     border-radius: 8px;
     background: var(--special-text-background);
     color: var(--special-text-color);
-    margin-left: 840px;
-    margin-top: 0px;
-    position: absolute;
+    height: fit-content;
+    box-sizing: border-box;
+
+    /* New layout */
+    display: flex;
+    flex-direction: row;
+    gap: 1.5rem;
 }
 
+.special-result-container-inner {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+}
+
+.special-result-container-inner p {
+    font-size: 16px;
+    margin: 0;
+    color: var(--main-fg);
+}
+
+
 .text-result-wrapper {
     max-width: 550px;
     word-wrap: break-word;
-    margin-bottom: 35px;
 }
 
 .text-result-wrapper a {
@@ -210,9 +308,12 @@ a:hover,
     color: var(--result-fg);
 }
 
-.video-img {
-    height: 115px;
+.video-thumbnail {
+    min-height: 96px;
+    max-height: 96px;
+    background-color: var(--search-container-background-color);
     border-radius: 12px;
+    aspect-ratio: 4 / 3;
 }
 
 .text-result-wrapper h2 {
@@ -220,33 +321,27 @@ a:hover,
     color: var(--result-link-fg);
     padding-top: 5px;
     margin-top: 1px;
+    font-weight: 500;
+    margin-bottom: 8px;
+    width: fit-content;
 }
 
 .special-result-container a {
     display: flex;
-    margin-top: 10px;
     font-size: 14px;
 }
 
 .special-result-container img {
     display: flex;
     max-width: 60%;
-    max-height: 200px;
-    padding-bottom: 10px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-.next-page-button-wrapper {
-    margin-top: -50px;
-    margin-bottom: 100px;
+    max-height: 64px;
 }
 
 .next-page-button-wrapper button {
     border: none;
     background-color: inherit;
     color: var(--result-link-fg);
-    font-size: 18px;
+    font-size: 16px;
     margin-right: 8px;
 }
 
@@ -259,15 +354,55 @@ a:hover,
     flex-wrap: wrap;
     grid-gap: 1.5rem;
     justify-items: center;
-    margin-left: 9%;
-    margin-right: 9%;
     padding: 0;
     margin-bottom: 50px;
 }
 
 a[title] {
     flex-grow: 1;
-    height: 12rem;
+    height: fit-content;
+
+    display: flex;
+    flex-direction: column;
+
+    gap: 1rem;
+}
+
+a[title] .image-wrapper {
+    min-height: 12rem;
+    width: 100%;
+    background-color: var(--search-container-background-color);
+    border-radius: 8px;
+}
+
+a[title] img {
+    max-height: 12rem;
+    border-radius: 8px;
+}
+
+a[title] .image-properties {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+}
+
+.image-properties .image-url {
+    font-size: 13px;
+    color: var(--result-fg);
+}
+
+.image-properties .image-title {
+    font-size: 18px;
+    font-weight: 500;
+    color: var(--result-link-fg);
+    width: fit-content;
+    margin: 0;
+
+    /* Trunc */
+    max-width: 300px;
+    white-space:nowrap;
+    overflow:hidden;
+    text-overflow:ellipsis;
 }
 
 .image-result-container img {
@@ -278,6 +413,18 @@ a[title] {
     vertical-align: bottom;
 }
 
+.video-link {
+    display: inline-flex;
+    flex-direction: row;
+    align-items: flex-start;
+    gap: 1rem;
+}
+
+.video-link .video-img {
+    max-height: 96px;
+    background-color: var(--search-container-background-color);
+    border-radius: 8px;
+}
 
 .git-container {
     right: 0;
@@ -297,6 +444,7 @@ a[title] {
     padding-bottom: 15px;
     border-top: 1px solid var(--border);
     text-align: center;
+    max-height: var(--footer-height);
 }
 
 .git-container a {
@@ -329,11 +477,16 @@ a[title] {
     color: #ff79c6;
 }
 
-@media only screen and (max-width: 1320px) {
+@media only screen and (max-width: 1422px) {
+    /* Move the special result to the top of the page, under the #time element */
+    .result-container {
+        flex-direction: column;
+        gap: 1rem;
+    }
+
     .special-result-container {
-        position: relative;
-        float: none;
-        margin-left: 165px;
+        max-width: 550px;
+        margin: 0;
     }
 }
 
@@ -351,10 +504,12 @@ a[title] {
         width: 80%;
     }
 
+    .search-button-wrapper {
+        flex-direction: column;
+    }
+
     .search-button-wrapper button {
-        display: table-row;
-        margin: 30px 0px 0px 0px;
-        width: 80%;
+        width: 100%;
     }
 
     .image-result-container {
@@ -436,7 +591,6 @@ a[title] {
         position: relative;
         float: none;
         max-width: 90%;
-        margin-left: 10px;
         width: auto;
     }
 
@@ -457,10 +611,21 @@ a[title] {
         margin-top: 10%;
     }
 
-    .text-result-container,
-    #time,
-    .next-page-button-wrapper {
-        margin-left: 20px;
-        max-width: 90%;
+    .special-result-container {
+        margin: 0;
+        max-width: 550px;
+
+        /* Make the layout a column */
+        flex-direction: column;
+    }
+
+    .special-result-container img {
+        max-width: 64px;
+    }
+
+    .result-container {
+        /* Remove the giant padding from the container */
+        padding: calc(var(--footer-height) + 2rem) 25px;
+        padding-top: 1rem;
     }
 }
diff --git a/static/css/amoled.css b/static/css/themes/amoled.css
similarity index 100%
rename from static/css/amoled.css
rename to static/css/themes/amoled.css
diff --git a/static/css/auto.css b/static/css/themes/auto.css
similarity index 100%
rename from static/css/auto.css
rename to static/css/themes/auto.css
diff --git a/static/css/dark.css b/static/css/themes/dark.css
similarity index 100%
rename from static/css/dark.css
rename to static/css/themes/dark.css
diff --git a/static/css/darker.css b/static/css/themes/darker.css
similarity index 100%
rename from static/css/darker.css
rename to static/css/themes/darker.css
diff --git a/static/css/discord.css b/static/css/themes/discord.css
similarity index 100%
rename from static/css/discord.css
rename to static/css/themes/discord.css
diff --git a/static/css/github_night.css b/static/css/themes/github_night.css
similarity index 100%
rename from static/css/github_night.css
rename to static/css/themes/github_night.css
diff --git a/static/css/google.css b/static/css/themes/google.css
similarity index 100%
rename from static/css/google.css
rename to static/css/themes/google.css
diff --git a/static/css/gruvbox.css b/static/css/themes/gruvbox.css
similarity index 100%
rename from static/css/gruvbox.css
rename to static/css/themes/gruvbox.css
diff --git a/static/css/light.css b/static/css/themes/light.css
similarity index 100%
rename from static/css/light.css
rename to static/css/themes/light.css
diff --git a/static/css/night_owl.css b/static/css/themes/night_owl.css
similarity index 100%
rename from static/css/night_owl.css
rename to static/css/themes/night_owl.css
diff --git a/static/css/nord.css b/static/css/themes/nord.css
similarity index 100%
rename from static/css/nord.css
rename to static/css/themes/nord.css
diff --git a/static/css/startpage.css b/static/css/themes/startpage.css
similarity index 100%
rename from static/css/startpage.css
rename to static/css/themes/startpage.css