diff --git a/.gitignore b/.gitignore
index 5e14c09c..bbf73eb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ debug.log
 /src/.shutdown
 lib/rammerhead/src/client/hammerhead.min.js
 lib/rammerhead/src/client/rammerhead.min.js
+views/archive/gfiles/rarch/roms
diff --git a/src/server.mjs b/src/server.mjs
index 96f5bba7..3ae0153a 100644
--- a/src/server.mjs
+++ b/src/server.mjs
@@ -131,6 +131,37 @@ app.register(fastifyStatic, {
   decorateReply: false,
 });
 
+app.register(fastifyStatic, {
+  root: fileURLToPath(new URL('../views/archive/gfiles/rarch', import.meta.url)),
+  prefix: '/serving/',
+  decorateReply: false,
+});
+
+app.register(fastifyStatic, {
+  root: fileURLToPath(new URL('../views/archive/gfiles/rarch/cores', import.meta.url)),
+  prefix: '/cores/',
+  decorateReply: false,
+});
+
+app.register(fastifyStatic, {
+  root: fileURLToPath(new URL('../views/archive/gfiles/rarch/info', import.meta.url)),
+  prefix: '/info/',
+  decorateReply: false,
+});
+
+app.register(fastifyStatic, {
+  root: fileURLToPath(new URL('../views/archive/gfiles/rarch/cores', import.meta.url)),
+  prefix: '/uauth/',
+  decorateReply: false,
+});
+
+// NEVER commit roms due to piracy concerns
+app.register(fastifyStatic, {
+  root: fileURLToPath(new URL('../views/archive/gfiles/rarch/roms', import.meta.url)),
+  prefix: '/roms/',
+  decorateReply: false,
+});
+
 app.register(fastifyStatic, {
   root: fileURLToPath(
     new URL(
diff --git a/views/archive b/views/archive
index 3fbda08d..ba041c02 160000
--- a/views/archive
+++ b/views/archive
@@ -1 +1 @@
-Subproject commit 3fbda08de34280845842560ff49b7fed69949715
+Subproject commit ba041c0299f34a83959dc3dc34427d34b94cbe70
diff --git a/views/assets/json/emu-nav.json b/views/assets/json/emu-nav.json
index 4e59a62e..1a292dcd 100644
--- a/views/assets/json/emu-nav.json
+++ b/views/assets/json/emu-nav.json
@@ -1,4 +1,10 @@
 [
+  {
+    "name": "Webretro Collection",
+    "path": "/webretro",
+    "img": "genesis.png",
+    "description": "Search through the collection of emulators featured!"
+  },
   {
     "name": "GBA Emulator",
     "path": "/webretro?core=mgba",
@@ -18,16 +24,10 @@
     "description": "Emulate SNES games! Click to upload a ROM."
   },
   {
-    "name": "Genesis Emulator",
-    "path": "/webretro?core=genesis_plus_gx",
-    "img": "genesis.png",
-    "description": "Emulate Genesis games! Click to upload a ROM."
-  },
-  {
-    "name": "N64 Emulator (BROKEN)",
+    "name": "N64 Emulator",
     "path": "/webretro?core=mupen64plus_next",
     "img": "nintendo64.png",
-    "description": "Emulate N64 games! Click to upload a ROM. (Currently Broken)"
+    "description": "Emulate N64 games! Click to upload a ROM."
   },
   {
     "name": "VibeOS",