diff --git a/config.php b/config.php.example
similarity index 100%
rename from config.php
rename to config.php.example
diff --git a/engines/ahmia/hidden_service.php b/engines/ahmia/hidden_service.php
index 3f43ff1..5a840f7 100644
--- a/engines/ahmia/hidden_service.php
+++ b/engines/ahmia/hidden_service.php
@@ -30,7 +30,6 @@
 
     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 d9c2648..08e3c25 100644
--- a/engines/bittorrent/merge.php
+++ b/engines/bittorrent/merge.php
@@ -73,7 +73,6 @@
 
     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 a099c04..f86523f 100644
--- a/engines/brave/video.php
+++ b/engines/brave/video.php
@@ -38,7 +38,6 @@
 
     function print_video_results($results)
     {
-        echo "<div class=\"result-container-inner\">";
         echo "<div class=\"text-result-container\">";
 
             foreach($results as $result)
@@ -51,15 +50,12 @@
                 $thumbnail = $result["thumbnail"];
 
                 echo "<div class=\"text-result-wrapper\">";
-                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 "<a href=\"$url\">";
                 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 9102f63..c5270b1 100644
--- a/engines/google/text.php
+++ b/engines/google/text.php
@@ -140,26 +140,20 @@
             $response = $special["special_response"]["response"];
             $source = $special["special_response"]["source"];
 
-            echo "<div class=\"special-result-container\">";
+            echo "<p 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 "<div class=\"special-result-container-inner\">";
-
+            echo $response;
             if ($source)
                 echo "<a href=\"$source\" target=\"_blank\">$source</a>";
-            echo "<p>$response</p>";
-            
-            echo "</div>";
+            echo "</p>";
 
             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 2d62fb4..d5b7a16 100644
--- a/engines/qwant/image.php
+++ b/engines/qwant/image.php
@@ -42,7 +42,6 @@
 
     function print_image_results($results)
     {
-        echo "<div class=\"result-container-inner\">";
         echo "<div class=\"image-result-container\">";
 
             foreach($results as $result)
@@ -51,20 +50,8 @@
                 $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 5eaaca1..9146e9a 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 placeholder="Search..." type="text" name="q" autofocus/>
+                <input 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 de72447..933364a 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/themes/";
+                echo "static/css/";
                 if (isset($_COOKIE["theme"]) || isset($_REQUEST["theme"]))
                     echo htmlspecialchars((isset($_COOKIE["theme"]) ? $_COOKIE["theme"] : $_REQUEST["theme"]) . ".css");
                 else
diff --git a/opensearch.xml b/opensearch.xml.example
similarity index 100%
rename from opensearch.xml
rename to opensearch.xml.example
diff --git a/search.php b/search.php
index ed1f526..ae823f8 100644
--- a/search.php
+++ b/search.php
@@ -51,7 +51,6 @@
             $config = require "config.php";
             require "misc/tools.php";
 
-            echo "<div class=\"result-container\" data-type=\"$type\">";
 
             $page = isset($_REQUEST["p"]) ? (int) $_REQUEST["p"] : 0;
 
@@ -65,22 +64,22 @@
                         check_ddg_bang($query);
                     require "engines/google/text.php";
                     $results = get_text_results($query, $page);
-                    print_text_results($results);
                     print_elapsed_time($start_time);
+                    print_text_results($results);
                     break;
 
                 case 1:
                     require "engines/qwant/image.php";
                     $results = get_image_results($query_encoded, $page);
-                    print_image_results($results);
                     print_elapsed_time($start_time);
+                    print_image_results($results);
                     break;
 
                 case 2:
                     require "engines/brave/video.php";
                     $results = get_video_results($query_encoded);
-                    print_video_results($results);
                     print_elapsed_time($start_time);
+                    print_video_results($results);
                     break;
 
                 case 3:
@@ -90,8 +89,8 @@
                     {
                         require "engines/bittorrent/merge.php";
                         $results = get_merged_torrent_results($query_encoded);
-                        print_merged_torrent_results($results);
                         print_elapsed_time($start_time);
+                        print_merged_torrent_results($results);
                     }
                     break;
 
@@ -102,8 +101,8 @@
                     {
                         require "engines/ahmia/hidden_service.php";
                         $results = get_hidden_service_results($query_encoded);
-                        print_hidden_service_results($results);
                         print_elapsed_time($start_time);
+                        print_hidden_service_results($results);
                     }
                     break;
 
@@ -131,11 +130,8 @@
 
                     print_next_page_button("&gt;", $page + 10, $query, $type);
 
-                echo "</div>"; // .next-page-button-wrapper
+                echo "</div>";
             }
-
-            echo "</div>"; // .result-container-inner (text.php->print_x_results)
-            echo "</div>"; // .result-container
         ?>
 
 <?php require "misc/footer.php"; ?>
diff --git a/static/css/themes/amoled.css b/static/css/amoled.css
similarity index 100%
rename from static/css/themes/amoled.css
rename to static/css/amoled.css
diff --git a/static/css/themes/auto.css b/static/css/auto.css
similarity index 100%
rename from static/css/themes/auto.css
rename to static/css/auto.css
diff --git a/static/css/themes/dark.css b/static/css/dark.css
similarity index 100%
rename from static/css/themes/dark.css
rename to static/css/dark.css
diff --git a/static/css/themes/darker.css b/static/css/darker.css
similarity index 100%
rename from static/css/themes/darker.css
rename to static/css/darker.css
diff --git a/static/css/themes/discord.css b/static/css/discord.css
similarity index 100%
rename from static/css/themes/discord.css
rename to static/css/discord.css
diff --git a/static/css/themes/github_night.css b/static/css/github_night.css
similarity index 100%
rename from static/css/themes/github_night.css
rename to static/css/github_night.css
diff --git a/static/css/themes/google.css b/static/css/google.css
similarity index 100%
rename from static/css/themes/google.css
rename to static/css/google.css
diff --git a/static/css/themes/gruvbox.css b/static/css/gruvbox.css
similarity index 100%
rename from static/css/themes/gruvbox.css
rename to static/css/gruvbox.css
diff --git a/static/css/themes/light.css b/static/css/light.css
similarity index 100%
rename from static/css/themes/light.css
rename to static/css/light.css
diff --git a/static/css/themes/night_owl.css b/static/css/night_owl.css
similarity index 100%
rename from static/css/themes/night_owl.css
rename to static/css/night_owl.css
diff --git a/static/css/themes/nord.css b/static/css/nord.css
similarity index 100%
rename from static/css/themes/nord.css
rename to static/css/nord.css
diff --git a/static/css/themes/startpage.css b/static/css/startpage.css
similarity index 100%
rename from static/css/themes/startpage.css
rename to static/css/startpage.css
diff --git a/static/css/styles.css b/static/css/styles.css
index b4175fe..3b56ac0 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -1,19 +1,3 @@
-/* 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);
@@ -56,28 +40,12 @@ 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;
-    justify-content: center;
-    align-items: center;
-
-    /* Gap between elements */
-    gap: 1rem
+    margin-top: 10%;
 }
 
 .search-container h1 {
     font-size: 70px;
-
-    /* Remove unnecessary margin */
-    margin-bottom: 0;
 }
 
 .search-container input,
