diff --git a/acars.php b/acars.php
index 8e373407..42560af0 100644
--- a/acars.php
+++ b/acars.php
@@ -12,8 +12,6 @@
 $user = new User();
 
 Page::setTitle('ACARS - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('index.php');
diff --git a/admin.php b/admin.php
new file mode 100644
index 00000000..cd635ac7
--- /dev/null
+++ b/admin.php
@@ -0,0 +1,39 @@
+<?php
+/*
+Flare, a fully featured and easy to use crew centre, designed for Infinite Flight.
+Copyright (C) 2020  Lucas Rebato
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+require_once 'core/init.php';
+
+if (Input::get('page') === 'usermanage'):
+    Redirect::to('/admin/users.php');
+elseif (Input::get('page') === 'staffmanage'):
+    Redirect::to('/admin/staff.php');
+elseif (Input::get('page') === 'site'):
+    Redirect::to('/admin/site.php');
+elseif (Input::get('page') === 'recruitment'):
+    Redirect::to('/admin/recruitment.php');
+elseif (Input::get('page') === 'pirepmanage'):
+    Redirect::to('/admin/pireps.php');
+elseif (Input::get('page') === 'multimanage'):
+    Redirect::to('/admin/multipliers.php');
+elseif (Input::get('page') === 'newsmanage'):
+    Redirect::to('/admin/news.php');
+elseif (Input::get('page') === 'events'):
+    Redirect::to('/admin/events.php');
+elseif (Input::get('page') === 'statsviewing'):
+    Redirect::to('/admin/stats.php');
+elseif (Input::get('page') === 'opsmanage'):
+    Redirect::to('/admin/operations.php?section='.Input::get('section'));
+elseif (Input::get('page') === 'codeshares'):
+    Redirect::to('/admin/codeshares.php');
+elseif (Input::get('page') === 'pluginmanage'):
+    Redirect::to('/admin/plugins.php');
+else:
+    Redirect::to('/home.php');
+    endif;
+?>
\ No newline at end of file
diff --git a/admin/codeshares.php b/admin/codeshares.php
index 89a71d04..d0f71dfa 100644
--- a/admin/codeshares.php
+++ b/admin/codeshares.php
@@ -12,8 +12,6 @@
 $user = new User();
 
 Page::setTitle('Codeshares Admin - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
diff --git a/admin/events.php b/admin/events.php
index 9aac879c..d55fe9c7 100644
--- a/admin/events.php
+++ b/admin/events.php
@@ -12,8 +12,6 @@
 $user = new User();
 
 Page::setTitle('Events Admin - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
diff --git a/admin/index.php b/admin/index.php
index 5b0c227a..5a2cb86b 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -12,7 +12,6 @@
 $user = new User();
 
 Page::setTitle('Site Dashboard - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
diff --git a/admin/multipliers.php b/admin/multipliers.php
index 6bffb83c..6f3ac528 100644
--- a/admin/multipliers.php
+++ b/admin/multipliers.php
@@ -12,8 +12,6 @@
 $user = new User();
 
 Page::setTitle('Multipliers Admin - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
diff --git a/admin/news.php b/admin/news.php
index 8b167c84..196b39bd 100644
--- a/admin/news.php
+++ b/admin/news.php
@@ -12,7 +12,6 @@
 $user = new User();
 
 Page::setTitle('News Admin - '.Config::get('va/name'));
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
diff --git a/admin/operations.php b/admin/operations.php
index c801b8d5..b024d186 100644
--- a/admin/operations.php
+++ b/admin/operations.php
@@ -12,7 +12,6 @@
 $user = new User();
 
 Page::setTitle('Operations Admin - '.Config::get('va/name'));
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
@@ -680,9 +679,6 @@ function reverseFormatEditFlightTime() {
                                     $routesArray = [];
                                     foreach ($routelines[0] as $l) {
                                         $segments = preg_split('/, ?/', $l);
-                                        if (strpos($segments[10], ".") === FALSE && strpos($segments[10], ":") === FALSE) {
-                                            $segments[10] .= ".00";
-                                        }
                                         array_push($routesArray, array(
                                             "fltnum" => $segments[1],
                                             "dep" => $segments[2],
@@ -706,23 +702,22 @@ function reverseFormatEditFlightTime() {
                                     $j = 0;
                                     $doneAircraft = [];
                                     echo '<table class="w-100 mb-2">';
-                                    $i = 0;
-                                    foreach ($routesArray as $r) {
+                                    for ($j=0; $j<$i-1; $j++) {
+                                        $r = $routesArray[$j];
                                         if (!in_array($r['aircraftid'], $doneAircraft)) {
                                             echo '<tr class="border-bottom border-top"><td class="align-middle p-2"><b>';
                                             echo $r['aircraftid'];
                                             echo '</b></td><td class="align-middle py-2">';
-                                            echo '<input hidden name="rego'.$i.'" value="'.$r["aircraftid"].'" />';
-                                            echo '<select required class="form-control mb-2 aircraftSelect" name="aircraft'.$i.'" id="'.$i.'">';
+                                            echo '<input hidden name="rego'.$j.'" value="'.$r["aircraftid"].'" />';
+                                            echo '<select required class="form-control mb-2 aircraftSelect" name="aircraft'.$j.'" id="'.$j.'">';
                                             echo '<option value>Aircraft Type</option>';
                                             echo $aircraftOptions;
                                             echo '</select>';
-                                            echo '<select required class="form-control" name="livery'.$i.'" id="livery'.$i.'">';
+                                            echo '<select required class="form-control" name="livery'.$j.'" id="livery'.$j.'">';
                                             echo '<option value>Select an Aircraft to Get Liveries</option>';
                                             echo '</select>';
                                             echo '</td></tr>';
                                             array_push($doneAircraft, $r['aircraftid']);
-                                            $i++;
                                         }
                                     }
                                     echo '</table>';
@@ -735,7 +730,7 @@ function reverseFormatEditFlightTime() {
                                                 var id = $(this).attr("id");
                                                 $("#livery" + id).html("<option value>Loading...</option>");
                                                 $.ajax({
-                                                    url: "/vanet.php",
+                                                    url: "vanet.php",
                                                     type: "POST",
                                                     data: { method: "liveriesforaircraft", data: $(this).val() },
                                                     success: function(html){
diff --git a/admin/pireps.php b/admin/pireps.php
index a6b0b8e1..c269081b 100644
--- a/admin/pireps.php
+++ b/admin/pireps.php
@@ -12,8 +12,6 @@
 $user = new User();
 
 Page::setTitle('PIREPs Admin - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
diff --git a/admin/recruitment.php b/admin/recruitment.php
index 1fa3de1f..9df463cd 100644
--- a/admin/recruitment.php
+++ b/admin/recruitment.php
@@ -10,7 +10,6 @@
 require_once '../core/init.php';
 
 $user = new User();
-Page::excludeAsset('chartjs');
 
 Page::setTitle('Recruitment Admin - '.Config::get('va/name'));
 
diff --git a/admin/site.php b/admin/site.php
index 9b835b1a..111d41b1 100644
--- a/admin/site.php
+++ b/admin/site.php
@@ -12,8 +12,6 @@
 $user = new User();
 
 Page::setTitle('Site Admin - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
diff --git a/admin/staff.php b/admin/staff.php
index 77dad9e6..ca749c08 100644
--- a/admin/staff.php
+++ b/admin/staff.php
@@ -12,7 +12,6 @@
 $user = new User();
 
 Page::setTitle('Staff Admin - '.Config::get('va/name'));
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
diff --git a/admin/stats.php b/admin/stats.php
index 8558797e..0837d8a8 100644
--- a/admin/stats.php
+++ b/admin/stats.php
@@ -12,8 +12,6 @@
 $user = new User();
 
 Page::setTitle('VA Stats - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
diff --git a/admin/users.php b/admin/users.php
index 0b8e7f1d..218876fc 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -12,7 +12,6 @@
 $user = new User();
 
 Page::setTitle('Users Admin - '.Config::get('va/name'));
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('/index.php');
@@ -86,7 +85,7 @@
                                     echo '<button class="btn btn-primary text-light userEdit" data-callsign="'.$user['callsign'].'" 
                                     data-name="'.$user['name'].'" data-email="'.$user['email'].'" data-ifc="'.$user['ifc'].'" 
                                     data-joined="'.date_format(date_create($user['joined']), 'Y-m-d').'" data-status="'.$user['status'].'" 
-                                    data-id="'.$user['id'].'" data-thrs="'.Time::secsToString($user["transhours"]).'" 
+                                    data-id="'.$user['id'].'" data-thrs="'.Time::secsToString($user["transhours"] + $user["transhours"]).'" 
                                     data-admin="'.$user['isAdmin'].'" data-tflts="'.$user["transflights"].'"><i class="fa fa-edit"></i>
                                     </button>';
                                     echo '&nbsp;<button id="delconfirmbtn" class="btn text-light btn-danger" 
diff --git a/apply.php b/apply.php
index 4e55789f..ea16ce30 100644
--- a/apply.php
+++ b/apply.php
@@ -11,9 +11,6 @@
 use RegRev\RegRev;
 
 Page::setTitle('Apply - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
-Page::excludeAsset('momentjs');
 
 $user = new User();
 if ($user->isLoggedIn()) {
diff --git a/assets/style.css.php b/assets/style.css.php
index 4d8d5cc4..eed66432 100644
--- a/assets/style.css.php
+++ b/assets/style.css.php
@@ -40,6 +40,10 @@
     }
 }
 
+table {
+    text-align: center;
+}
+
 * {
     font-family: 'Rubik', sans-serif;
 }
diff --git a/classes/Notifications.php b/classes/Notifications.php
deleted file mode 100644
index 299ef87c..00000000
--- a/classes/Notifications.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-/*
-Flare, a fully featured and easy to use crew centre, designed for Infinite Flight.
-Copyright (C) 2020  Lucas Rebato
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-class Notifications {
-
-    /**
-     * @var DB
-     */
-    private static $_db;
-
-    /**
-     * @var array
-     */
-    private static $_events = [
-        "user/accepted" => "handleUserAccepted",
-        "vanet/event/added" => "handleEventAdded",
-        "news/added" => "handleNewsAdded",
-        "pirep/accepted" => "handlePirep",
-        "pirep/denied" => "handlePirep",
-    ];
-
-    private static function init()
-    {
-        self::$_db = DB::getInstance();
-    }
-
-    /**
-     * @return array
-     * @param int $userId User ID
-     */
-    public static function mine($userId, $limit = 5)
-    {
-        self::init();
-
-        if (!is_numeric($limit)) throw new Exception("Parameter Limit must be Numeric");
-
-        $sql = "SELECT *, DATE_FORMAT(CONVERT_TZ(`datetime`, @@session.time_zone, '+00:00'), '%Y-%m-%dT%TZ') AS formattedDate FROM notifications 
-                WHERE pilotid=? OR pilotid=0 ORDER BY datetime DESC LIMIT {$limit}";
-        
-        return self::$_db->query($sql, [$userId])->results();
-    }
-
-    /**
-     * @return null
-     * @param int $pilot Pilot ID
-     * @param string $icon Icon
-     * @param string $subject Notification Subject
-     * @param string $content Notification Content
-     */
-    public static function notify($pilot, $icon, $subject, $content)
-    {
-        self::init();
-
-        if (strlen($icon) > 20) throw new Exception("Parameter icon must be 20 Characters or Less");
-        if (strlen($subject) > 20) throw new Exception("Parameter subject must be 20 Characters or Less");
-        if (strlen($content) > 60) throw new Exception("Parameter content must be 60 Characters or Less");
-
-        $res = self::$_db->insert('notifications', [
-            'pilotid' => $pilot,
-            'icon' => $icon,
-            'subject' => $subject,
-            'content' => $content,
-        ]);
-    }
-
-    /* EVENT HANDLERS */
-
-    /**
-     * @return null
-     * @param Event $ev
-     */
-    public static function handleEvent($ev)
-    {
-        if (!array_key_exists($ev->event, self::$_events)) return;
-
-        call_user_func_array('self::'.self::$_events[$ev->event], [$ev]);
-    }
-
-    /**
-     * @return null
-     * @param Event $ev
-     */
-    private static function handleUserAccepted($ev)
-    {
-        $args = $ev->params;
-        $vaname = Config::get('va/name');
-        $content = "Welcome to {$vaname}! We hope you enjoy your stay.";
-        if (strlen($content) > 60) return;
-        self::notify($args[0], "fa-smile-beam", $content);
-    }
-
-    /**
-     * @return null
-     * @param Event $ev
-     */
-    private static function handleEventAdded($ev)
-    {
-        $args = $ev->params;
-        $content = "An Event Called {$args['Name']} was just posted. Check it out!";
-        if (strlen($content) > 60) return;
-        self::notify(0, "fa-calendar", "New Event", $content);
-    }
-
-    /**
-     * @return null
-     * @param Event $ev
-     */
-    private static function handleNewsAdded($ev)
-    {
-        $args = $ev->params;
-        $content = "A News Item titled {$args['subject']} was just added by {$args['author']}";
-        if (strlen($content) > 60) return;
-        self::notify(0, "fa-newspaper", "News Added", $content);
-    }
-
-    /**
-     * @return null
-     * @param Event $ev
-     */
-    private static function handlePirep($ev)
-    {
-        self::init();
-        $args = $ev->params;
-        if ($ev->event == 'pirep/accepted') {
-            $pirep = self::$_db->get('pireps', ['id', '=', $args['id']])->results();
-            if (count($pirep) == 0) return;
-            $pirep = $pirep[0];
-            $content = "Your PIREP from {$pirep->departure} to {$pirep->arrival} was Accepted";
-            if (strlen($content) > 60) return;
-            self::notify(0, "fa-check", "PIREP Accepted", $content);
-        } else {
-            $pirep = self::$_db->get('pireps', ['id', '=', $args['id']])->results();
-            if (count($pirep) == 0) return;
-            $pirep = $pirep[0];
-            $content = "Your PIREP from {$pirep->departure} to {$pirep->arrival} was Denied";
-            if (strlen($content) > 60) return;
-            self::notify(0, "fa-times", "PIREP Denied", $content);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/classes/Page.php b/classes/Page.php
index 6314d585..8bd92df1 100644
--- a/classes/Page.php
+++ b/classes/Page.php
@@ -12,25 +12,7 @@ class Page
 {
 
     private static $_title;
-    private static $_assets = [
-        'bootstrap' => [
-            '<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">',
-            '<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>',
-            '<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>',
-            '<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script>',
-        ],
-        'custom-css' => ['<link rel="stylesheet" type="text/css" href="/assets/custom.css">'],
-        'flare-css' => ['<link rel="stylesheet" type="text/css" href="/assets/style.css.php">'],
-        'font-awesome' => ['<script src="https://kit.fontawesome.com/a076d05399.js"></script>'],
-        'chartjs' => ['<script src="https://cdn.jsdelivr.net/npm/chart.js@2.8.0"></script>'],
-        'momentjs' => ['<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.1/moment.min.js"></script>'],
-        'datatables' => [
-            '<script type="text/javascript" src="https://cdn.datatables.net/v/bs4/dt-1.10.21/datatables.min.js"></script>',
-            '<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/dt-1.10.22/datatables.min.css"/>',
-        ],
-    ];
-    private static $_usedAssets = [];
-    private static $_assetsMode = 0;
+    private static $_active;
 
     /**
      * @return null
@@ -38,10 +20,9 @@ class Page
      */
     public static function setTitle($title)
     {
+
         self::$_title = $title;
-        if (self::$_usedAssets == [] && self::$_assetsMode != 1) {
-            self::$_usedAssets = self::$_assets;
-        }
+
     }
 
     /**
@@ -49,86 +30,9 @@ public static function setTitle($title)
      */
     public static function getTitle()
     {
-        return self::$_title;
-        if (self::$_usedAssets == [] && self::$_assetsMode != 1) {
-            self::$_usedAssets = self::$_assets;
-        }
-    }
 
-    /**
-     * @return null
-     * @param int $mode 0 = Exclude to Remove, 1 = Include to Use
-     */
-    public static function assetsMode($mode)
-    {
-        if ($mode == 0) {
-            self::$_usedAssets = self::$_assets;
-        } elseif ($mode == 1) {
-            self::$_usedAssets = [];
-        } else {
-            throw new Exception("Invalid Assets Mode");
-        }
-        
-        self::$_assetsMode = $mode;
-    }
-
-    /**
-     * @return null
-     * @param string $asset Key of Asset to Include
-     */
-    public static function includeAsset($asset)
-    {
-        if (self::$_assetsMode != 1) return;
-
-        if (!array_key_exists($asset, self::$_assets)) {
-            throw new Exception("Asset '{$asset}' does not exist");
-        }
-
-        array_push(self::$_usedAssets, self::$_assets[$asset]);
-    }
-
-    /**
-     * @return null
-     * @param string $asset Key of Asset to Exclude
-     */
-    public static function excludeAsset($asset)
-    {
-        if (self::$_assetsMode != 0) return;
-
-        if (!array_key_exists($asset, self::$_assets)) {
-            throw new Exception("Asset '{$asset}' does not exist");
-        }
-
-        if (!array_key_exists($asset, self::$_usedAssets)) return;
-
-        unset(self::$_usedAssets[$asset]);
-    }
-
-    /**
-     * @return null
-     * @param string $key Asset Key
-     * @param array $tags Asset HTML Tags
-     */
-    public static function registerAsset($key, $tags)
-    {
-        self::$_assets[$key] = $tags;
-    }
-
-    /**
-     * @return array
-     */
-    public static function assets()
-    {
-        return self::$_assets;
-    }
+        return self::$_title;
 
-    /**
-     * @return bool
-     * @param string $asset Asset Key or HTML Tag
-     */
-    public static function assetInUse($asset)
-    {
-        return array_key_exists($asset, self::$_usedAssets) || in_array($asset, array_values(self::$_usedAssets));
     }
 
 }
\ No newline at end of file
diff --git a/classes/Pirep.php b/classes/Pirep.php
index df9d00a6..a868ccca 100644
--- a/classes/Pirep.php
+++ b/classes/Pirep.php
@@ -154,6 +154,45 @@ public static function decline($id)
 
     }
 
+    /**
+     * @return bool
+     * @param string $callsign Pilot Callsign
+     * @param int $id Pilot ID
+     */
+    public static function setup($callsign, $id) 
+    {
+
+        self::init();
+
+        $server = 'casual';
+        $force = Config::get('FORCE_SERVER');
+        if ($force != 0 && $force != 'casual') $server = $force;
+
+        $curl = new Curl;
+        $request = $curl->get(Config::get('vanet/base_url').'/api/userid', array(
+            'apikey' => Config::get('vanet/api_key'),
+            'callsign' => $callsign,
+            'server' => $server
+        ));
+        $response = Json::decode($request->body);
+        if (array_key_exists('status', $response)) {
+            if ($response['status'] == 404) {
+                return false;
+            }
+        }
+
+        if (!self::$_db->update('pilots', $id, 'id', array(
+            'ifuserid' => $response['data']
+        ))) {
+            return false;
+        }
+
+        Events::trigger('pirep/setup', ["pilot" => $id, "userid" => $response["data"]]);
+        
+        return true;
+
+    }
+
     /**
      * @return array
      */
diff --git a/classes/VANet.php b/classes/VANet.php
index b282c7b2..cd9af93d 100644
--- a/classes/VANet.php
+++ b/classes/VANet.php
@@ -86,73 +86,6 @@ public static function getStats()
         return Json::decode($request->body);
     }
 
-    /**
-     * @return bool
-     * @param string $callsign Pilot Callsign
-     * @param int $id Pilot ID
-     */
-    public static function setupPireps($callsign, $id) 
-    {
-        $db = DB::getInstance();
-
-        $server = 'casual';
-        $force = Config::get('FORCE_SERVER');
-        if ($force != 0 && $force != 'casual') $server = $force;
-
-        $curl = new Curl;
-        $request = $curl->get(Config::get('vanet/base_url').'/api/userid', array(
-            'apikey' => Config::get('vanet/api_key'),
-            'callsign' => $callsign,
-            'server' => $server
-        ));
-        $response = Json::decode($request->body);
-        if (array_key_exists('status', $response)) {
-            if ($response['status'] == 404) {
-                return false;
-            }
-        }
-
-        if (!$db->update('pilots', $id, 'id', array(
-            'ifuserid' => $response['data']
-        ))) {
-            return false;
-        }
-
-        Events::trigger('pirep/setup', ["pilot" => $id, "userid" => $response["data"], "method" => 0]);
-        
-        return true;
-    }
-
-    /**
-     * @return bool
-     * @param string $ifc Pilot IFC
-     * @param int $id Pilot ID
-     */
-    public static function setupPirepsIfc($ifc, $id)
-    {
-        $db = DB::getInstance();
-
-        $curl = new Curl;
-        $request = $curl->get(Config::get('vanet/base_url').'/api/userid/ifc', [
-            'apikey' => Config::get('vanet/api_key'),
-            'ifc' => $ifc,
-        ]);
-        $response = Json::decode($request->body);
-        if (array_key_exists('status', $response) && $response['status'] == 404) {
-            return false;
-        }
-
-        if (!$db->update('pilots', $id, 'id', [
-            'ifuserid' => $response['data']
-        ])) {
-            return false;
-        }
-
-        Events::trigger('pirep/setup', ["pilot" => $id, "userid" => $response["data"], "method" => 1]);
-
-        return true;
-    }
-
     /**
      * @return array
      * @param string $icao ICAO Code
diff --git a/core/init.php b/core/init.php
index dabb015f..fe81c151 100644
--- a/core/init.php
+++ b/core/init.php
@@ -26,7 +26,6 @@
 require_once __DIR__.'/../vendor/autoload.php';
 
 Events::listen('*', 'Logger::logEvent');
-Events::listen('*', 'Notifications::handleEvent');
 require_once __DIR__.'/listeners.php';
 require_once __DIR__.'/../functions/escape.php';
 require_once __DIR__.'/../includes/menus.php';
diff --git a/events.php b/events.php
index 2b5c13c8..61f8437b 100644
--- a/events.php
+++ b/events.php
@@ -12,7 +12,6 @@
 $user = new User();
 
 Page::setTitle('Events - '.Config::get('va/name'));
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('index.php');
diff --git a/home.php b/home.php
index a5345ad4..52c936fd 100644
--- a/home.php
+++ b/home.php
@@ -12,8 +12,6 @@
 $user = new User();
 
 Page::setTitle('Home - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('index.php');
diff --git a/includes/header.php b/includes/header.php
index 2b209780..df755c13 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -10,43 +10,38 @@
 <title><?= escape(Page::getTitle()) ?></title>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<?php
-  foreach (Page::assets() as $name => $tags) {
-    echo implode('', $tags);
-  }
-?>
-
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
+<link rel="stylesheet" type='text/css' href="/assets/style.css.php">
+<link rel="stylesheet" type='text/css' href="/assets/custom.css">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+<script src="https://cdn.ckeditor.com/ckeditor5/17.0.0/classic/ckeditor.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script>
+<script src="https://kit.fontawesome.com/a076d05399.js"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/v/bs4/dt-1.10.21/datatables.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/chart.js@2.8.0"></script>
 <script>
   $(document).ready(function() {
-    <?php if (Page::assetInUse('bootstrap')): ?>
-      $('[data-toggle="tooltip"]').tooltip(); 
-      $(".tooltip-toggle").tooltip();
-    <?php endif; ?>
-    
+    $('[data-toggle="tooltip"]').tooltip(); 
+    $(".tooltip-toggle").tooltip();
+
     $("nav .panel-link").addClass("nav-link");
 
-    <?php if (Page::assetInUse('datatables')): ?>
-      $(".datatable").dataTable({
-        "paging": true,
-        "ordering": true,
-        "info": true,
-        "pageLength": 10
-      });
-      $(".datatable-nosearch").dataTable({
-        "paging": true,
-        "ordering": true,
-        "searching": false,
-        "info": false,
-        "pageLength": 10,
-        "lengthChange": false,
-      });
-    <?php endif; ?>
+    $(".datatable").dataTable({
+      "paging": true,
+      "ordering": true,
+      "info": true,
+      "pageLength": 10
+    });
     
-    <?php if (Page::assetInUse('momentjs')): ?>
-      $(".moment").each(function(item) {
-        var m = moment($(this).text());
-        $(this).text(m.format('LLL'));
-      });
-    <?php endif; ?>
+    $(".datatable-nosearch").dataTable({
+      "paging": true,
+      "ordering": true,
+      "searching": false,
+      "info": false,
+      "pageLength": 10,
+      "lengthChange": false,
+    });
   });
 </script>
+<script src="https://www.google.com/recaptcha/api.js" async defer></script>
diff --git a/includes/menus.php b/includes/menus.php
index 020f1034..c811443d 100644
--- a/includes/menus.php
+++ b/includes/menus.php
@@ -82,18 +82,18 @@
         "permission" => "admin",
         "needsGold" => false
     ],
-    "Manage News" => [
-        "link" => "/admin/news.php",
-        "icon" => "fa-newspaper",
-        "permission" => "newsmanage",
-        "needsGold" => false
-    ],
     "Site Settings" => [
         "link" => "/admin/site.php",
         "icon" => "fa-cog",
         "permission" => "opsmanage",
         "needsGold" => false
     ],
+    "Manage News" => [
+        "link" => "/admin/news.php",
+        "icon" => "fa-newspaper",
+        "permission" => "newsmanage",
+        "needsGold" => false
+    ]
 );
 
 $GLOBALS['admin-menu']["Plugins"] = array(
diff --git a/includes/navbar.php b/includes/navbar.php
index a73cd0e9..45890cb5 100644
--- a/includes/navbar.php
+++ b/includes/navbar.php
@@ -82,23 +82,4 @@
             </li>
         <?php endif; ?>
     </ul>
-    <?php if ($user->isLoggedIn()): ?>
-        <ul class="navbar-nav ml-auto">
-            <li class="nav-item mobile-hidden">
-                <a class="nav-link" href="#" id="myNotifications-btn" data-toggle="dropdown" data-target="myNotifications" aria-haspopup="true" aria-expanded="false" style="color: <?= $textcol ?>!important;"><i class="fa fa-bell"></i></a>
-                <div class="dropdown-menu dropdown-menu-right m-2 shadow-lg" id="myNotifications">
-                    <?php
-                    $notifications = array_map(function($n) {
-                        return '<div class="dropdown-item">
-                            <small class="d-block m-0 p-0"><small class="moment">'.$n->formattedDate.'</small></small>
-                            <span class="d-block m-0 p-0"><i class="fa '.$n->icon.'"></i>&nbsp;&nbsp;<b>'.$n->subject.'</b></span>
-                            <small class="d-block m-0 p-0">'.$n->content.'</small>
-                        </div>';
-                    }, Notifications::mine($user->data()->id));
-                    echo implode('<div class="dropdown-divider"></div>', $notifications);
-                    ?>
-                </div>
-            </li>
-        </ul>
-    <?php endif; ?>
 </div>
\ No newline at end of file
diff --git a/index.php b/index.php
index 6bbac321..a73f06d2 100644
--- a/index.php
+++ b/index.php
@@ -14,9 +14,6 @@
 }
 
 Page::setTitle('Login - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
-Page::excludeAsset('momentjs');
 
 $user = new User();
 if ($user->isLoggedIn()) {
diff --git a/install/db.sql b/install/db.sql
index 3f75db11..30b5d802 100644
--- a/install/db.sql
+++ b/install/db.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `aircraft` (
   `rankreq` int(11) NOT NULL DEFAULT '1',
   `status` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `news` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS `news` (
   `dateposted` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `status` int(11) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 INSERT INTO `news` (`subject`, `content`, `author`) VALUES
 ('Welcome to Flare!', 'Thank You for installing Flare, the Crew Center made for Infinite Flight and integrated with VANet. Before you get your pilots set up with Flare, here are some things to keep in mind.\r\n\r\nFirst of all, if it\'s you\'re not a fan of the orange (kudos if you get the reference), you can change the color theme in site settings.\r\nNext, it\'s worth keeping in mind you can add transfer hours and transfer flights to your pilots. This means you can bring over hours and the number of PIREPs a pilot has filed from another Crew Center. This can be done in the admin panel.\r\nFinally, if you\'re confused with Flare at all check out the tutorials available at https://vanet.app/tutorials.\r\n\r\nEnjoy!', 'Flare Installer');
@@ -40,14 +40,14 @@ CREATE TABLE IF NOT EXISTS `pilots` (
   `joined` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `callsign` (`callsign`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `permissions` (
   `id` int NOT NULL AUTO_INCREMENT,
   `name` text NOT NULL,
   `userid` int NOT NULL,
   PRIMARY KEY (`id`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `pireps` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -61,14 +61,14 @@ CREATE TABLE IF NOT EXISTS `pireps` (
   `multi` text NOT NULL,
   `status` int(11) DEFAULT '0',
   PRIMARY KEY (`id`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `ranks` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(120) NOT NULL,
   `timereq` int(11) NOT NULL,
   PRIMARY KEY (`id`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 INSERT INTO `ranks` (`name`, `timereq`) VALUES
 ('Cadet', 0);
@@ -84,17 +84,8 @@ CREATE TABLE IF NOT EXISTS `routes` (
   `duration` int(11) NOT NULL,
   `aircraftid` int(11) NOT NULL,
   PRIMARY KEY (`id`)
-);
-
-CREATE TABLE `notifications` ( 
-  `id` INT NOT NULL AUTO_INCREMENT , 
-  `pilotid` INT NOT NULL , 
-  `icon` VARCHAR(20) NOT NULL , 
-  `subject` VARCHAR(20) NOT NULL , 
-  `content` VARCHAR(60) NOT NULL , 
-  `datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP , 
-  PRIMARY KEY (`id`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+COMMIT;
 
 CREATE TABLE IF NOT EXISTS `multipliers` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -103,13 +94,13 @@ CREATE TABLE IF NOT EXISTS `multipliers` (
   `name` varchar(120) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `options` ( 
   `name` varchar(120) NOT NULL, 
   `value` text NOT NULL, 
   PRIMARY KEY (`name`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 INSERT INTO `options` (`name`, `value`) VALUES ('FORCE_SERVER', '0');
 INSERT INTO `options` (`name`, `value`) VALUES ('CHECK_PRERELEASE', '0');
diff --git a/map.php b/map.php
index 18c7586d..82844456 100644
--- a/map.php
+++ b/map.php
@@ -12,8 +12,6 @@
 $user = new User();
 
 Page::setTitle('Live Map - '.Config::get('va/name'));
-Page::excludeAsset('datatables');
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('index.php');
diff --git a/pireps.php b/pireps.php
index b018042c..5f8ca166 100644
--- a/pireps.php
+++ b/pireps.php
@@ -12,7 +12,6 @@
 $user = new User();
 
 Page::setTitle('PIREPs - ' . Config::get('va/name'));
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('index.php');
@@ -219,10 +218,10 @@ function reverseFormatFlightTime() {
                                                 }
 
                                                 $(document).ready(function() {
-                                                    $("#flightTimeHrs").keyup(function() {
+                                                    $("#flightTimeHrs").on('change', function() {
                                                         formatFlightTime();
                                                     });
-                                                    $("#flightTimeMins").keyup(function() {
+                                                    $("#flightTimeMins").on('change', function() {
                                                         formatFlightTime();
                                                     });
                                                     reverseFormatFlightTime();
@@ -270,34 +269,16 @@ function reverseFormatFlightTime() {
                         <?php else: ?>
                             <h3>Setup PIREPs</h3>
                             <?php
-                            $ifc = explode('/', $user->data()->ifc)[4];
-                            $setupIfc = VANet::setupPirepsIfc($ifc, $user->data()->id);
-                            if ($setupIfc):
-                                Session::flash('successrecent', 'PIREPs were set up using your IFC Username. No further action is required.');
-                                ?>
-                                <script>window.location.href="/pireps.php?page=<?= Input::get('page') ?>";</script>
-                            <?php 
-                            else:
                                 $server = 'casual';
                                 $force = Config::get('FORCE_SERVER');
                                 if ($force != 0 && $force != 'casual') $server = $force;
-                                ?>
-                                <p>
-                                    Before you can start filing PIREPs, we need to grab a bit of data from Infinite Flight. 
-                                    As you're flying anonymously or haven't linked your IFC Account to your IF Account, 
-                                    we couldn't grab this information in the background.
-                                </p>
-                                <p>
-                                    Please spawn in on the <?= ucfirst($server); ?> Server, and ensure that you <b>set your 
-                                    callsign to your assigned one (<?= $user->data()->callsign ?>, if you've forgotten!).</b> 
-                                    Then, click the button below.
-                                </p>
-                                <form method="post" action="update.php">
-                                    <input hidden name="action" value="setuppireps" />
-                                    <input hidden name="callsign" value="<?= $user->data()->callsign ?>" />
-                                    <input type="submit" class="btn text-light bg-custom" value="Find Me">
-                                </form>
-                            <?php endif; ?>
+                            ?>
+                            <p>Before you can start filing PIREPs, we need to grab a bit of data from Infinite Flight. Please spawn in on the <?= ucfirst($server); ?> Server, and ensure that you <b>set your callsign to your assigned one (<?= $user->data()->callsign ?>, if you've forgotten!).</b> Then, click the button below.</p>
+                            <form method="post" action="update.php">
+                                <input hidden name="action" value="setuppireps" />
+                                <input hidden name="callsign" value="<?= $user->data()->callsign ?>" />
+                                <input type="submit" class="btn text-light bg-custom" value="Find Me">
+                            </form>
                         <?php endif; ?>
                     </div>
                 </div>
diff --git a/routes.php b/routes.php
index 53af0928..e7a73700 100644
--- a/routes.php
+++ b/routes.php
@@ -12,7 +12,6 @@
 $user = new User();
 
 Page::setTitle('Routes - '.Config::get('va/name'));
-Page::excludeAsset('chartjs');
 
 if (!$user->isLoggedIn()) {
     Redirect::to('index.php');
@@ -84,7 +83,7 @@
                         </form>
                     <?php else: ?>
                         <a href="routes.php" class="btn bg-custom mb-2">New Search</a>
-                        <table class="table table-striped datatable-nosearch">
+                        <table class="table table-striped">
                             <thead class="bg-custom">
                                 <tr>
                                     <th class="mobile-hidden">Flight Number</th>
diff --git a/update.php b/update.php
index 4719048a..ad4dddd2 100644
--- a/update.php
+++ b/update.php
@@ -238,7 +238,7 @@
         Redirect::to('/admin/recruitment.php');
     }
 
-    Events::trigger('user/accepted', [Input::get('accept')]);
+    Events::trigger('user/accepted', Input::get('accept'));
 
     Session::flash('success', 'Application Accepted Successfully!');
     Redirect::to('/admin/recruitment.php');
@@ -314,7 +314,7 @@
         'content' => Input::get('content'),
         'author' => Input::get('author')
     ));
-    Session::flash('success', 'News Article Added Successfully!');
+    Session::flash('success', 'News Article Added Successfully! ');
     Redirect::to('/admin/news.php');
 } elseif (Input::get('action') === 'deleteaircraft') {
     if (!$user->hasPermission('opsmanage')) {
@@ -344,7 +344,7 @@
     Session::flash('success', 'Aircraft Updated Successfully!');
     Redirect::to('/admin/operations.php?section=fleet');
 } elseif (Input::get('action') === 'setuppireps') {
-    if (!VANet::setupPireps(Input::get('callsign'), $user->data()->id)) {
+    if (!Pirep::setup(Input::get('callsign'), $user->data()->id)) {
         $server = 'casual';
         $force = Config::get('FORCE_SERVER');
         if ($force != 0 && $force != 'casual') $server = $force;
@@ -923,7 +923,6 @@
 
     for ($i=0; $i<$count; $i++) {
         $item = Input::get('livery'.$i);
-        if (empty($item)) continue;
         $aircraft = false;
         foreach ($allaircraft as $a) {
             if ($a->ifliveryid == $item) $aircraft = $a;
@@ -932,7 +931,6 @@
         if ($aircraft === FALSE) {
             Aircraft::add($item, $firstRank);
             $aircraft = Aircraft::findAircraft($item);
-            array_push($allaircraft, $aircraft);
         }
 
         $routes = str_replace(Input::get('rego'.$i), $aircraft->id, $routes);
@@ -940,7 +938,7 @@
 
     $routes = Json::decode($routes);
 
-    $sql = "INSERT INTO routes (fltnum, dep, arr, duration, aircraftid) VALUES";
+    $sql = "INSERT INTO routes (fltnum, dep, arr, duration, aircraftid, notes) VALUES\n";
     $params = array();
     $j = 0;
     foreach ($routes as $item) {
@@ -948,11 +946,11 @@
             $sql = trim($sql, ',');
             $ret = $db->query($sql, $params);
             if ($ret->error()) {
-                Session::flash('error', "Failed to Import Routes");
+                Session::flash('error', "Error Importing Routes");
                 Redirect::to('/admin/operations.php?section=phpvms');
                 die();
             }
-            $sql = "INSERT INTO routes (fltnum, dep, arr, duration, aircraftid) VALUES";
+            $sql = "INSERT INTO routes (fltnum, dep, arr, duration, aircraftid, notes) VALUES";
             $params = array();
         }
 
@@ -962,6 +960,7 @@
         array_push($params, $item["arr"]);
         array_push($params, $item["duration"]);
         array_push($params, $item["aircraftid"]);
+        array_push($params, Input::get('rego'.$i));
         
         $j++;
     }
@@ -969,20 +968,9 @@
     $sql = trim($sql, ',');
     $ret = $db->query($sql, $params);
     if ($ret->error()) {
-        foreach ($params as $pm) {
-            $rpl = $pm;
-            if (gettype($pm) == 'string') {
-                $rpl = "'{$pm}'";
-            }
-            $q = '?';
-            $one = 1;
-            $from = '/'.preg_quote('?', '/').'/';
-            $sql = preg_replace($from, $rpl, $sql, 1);
-        }
-        print($sql);
+        Session::flash('error', "Error Importing Routes");
+        Redirect::to('/admin/operations.php?section=import');
         die();
-        Session::flash('error', "Failed to Import Routes");
-        Redirect::to('/admin/operations.php?section=phpvms');
     }
 
     Events::trigger('route/imported');
@@ -1042,8 +1030,12 @@
     foreach ($pluginadv["installation"]["files"] as $f) {
         $f = str_replace("/", $slash, $f);
         if (file_exists(__DIR__.$slash.$f)) {
-            Session::flash('error', 'File "'.$f.'" already exists.');
-            Redirect::to('/admin/plugins.php');
+            if (unlink(__DIR__.$slash.$f) !== TRUE) {
+                Session::flash('error', 'File "'.$f.'" already exists, failed to delete it.');
+                Redirect::to('/admin/plugins.php');
+            }
+
+            Logger::log('File "'.__DIR__.$slash.$f.'" was deleted while installing plugin ' + $pluginbasic["name"]);
         }
     }
     foreach ($pluginadv["installation"]["files"] as $f) {
@@ -1093,7 +1085,10 @@
     foreach ($theplugin["installation"]["files"] as $file) {
         $file = str_replace("/", $slash, $file);
         $path = __DIR__.$slash.$file;
-        unlink($path);
+        if (unlink($path) === FALSE) {
+            Session::flash('error', 'Failed to remove file - '.$path);
+            Redirect::to('/admin/plugins.php?tab=installed');
+        }
     }
 
     Session::flash('success', 'Plugin Removed');
diff --git a/updater.php b/updater.php
index 5ebe8c67..0f1deae2 100644
--- a/updater.php
+++ b/updater.php
@@ -42,7 +42,7 @@
     if (!$currentFound && $r["tag_name"] == $current["tag"]) {
         $currentFound = true;
     } elseif ($currentFound && $next == null) {
-        if ($current["prerelease"]) {
+        if (Config::get('CHECK_PRERELEASE') == 1) {
             $next = $r;
             break;
         } elseif (!$r["prerelease"]) {
diff --git a/updates.json b/updates.json
index 2781472f..407577be 100644
--- a/updates.json
+++ b/updates.json
@@ -1,272 +1,4 @@
 [
-    {
-        "tag": "v1.0.0-beta4",
-        "name": "Public Beta 4",
-        "date": "2020-09-06",
-        "notes": "Redid VANet Integration, Updated Application Form, Fixed Design Issues on Mobile",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "classes/VANet.php",
-            "update.php",
-            "apply.php",
-            "classes/Validate.php",
-            "admin.php",
-            "assets/custom.php",
-            "pireps.php",
-            "routes.php",
-            "version.json"
-        ],
-        "deletedFiles": [],
-        "queries": []
-    },
-    {
-        "tag": "v1.0.0-beta5",
-        "name": "Public Beta 5",
-        "date": "2020-09-07",
-        "notes": "Added Updater",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "assets/custom.php",
-            "includes/footer.php",
-            "index.php",
-            "apply.php",
-            "routes.php",
-            "classes/Route.php",
-            "pireps.php",
-            "includes/header.php",
-            "admin.php",
-            "acars.php",
-            "includes/navbar.php",
-            "includes/sidebar.php",
-            "home.php",
-            "map.php",
-            "classes/DB.php",
-            "classes/User.php",
-            "update.php",
-            "version.json"
-        ],
-        "deletedFiles": [],
-        "queries": []
-    },
-    {
-        "tag": "v1.0.0-beta5.1",
-        "name": "Public Beta 5.1",
-        "date": "2020-09-11",
-        "notes": "Fixed Issue with Adding Aircraft",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "admin.php",
-            "classes/Aircraft.php",
-            "update.php",
-            "version.json"
-        ],
-        "deletedFiles": [],
-        "queries": [
-            "DELETE FROM aircraft WHERE status != 1;"
-        ]
-    },
-    {
-        "tag": "v1.0.0-beta6",
-        "name": "Public Beta 6",
-        "date": "2020-09-12",
-        "notes": "Added Option to Force Server for Live Operations, Redid VANet Integration, Major Optimizations, Fixed Tables Issue, Added More Config Functions, Added Events, Added Import/Export Functionality, Added Delete Confirmation Modals",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "version.json",
-            "acars.php",
-            "classes/Aircraft.php",
-            "classes/Pirep.php",
-            "classes/User.php",
-            "pireps.php",
-            "update.php",
-            "vanet.php",
-            "admin.php",
-            "events.php",
-            "includes/navbar.php",
-            "includes/sidebar.php",
-            "classes/Route.php",
-            "assets/custom.php",
-            "classes/VANet.php",
-            "includes/header.php"
-        ],
-        "deletedFiles": [],
-        "queries": [
-            "CREATE TABLE IF NOT EXISTS `options` ( `name` varchar(120) NOT NULL, `value` text NOT NULL, PRIMARY KEY (`name`)) ENGINE=InnoDB DEFAULT CHARSET=latin1;",
-            "ALTER TABLE `pireps` CHANGE `flightnum` `flightnum` VARCHAR(10) NOT NULL;",
-            "ALTER TABLE `routes` CHANGE `fltnum` `fltnum` VARCHAR(10) NOT NULL;",
-            "ALTER TABLE `routes` CHANGE `fltnum` `fltnum` VARCHAR(10) NOT NULL;",
-            "INSERT INTO `options` (`name`, `value`) VALUES ('FORCE_SERVER', '0');"
-        ]
-    },
-    {
-        "tag": "v1.0.0-beta6.1",
-        "name": "Public Beta 6.1",
-        "date": "2020-09-12",
-        "notes": "Fixed Installation DB Structure, Fixed Issue with Editing Staff in User Management",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "version.json",
-            "update.php",
-            "classes/User.php"
-        ],
-        "deletedFiles": [],
-        "queries": []
-    },
-    {
-        "tag": "v1.0.0-beta7",
-        "name": "Public Beta 7",
-        "date": "2020-09-13",
-        "notes": "Removed Dark/Light Mode Buttons on Mobile, Added Debugging Page for Beta Users, Added Easy Codeshare Support, Reworked Admin Menu, Added Ability to Delete Ranks",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "version.json",
-            "includes/navbar.php",
-            "admin.php",
-            "classes/VANet.php",
-            "update.php",
-            "includes/sidebar.php",
-            "vanet.php",
-            "core/init.php",
-            "includes/menus.php",
-            "classes/Rank.php",
-            "updater-alternate.php"
-        ],
-        "deletedFiles": [],
-        "queries": []
-    },
-    {
-        "tag": "v1.0.0-beta8",
-        "name": "Public Beta 8",
-        "date": "2020-09-15",
-        "notes": "Updated Updater, Added Ability to Enable/Disable Receiving Prerelease Versions, Fixed Initialization Issue",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "version.json",
-            "core/init.php",
-            "admin.php",
-            "updater.php"
-        ],
-        "deletedFiles": [],
-        "queries": [
-            "INSERT INTO `options` (`name`, `value`) VALUES ('CHECK_PRERELEASE', '1')"
-        ]
-    },
-    {
-        "tag": "v1.0.0-beta8.1",
-        "name": "Public Beta 8.1",
-        "date": "2020-09-15",
-        "notes": "Updated Alternate Updater",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "version.json",
-            "updater-alternate.php"
-        ],
-        "deletedFiles": [],
-        "queries": []
-    },
-    {
-        "tag": "v1.0.0-beta9",
-        "name": "Public Beta 9",
-        "date": "2020-09-16",
-        "notes": "Various Bug Fixes, Added Ability to Customize Text Colour, Added phpVMS Importer, Added Ability to Edit Routes",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "version.json",
-            "update.php",
-            "acars.php",
-            "admin.php",
-            "apply.php",
-            "assets/custom.php",
-            "classes/Config.php",
-            "classes/Rank.php",
-            "classes/Route.php",
-            "events.php",
-            "home.php",
-            "includes/header.php",
-            "includes/navbar.php",
-            "includes/sidebar.php",
-            "index.php",
-            "map.php",
-            "pireps.php",
-            "routes.php"
-        ],
-        "deletedFiles": [],
-        "queries": [
-            "CREATE TABLE IF NOT EXISTS `options` ( `name` varchar(120) NOT NULL, `value` text NOT NULL, PRIMARY KEY (`name`)) ENGINE=InnoDB DEFAULT CHARSET=latin1;",
-            "INSERT INTO options (name, value) SELECT * FROM (SELECT 'CHECK_PRERELEASE', '1') AS tmp WHERE NOT EXISTS (SELECT name FROM options WHERE name = 'CHECK_PRERELEASE') LIMIT 1;",
-            "INSERT INTO options (name, value) SELECT * FROM (SELECT 'FORCE_SERVER', '0') AS tmp WHERE NOT EXISTS (SELECT name FROM options WHERE name = 'FORCE_SERVER') LIMIT 1;",
-            "INSERT INTO options (name, value) SELECT * FROM (SELECT 'TEXT_COLOUR', '#FFF') AS tmp WHERE NOT EXISTS (SELECT name FROM options WHERE name = 'TEXT_COLOUR') LIMIT 1;"
-        ]
-    },
-    {
-        "tag": "v1.0.0-beta9.1",
-        "name": "Public Beta 9.1",
-        "date": "2020-09-16",
-        "notes": "Fix Issue with Updater",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "updater-alternate.php",
-            "version.json"
-        ],
-        "deletedFiles": [],
-        "queries": []
-    },
-    {
-        "tag": "v1.0.0-beta10",
-        "name": "Public Beta 10",
-        "date": "2020-09-17",
-        "notes": "Bug Fixes, Added Livery when Aircraft is Shown, Redid Permissions System",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "admin.php",
-            "acars.php",
-            "admin.php",
-            "events.php",
-            "includes/navbar.php",
-            "includes/sidebar.php",
-            "classes/Route.php",
-            "routes.php",
-            "classes/Permissions.php",
-            "classes/User.php",
-            "update.php",
-            "version.json"
-        ],
-        "deletedFiles": [],
-        "queries": [
-            "CREATE TABLE `permissions` ( `id` INT NOT NULL AUTO_INCREMENT , `name` VARCHAR(120) NOT NULL , `userid` INT NOT NULL , PRIMARY KEY (`id`)) ENGINE = InnoDB;",
-            "DELETE FROM aircraft WHERE status=0",
-            "INSERT INTO permissions (name, userid) VALUES ('admin', 1), ('usermanage', 1), ('staffmanage', 1), ('recruitment', 1), ('pirepmanage', 1), ('newsmanage', 1), ('opsmanage', 1), ('statsviewing', 1)"
-        ]
-    },
-    {
-        "tag": "v1.0.0-beta11",
-        "name": "Public Beta 11",
-        "date": "2020-09-19",
-        "notes": "Various Bug Fixes",
-        "prerelease": true,
-        "useUpdater": true,
-        "files": [
-            "events.php",
-            "classes/Pirep.php",
-            "pireps.php",
-            "update.php",
-            "admin.php",
-            "version.json"
-        ],
-        "deletedFiles": [],
-        "queries": []
-    },
     {
         "tag": "v1.0.0-beta12",
         "name": "Public Beta 12",
@@ -634,50 +366,20 @@
         "newFolders": []
     },
     {
-        "tag": "v1.1.0-beta1",
-        "name": "Version 1.1.0 Beta 1",
-        "date": "2020-11-11",
-        "notes": "Added Notifications System, Optimized Page Loading, Various Bug Fixes",
-        "prerelease": true,
+        "tag": "v1.0.2",
+        "name": "Version 1.0.2",
+        "date": "2020-11-22",
+        "notes": "Various Bug Fixes",
+        "prerelease": false,
         "useUpdater": true,
         "files": [
-            "assets/style.css.php",
-            "includes/navbar.php",
-            "update.php",
-            "includes/header.php",
-            "classes/Notifications.php",
-            "core/init.php",
-            "admin/users.php",
-            "classes/Pirep.php",
-            "classes/VANet.php",
+            "updater.php",
             "pireps.php",
-            "routes.php",
-            "includes/menus.php",
-            "acars.php",
-            "admin/codeshares.php",
-            "admin/events.php",
-            "admin/index.php",
-            "admin/multipliers.php",
-            "admin/news.php",
-            "admin/operations.php",
-            "admin/pireps.php",
-            "admin/recruitment.php",
-            "admin/site.php",
-            "admin/staff.php",
-            "admin/stats.php",
-            "apply.php",
-            "classes/Page.php",
-            "events.php",
-            "home.php",
-            "index.php",
-            "map.php",
+            "update.php",
             "version.json"
         ],
         "deletedFiles": [],
-        "queries": [
-            "CREATE TABLE `notifications` ( `id` INT NOT NULL AUTO_INCREMENT , `pilotid` INT NOT NULL , `icon` VARCHAR(20) NOT NULL , `subject` VARCHAR(20) NOT NULL , `content` VARCHAR(60) NOT NULL , `datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP , PRIMARY KEY (`id`));",
-            "TODO"
-        ],
+        "queries": [],
         "newFolders": []
     }
 ]
\ No newline at end of file
diff --git a/version.json b/version.json
index 86a99034..4f7e3548 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-    "tag": "v1.1.0-beta1",
-    "name": "Version 1.1.0 Beta 1",
-    "prerelease": true
+    "tag": "v1.0.2",
+    "name": "Version 1.0.2",
+    "prerelease": false
 }
\ No newline at end of file