diff --git a/cms/css/editor.css b/cms/css/editor.css
index 897118f..993749f 100644
--- a/cms/css/editor.css
+++ b/cms/css/editor.css
@@ -12,7 +12,7 @@ body {
 
 .pageContainer .controls {
     flex: 0 1 auto;
-    height: 70px;
+    height: 60px;
     background-color: #666666;
     border-bottom: 1px solid #1a1a1a;
     -webkit-box-shadow: 0 10px 13px -7px #000000, -1px -1px 15px 5px rgba(0, 0, 0, 0);
@@ -27,19 +27,19 @@ body {
 .controls .logo {
     background-image: url("/cms/img/logo.png");
     width: 128px;
-    height: 70px;
+    height: 60px;
     display: block;
     position: absolute;
 }
 
 .controls .buttonContainer {
     width: 400px;
-    margin: 18px auto;
+    margin: 12px auto;
 }
 
 .controls .loggedInDetails {
     position: absolute;
-    top: 25px;
+    top: 12px;
     right: 10px;
 }
 
diff --git a/cms/css/welcome.style.css b/cms/css/welcome.style.css
deleted file mode 100644
index f71d1cb..0000000
--- a/cms/css/welcome.style.css
+++ /dev/null
@@ -1,65 +0,0 @@
-/* General Styles */
-body {
-    margin: 0;
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-    background-color: #f9f9f9;
-    color: #333;
-}
-
-/* Header Styles */
-header {
-    background-color: #1b6ac9;
-    padding: 20px;
-    text-align: center;
-}
-
-.logo {
-    height: 80px;
-}
-
-/* Main Content Styles */
-main {
-    text-align: center;
-    padding: 60px 20px;
-}
-
-h1 {
-    font-size: 2.5em;
-    color: #1b6ac9;
-    margin-bottom: 20px;
-}
-
-p {
-    font-size: 1.1em;
-    line-height: 1.6;
-    max-width: 700px;
-    margin: 10px auto;
-}
-
-/* Button Styles */
-.button {
-    display: inline-block;
-    margin-top: 30px;
-    padding: 15px 30px;
-    background-color: #1b6ac9;
-    color: #fff;
-    text-decoration: none;
-    font-size: 1em;
-    border-radius: 5px;
-    transition: background-color 0.3s ease;
-}
-
-.button:hover {
-    background-color: #155a9c;
-}
-
-/* Footer Styles */
-footer {
-    background-color: #333;
-    color: #fff;
-    padding: 15px 0;
-    text-align: center;
-    position: fixed;
-    width: 100%;
-    bottom: 0;
-}
\ No newline at end of file
diff --git a/cms/img/logo.png b/cms/img/logo.png
index 0772902..ca33271 100644
Binary files a/cms/img/logo.png and b/cms/img/logo.png differ
diff --git a/cms/img/welcomeLogo.png b/cms/img/welcomeLogo.png
deleted file mode 100644
index 22d553b..0000000
Binary files a/cms/img/welcomeLogo.png and /dev/null differ
diff --git a/cms/index.php b/cms/index.php
index 99bae9c..025722e 100644
--- a/cms/index.php
+++ b/cms/index.php
@@ -44,7 +44,7 @@ require_once "init.php";
             ?>
         </div>
     </div>
-    <iframe id="frameContainer" src="welcome.html" class="frame"></iframe>
+    <iframe id="frameContainer" src="<?php echo $skipWelcomePage ? "/" : "welcome.html"; ?>" class="frame"></iframe>
 </div>
 <!-- Modal -->
 <div id="editModal" class="modal fade" role="dialog">
diff --git a/cms/init.php b/cms/init.php
index 61fd4da..5afba44 100644
--- a/cms/init.php
+++ b/cms/init.php
@@ -8,6 +8,9 @@ $authentication = [
     "editor" => "password",
 ];
 
+// Set to true if you do not want to see the welcome page and want to go straight to your site
+$skipWelcomePage = false;
+
 /**
  * DO NOT CHANGE ANYTHING BENEATH THIS LINE - IT WILL BUGGER STUFF UP
  */
diff --git a/cms/welcome.html b/cms/welcome.html
index c87b176..a4b70f8 100644
--- a/cms/welcome.html
+++ b/cms/welcome.html
@@ -1,32 +1,147 @@
 <!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Welcome to NeoCMS</title>
-    <link href="/cms/css/welcome.style.css" rel="stylesheet">
-</head>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head>
+    <meta charset="UTF-8" />
+    <title>NeoCMS - Super Lightweight CMS</title>
+    <!-- Bootstrap CSS -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" />
+    <!-- Material Design Bootstrap -->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.20.0/css/mdb.min.css" />
+    <!-- Custom Styles -->
+    <style>
+        body {
+            padding-top: 70px;
+            background-color: #ECEFF1;
+        }
+        .feature-icon {
+            font-size: 50px;
+            margin-bottom: 20px;
+            color: #2196F3;
+        }
+        .footer {
+            padding: 20px 0;
+            background-color: #CFD8DC;
+        }
+        .jumbotron {
+            background-color: #90CAF9;
+            color: #FFFFFF;
+        }
+        h2 {
+            color: #1976D2;
+        }
+        .btn-primary {
+            background-color: #1976D2;
+            border: none;
+        }
+        .btn-primary:hover {
+            background-color: #1565C0;
+        }
+    </style>
+    <style type="text/css">/* Chart.js */
+    @-webkit-keyframes chartjs-render-animation{from{opacity:0.99}to{opacity:1}}@keyframes chartjs-render-animation{from{opacity:0.99}to{opacity:1}}.chartjs-render-monitor{-webkit-animation:chartjs-render-animation 0.001s;animation:chartjs-render-animation 0.001s;}</style><style type="text/css">/* Chart.js */
+@-webkit-keyframes chartjs-render-animation{from{opacity:0.99}to{opacity:1}}@keyframes chartjs-render-animation{from{opacity:0.99}to{opacity:1}}.chartjs-render-monitor{-webkit-animation:chartjs-render-animation 0.001s;animation:chartjs-render-animation 0.001s;}</style></head>
 <body>
-<header>
-    <img alt="Application Logo" class="logo" src="/cms/img/welcomeLogo.png">
-</header>
-<main>
-    <h1>Welcome to NeoCMS</h1>
-    <p>Introducing a cutting-edge CMS designed to effortlessly integrate with your existing flat-file website—no
-        database required. Our databaseless WYSIWYG content management system empowers you to create, edit, and manage
-        content visually, all while maintaining the simplicity and speed of a flat-file setup. Enjoy a seamless
-        experience that combines the flexibility of a modern CMS with the efficiency of a static website, allowing you
-        to focus on content without the complexity of database management. Perfect for developers and creators looking
-        to streamline workflows without sacrificing control or performance.</p>
 
-    <p class="editable">
-        This box is editable! Just click me to edit me!<br/>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-        Quisque sit amet accumsan tortor. Itaque earum rerum hic tenetur a sapiente delectus.
-    </p>
-    <a class="button" href="/">Get Started with your website</a>
-</main>
-<footer>
-    <p>&copy; 2024 Andy Dixon</p>
+<!-- Header -->
+<header class="jumbotron text-center">
+    <h1 class="display-4">Welcome to NeoCMS! 🎉</h1>
+    <p class="lead editable" style="cursor: default;">The super lightweight, database-free content management system!</p>
+    <a href="/" class="btn btn-primary btn-lg waves-effect waves-light" target="_blank">Start Editing your Website</a>
+
+</header>
+
+<!-- Version Section -->
+<section class="container my-5">
+    <h2 class="text-center mb-4">You are running version 2.0! ✨</h2>
+    <p class="text-center editable" style="cursor: default;">This page is editable for you to familiarise yourself with how Neo works! Any editable blocks will have a hand pointer instead of your usual pointer.</p>
+</section>
+
+<!-- Features Section -->
+<section class="container my-5">
+    <h2 class="text-center mb-4">Features 🚀</h2>
+    <div class="row">
+        <div class="col-md-6">
+            <div class="media mb-4">
+                <div class="feature-icon mr-3">📦</div>
+                <div class="editable media-body" style="cursor: default;">
+                    <h5 class="mt-0">No Database Required</h5>
+                    <p>NeoCMS works without a database, so you don’t have to worry about setup hassles or performance slowdowns.</p>
+                </div>
+            </div>
+            <div class="media mb-4">
+                <div class="feature-icon mr-3">✏️</div>
+                <div class="editable media-body" style="cursor: default;">
+                    <h5 class="mt-0">Easy Content Editing</h5>
+                    <p>With our intuitive WYSIWYG editor, anyone can update content without writing a single line of code. Adding the additional class <code>neo-dupe</code> will allow an element and its children to be cloned.</p>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="media mb-4">
+                <div class="feature-icon mr-3">🔗</div>
+                <div class="editable media-body" style="cursor: default;">
+                    <h5 class="mt-0">Seamless Integration</h5>
+                    <p>Simply add the CMS to any existing static website. Assign a special class to the elements you want to make editable, and you’re all set.</p>
+                </div>
+            </div>
+            <div class="media mb-4">
+                <div class="feature-icon mr-3">🖼️</div>
+                <div class="editable media-body" style="cursor: default;">
+                    <h5 class="mt-0">Consistent Layouts</h5>
+                    <p>NeoCMS supports page templates to keep your layouts neat and uniform across all pages.</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+
+<!-- Requirements Section -->
+<section class="container my-5">
+    <h2 class="text-center mb-4">Requirements 📝</h2>
+    <p class="text-center">NeoCMS requires the following:</p>
+    <ul class="list-group list-group-flush">
+        <li class="list-group-item">PHP 8 running on a Linux server. (May work on Windows servers, but we don't want to stoop to that level 😉)</li>
+    </ul>
+</section>
+
+<!-- Known Issues Section -->
+<section class="container my-5">
+    <h2 class="text-center mb-4">Known Bugs &amp; Issues 🐞</h2>
+    <ul class="list-group list-group-flush editable" style="cursor: default;">
+        <li class="list-group-item"><strong>File Uploads (non-image):</strong> Currently, file uploads are not fully implemented. We're working on it!</li>
+        <li class="list-group-item"><strong>Testing:</strong> The system is functional, but it hasn’t been fully tested in all scenarios.</li>
+    </ul>
+</section>
+
+<!-- License Section -->
+<section class="container my-5">
+    <h2 class="text-center mb-4">License 📄</h2>
+    <p class="text-center">NeoCMS is open-source software licensed under the GNU General Public License v3.0 (GPLv3). You are free to use, modify, and distribute this software under the terms of this license.</p>
+    <p class="text-center">For more information, see the full <a href="#" target="_blank">GPLv3 License</a> found in <code>LICENSE</code>.</p>
+</section>
+
+<!-- Bug Report Section -->
+<section class="container my-5">
+    <h2 class="text-center mb-4">Found a Bug? 🐛</h2>
+    <p class="text-center">If you run into any issues or have feature requests, please submit them on our <a href="https://github.com/andydixon/neoCMS/issues" target="_blank">GitHub issues page</a>. Your feedback helps us improve NeoCMS!</p>
+</section>
+
+<!-- Footer -->
+<footer class="footer text-center">
+    <div class="container editable" style="cursor: default;">
+        <p>© 2024 <a href="https://www.andydixon.com">Andy Dixon</a>. All rights reserved.</p>
+        <p>
+            <a href="https://github.com/andydixon/neoCMS/issues" target="_blank">Report an Issue</a>
+        </p>
+    </div>
 </footer>
-</body>
-</html>
\ No newline at end of file
+
+<!-- Bootstrap JS and dependencies -->
+<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+<!-- Material Design Bootstrap JS -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.20.0/js/mdb.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
+
+
+
+<div class="hiddendiv common"></div></body></html>
\ No newline at end of file