@@ -85,34 +53,11 @@ 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,
@@ -123,7 +68,12 @@ a:hover,
     font-size: 14px;
     border: 1px solid var(--main-bg);
     border-radius: 4px;
-    padding: 10px 16px;
+    padding: 13px 10px 13px 10px;
+}
+
+.search-button-wrapper button {
+
+    margin: 30px 60px 0px 60px;
 }
 
 .sub-search-container {
@@ -166,7 +116,7 @@ a:hover,
 
 .search-button-wrapper button:hover,
 .misc-container button:hover {
-    border: 1px solid var(--element-border-focus);
+    border: 1px solid #5f6368;
     cursor: pointer;
 }
 
@@ -222,85 +172,37 @@ a:hover,
     padding: 5px;
     font-size: inherit;
     font-family: inherit;
-    border: 1px solid var(--element-border-focus);
+    border: 1px solid #5f6368;
     border-radius: 5px;
     float: right;
 }
 
-.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;
-}
-
+.text-result-container,
+#time,
 .next-page-button-wrapper {
-    order: 2;
+    margin-left: 170px;
 }
 
 .text-result-container {
-    margin-bottom: 2rem;
-    display: flex;
-    flex-direction: column;
-    gap: 1rem;
+    margin-bottom: 100px;
 }
 
 .special-result-container {
-    padding: 18px;
+    padding: 10px;
     border: 1px solid var(--special-result-border);
     width: 500px;
     border-radius: 8px;
     background: var(--special-text-background);
     color: var(--special-text-color);
-    height: fit-content;
-    box-sizing: border-box;
-
-    /* New layout */
-    display: flex;
-    flex-direction: row;
-    gap: 1.5rem;
+    margin-left: 840px;
+    margin-top: 0px;
+    position: absolute;
 }
 
-.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 {
@@ -308,12 +210,9 @@ a:hover,
     color: var(--result-fg);
 }
 
-.video-thumbnail {
-    min-height: 96px;
-    max-height: 96px;
-    background-color: var(--search-container-background-color);
+.video-img {
+    height: 115px;
     border-radius: 12px;
-    aspect-ratio: 4 / 3;
 }
 
 .text-result-wrapper h2 {
@@ -321,27 +220,33 @@ 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: 64px;
+    max-height: 200px;
+    padding-bottom: 10px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.next-page-button-wrapper {
+    margin-top: -50px;
+    margin-bottom: 100px;
 }
 
 .next-page-button-wrapper button {
     border: none;
     background-color: inherit;
     color: var(--result-link-fg);
-    font-size: 16px;
+    font-size: 18px;
     margin-right: 8px;
 }
 
@@ -354,55 +259,15 @@ 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: 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;
+    height: 12rem;
 }
 
 .image-result-container img {
@@ -413,18 +278,6 @@ a[title] .image-properties {
     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;
@@ -444,7 +297,6 @@ a[title] .image-properties {
     padding-bottom: 15px;
     border-top: 1px solid var(--border);
     text-align: center;
-    max-height: var(--footer-height);
 }
 
 .git-container a {
@@ -477,16 +329,11 @@ a[title] .image-properties {
     color: #ff79c6;
 }
 
-@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;
-    }
-
+@media only screen and (max-width: 1320px) {
     .special-result-container {
-        max-width: 550px;
-        margin: 0;
+        position: relative;
+        float: none;
+        margin-left: 165px;
     }
 }
 
@@ -504,12 +351,10 @@ a[title] .image-properties {
         width: 80%;
     }
 
-    .search-button-wrapper {
-        flex-direction: column;
-    }
-
     .search-button-wrapper button {
-        width: 100%;
+        display: table-row;
+        margin: 30px 0px 0px 0px;
+        width: 80%;
     }
 
     .image-result-container {
@@ -591,6 +436,7 @@ a[title] .image-properties {
         position: relative;
         float: none;
         max-width: 90%;
+        margin-left: 10px;
         width: auto;
     }
 
@@ -611,21 +457,10 @@ a[title] .image-properties {
         margin-top: 10%;
     }
 
-    .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;
+    .text-result-container,
+    #time,
+    .next-page-button-wrapper {
+        margin-left: 20px;
+        max-width: 90%;
     }
 }