diff --git a/_data/rdv.yml b/_data/rdv.yml
index dbbcb225..95ae4e1f 100644
--- a/_data/rdv.yml
+++ b/_data/rdv.yml
@@ -1 +1 @@
-version: 8.0.0
+version: 8.1.0
diff --git a/_games/am2r.md b/_games/am2r.md
index a951ee6e..2ae61310 100644
--- a/_games/am2r.md
+++ b/_games/am2r.md
@@ -6,9 +6,10 @@ randomize:
 - All items
 - Starting locations
 - Door locks
+- Transport Pipe destinations
 - A new goal has been added (DNA Hunt)
 need-to-play:
-- AM2R version 1.5.5
+- AM2R version 1.5.5 for either Windows, Linux or macOS
 multiworld: true
 development-state: stable
 faq:
diff --git a/_games/cave_story.md b/_games/cave_story.md
index 151f04cb..d5ec876c 100644
--- a/_games/cave_story.md
+++ b/_games/cave_story.md
@@ -6,7 +6,8 @@ randomize:
 - All items
 - Starting locations
 need-to-play:
-- Windows, Linux, or Wine. The game is included with Randovania
+- The game is included with Randovania. Windows or Wine is needed to play Freeware.Windows
+  or Linux is needed to play Cave Story Tweaked
 multiworld: true
 development-state: stable
 faq: []
diff --git a/_games/factorio.md b/_games/factorio.md
new file mode 100644
index 00000000..1d6dd4fa
--- /dev/null
+++ b/_games/factorio.md
@@ -0,0 +1,10 @@
+---
+game-id: factorio
+short-name: Factorio
+long-name: Factorio
+randomize: []
+need-to-play: []
+multiworld: false
+development-state: experimental
+faq: []
+---
diff --git a/_games/fusion.md b/_games/fusion.md
index 75ec3c38..ce39a1bd 100644
--- a/_games/fusion.md
+++ b/_games/fusion.md
@@ -5,7 +5,7 @@ long-name: Metroid Fusion
 randomize: []
 need-to-play: []
 multiworld: false
-development-state: experimental
+development-state: development
 faq:
 - question: What patcher does Randovania use?
   answer: Randovania supports the open source patcher MARS (Metroid Advance Randomizer
diff --git a/_games/prime1.md b/_games/prime1.md
index 2a2f632e..3844cbe4 100644
--- a/_games/prime1.md
+++ b/_games/prime1.md
@@ -8,7 +8,7 @@ randomize:
 - Starting locations
 - Door locks
 need-to-play:
-- An ISO of any Gamecube release of the game
+- An ISO of any GameCube release of the game
 - A modded Wii, or Dolphin Emulator
 multiworld: true
 development-state: stable
@@ -34,6 +34,6 @@ faq:
 - question: Why do I not take heat damage in some rooms in Magmoor, despite not having
     Varia Suit?
   answer: "Some rooms in Magmoor are not coded to be superheated. These include:\n
-    - Elevator Rooms\n- Storage Cavern\n- Every room including and past Twin Fires\n
-    - Burning Trail\n- Lake Access"
+    - All Elevator Rooms\n- Burning Trail\n- Storage Cavern\n- Every room after Twin
+    Fires Tunnel\n"
 ---
diff --git a/_games/prime2.md b/_games/prime2.md
index 99e91643..00729d2e 100644
--- a/_games/prime2.md
+++ b/_games/prime2.md
@@ -9,7 +9,7 @@ randomize:
 - Door locks
 - Translator gate requirements
 need-to-play:
-- An ISO of any NTSC-U or PAL Gamecube release of the game
+- An ISO of any NTSC-U or PAL GameCube release of the game
 - A modded Wii, or Dolphin Emulator
 multiworld: true
 development-state: stable
diff --git a/_games/prime3.md b/_games/prime3.md
index ec91c7be..f76ce6f1 100644
--- a/_games/prime3.md
+++ b/_games/prime3.md
@@ -5,7 +5,7 @@ long-name: 'Metroid Prime 3: Corruption'
 randomize: []
 need-to-play: []
 multiworld: false
-development-state: experimental
+development-state: development
 faq:
 - question: What causes the Hypermode vines in Corrupted Pool to disappear?
   answer: Collecting the ship item in Hangar Bay removes the vines.
diff --git a/_games/samus_returns.md b/_games/samus_returns.md
index 3fefabc6..097f9660 100644
--- a/_games/samus_returns.md
+++ b/_games/samus_returns.md
@@ -5,6 +5,8 @@ long-name: 'Metroid: Samus Returns'
 randomize:
 - All items, including ones normally locked behind amiibo
 - Starting locations
+- Door locks
+- Elevator destinations
 - A new goal has been added (DNA Hunt)
 need-to-play:
 - A modded 3DS with Luma3DS, or Citra
diff --git a/_games/super_metroid.md b/_games/super_metroid.md
index f177901e..d1b17f8d 100644
--- a/_games/super_metroid.md
+++ b/_games/super_metroid.md
@@ -5,7 +5,7 @@ long-name: Super Metroid
 randomize: []
 need-to-play: []
 multiworld: false
-development-state: experimental
+development-state: development
 faq:
 - question: What glitches are accounted for in logic?
   answer: Mostly none at the moment. There are a few, but this is a work in progress.
diff --git a/_includes/_readme/credits.md b/_includes/_readme/credits.md
index 4755e76f..45bd7415 100644
--- a/_includes/_readme/credits.md
+++ b/_includes/_readme/credits.md
@@ -26,16 +26,6 @@ Linux Flatpak build contributed by [Ethan Lee](https://flibitijibibo.com/).
 [Menu Mod README](https://www.dropbox.com/s/yhqqafaxfo3l4vn/Echoes%20Menu.7z?file_subpath=%2FEchoes+Menu%2Freadme.txt).
 * Converting Metroid Prime models by [Migs](https://www.twitch.tv/migslive).
 
-### Metroid Prime 3: Corruption
-* Game patching written by [gollop](https://github.com/gollop).
-* Room data collected by [Dyceron](https://www.twitch.tv/dyceron) and [KirbymastaH](https://www.twitch.tv/kirbymastah).
-
-### Super Metroid
-* Game Patching and Logic Database by [SolventMercury](https://github.com/SolventMercury).
-* Custom Item PLMs patch by [Kazuto](https://github.com/Kazuto88).
-* Skip Intro Saves patch by [PHOSPHOTiDYL](https://metroidconstruction.com/resource.php?id=265).
-* Other individual patches by [Total](https://github.com/tewtal), Foosda, Leodox, and others.
-
 ### Cave Story
 * Patcher and logic written by [duncathan_salt](https://twitter.com/duncathan_salt).
 * Based on the [original randomizer](https://shru.itch.io/cave-story-randomizer) by shru.
diff --git a/_includes/_readme/welcome.md b/_includes/_readme/welcome.md
index 40822231..6d81f1cc 100644
--- a/_includes/_readme/welcome.md
+++ b/_includes/_readme/welcome.md
@@ -1,5 +1,5 @@
 
-Randovania can randomize many aspects of its supported games, all while still ensuring they're completable 
+Randovania can randomize many aspects of its supported games, all while still ensuring they're completable
 without using any glitches or exploits. Its features include:
 
 * Randomizing what can be found in each item location. Weapons, keys, and more can end up in
diff --git a/_videos/am2r.md b/_videos/am2r.md
index 0b424fc9..5c400263 100644
--- a/_videos/am2r.md
+++ b/_videos/am2r.md
@@ -23,18 +23,27 @@ regions:
         - {difficulty: Intermediate, start_time: 0, video_id: QH3I73ZMQ3c}
         - {difficulty: Advanced, start_time: 0, video_id: s6e1hOW8UTI}
         - {difficulty: Advanced, start_time: 0, video_id: JlwkUM2KHCE}
+- key: Genetics Laboratory
+  value:
+  - key: Waterfalls Exterior
+    value:
+    - key: Horizontal Dock to Waterfall Ravine North East
+      value:
+      - key: Vertical Dock to Laboratory Save Station Access
+        value:
+        - {difficulty: Hypermode, start_time: 0, video_id: pek-zZsYFec}
 - key: Golden Temple
   value:
   - key: 1-Orb Hallway
     value:
-    - key: Horizontal Dock to Inner Temple East Hall
+    - key: Door to Inner Temple East Hall
       value:
       - key: Event - 1-Orb
         value:
         - {difficulty: Intermediate, start_time: 0, video_id: Q-LUdoIx0yQ}
   - key: Armory
     value:
-    - key: Horizontal Dock to Inner Temple East Hall
+    - key: Door to Inner Temple East Hall
       value:
       - key: Pickup (Top Missile Tank)
         value:
@@ -50,6 +59,13 @@ regions:
         value:
         - {difficulty: Beginner, start_time: 0, video_id: qiadG_Nmux4}
         - {difficulty: Intermediate, start_time: 0, video_id: g0kWLHM0p1Y}
+  - key: Golden Temple Exterior
+    value:
+    - key: Horizontal Dock to Outer Temple Save Station
+      value:
+      - key: Horizontal Dock to Exterior Alpha Nest
+        value:
+        - {difficulty: Hypermode, start_time: 0, video_id: FZI6scXiurM}
   - key: Guardian Arena
     value:
     - key: Horizontal Dock to Needler Nation
@@ -69,7 +85,7 @@ regions:
         - {difficulty: Intermediate, start_time: 0, video_id: f-OY6Ic-H9w}
   - key: Inner Temple West Hall
     value:
-    - key: Horizontal Dock to Bomb Chamber Access
+    - key: Door to Bomb Chamber Access
       value:
       - key: Middle
         value:
@@ -87,7 +103,7 @@ regions:
   value:
   - key: Inner Alpha Nest South
     value:
-    - key: Horizontal Dock to Water Turbine Station
+    - key: Door to Water Turbine Station
       value:
       - key: Pickup (Missile Tank)
         value:
diff --git a/_videos/dread.md b/_videos/dread.md
index 5d5a617c..77ec24a7 100644
--- a/_videos/dread.md
+++ b/_videos/dread.md
@@ -102,6 +102,9 @@ regions:
       value:
       - key: Pickup (Missile Tank)
         value:
+        - {difficulty: Beginner, start_time: 0, video_id: NQOTzIFON6U}
+        - {difficulty: Beginner, start_time: 0, video_id: IOwxRysaYv0}
+        - {difficulty: Intermediate, start_time: 0, video_id: mi0fCntpGcM}
         - {difficulty: Advanced, start_time: 0, video_id: 0CXWDqGRId8}
   - key: Teleport to Ferenia
     value:
@@ -185,6 +188,16 @@ regions:
       - key: Pickup (Energy Part)
         value:
         - {difficulty: Beginner, start_time: 0, video_id: P_LWT9EYwdI}
+- key: Dairon
+  value:
+  - key: Big Hub
+    value:
+    - key: Dock to Yellow EMMI Introduction
+      value:
+      - key: Pickup (Missile Tank)
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: Bt-sri9j5h8}
+        - {difficulty: Beginner, start_time: 0, video_id: BLyFQ2vkVoM}
 - key: Ferenia
   value:
   - key: EMMI Zone Exit East
@@ -202,6 +215,13 @@ regions:
       - key: Dock to Teleport to Burenia (Cyan)
         value:
         - {difficulty: Beginner, start_time: 0, video_id: qIanrM7cc3I}
+  - key: Pitfall Puzzle Room
+    value:
+    - key: Tunnel to Space Jump Room (Upper)
+      value:
+      - key: Pickup (Missile Tank)
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: mw12gft21hc}
   - key: Purple EMMI Arena
     value:
     - key: Tunnel to Wave Beam Tutorial
@@ -235,6 +255,13 @@ regions:
       - key: Dock to Transport to Ghavoran
         value:
         - {difficulty: Intermediate, start_time: 0, video_id: SUxSv6YFK3Y}
+  - key: Speedboost Slopes Maze
+    value:
+    - key: Bottom
+      value:
+      - key: Ledge above Slope
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: 8vhRInAoWoM}
 - key: Ghavoran
   value:
   - key: Blue EMMI Introduction
diff --git a/_videos/factorio.md b/_videos/factorio.md
new file mode 100644
index 00000000..b4cf73cd
--- /dev/null
+++ b/_videos/factorio.md
@@ -0,0 +1,3 @@
+---
+regions: []
+---
diff --git a/_videos/fusion.md b/_videos/fusion.md
index 3bf14053..5d7d31b8 100644
--- a/_videos/fusion.md
+++ b/_videos/fusion.md
@@ -8,30 +8,132 @@ regions:
       value:
       - key: Event - Central Hub PB Geron
         value:
-        - {difficulty: Expert, start_time: 0, video_id: EiFFpvNaT_A}
+        - {difficulty: Expert, start_time: 0, video_id: lDKp1H8k7oM}
+        - {difficulty: Hypermode, start_time: 0, video_id: cjf9wNjAbEY}
+  - key: Central Reactor Core
+    value:
+    - key: Door to Silo Checkpoint
+      value:
+      - key: Other to Silo Tunnel
+        value:
+        - {difficulty: Advanced, start_time: 0, video_id: vVG5YNwzGjw}
+    - key: Door to Silo Save Room
+      value:
+      - key: Door to Silo Entry
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: x7CqxW4JyJ4}
+  - key: Habitation Deck Entrance
+    value:
+    - key: Door to Elevator to Central Hub
+      value:
+      - key: Door to Habitation Deck (Middle)
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: AUkhZE_5CbE}
+  - key: Habitation Storage
+    value:
+    - key: Pickup (Power Bomb Tank)
+      value:
+      - key: Door to Central Hub
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: 7T5fVhUYQ4g}
+  - key: Operations Deck
+    value:
+    - key: Door to Elevator to Crew Quarters
+      value:
+      - key: Before Operations Room
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: GX6K70StdeY}
+  - key: Operations Maintenance Shaft
+    value:
+    - key: Door to Crew Quarters West
+      value:
+      - key: Event - Lower Maintainance Geron
+        value:
+        - {difficulty: Hypermode, start_time: 0, video_id: dWJXG-nGo6A}
+    - key: Other to Operations Deck
+      value:
+      - key: Event - Upper Maintainance Geron
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: Y3k5lGKTX4Y}
+  - key: Quarantine Access
+    value:
+    - key: Door to Western Hub
+      value:
+      - key: Door to Main Elevator Access
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: QcD2-t9UDrg}
+  - key: Restricted Airlock
+    value:
+    - key: Pickup (Power Bomb Tank)
+      value:
+      - key: Door to Restricted Corridor
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: u3xzqtz6Gro}
+  - key: Scaffolding Access
+    value:
+    - key: Beside Pickup
+      value:
+      - key: Door to Central Reactor Core
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: u8_gclW4-gQ}
+    - key: Door to Central Reactor Core
+      value:
+      - key: Beside Pickup
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: QAffTKp5seU}
+  - key: Silo Scaffolding
+    value:
+    - key: Beside Pickup
+      value:
+      - key: Door to Yakuza Arena
+        value:
+        - {difficulty: Advanced, start_time: 0, video_id: 2Pfo7v_Qngg}
+      - key: Other to Scaffolding Access
+        value:
+        - {difficulty: Advanced, start_time: 31, video_id: zmSH3fDcCVI}
+    - key: Other to Scaffolding Access
+      value:
+      - key: Beside Pickup
+        value:
+        - {difficulty: Advanced, start_time: 0, video_id: zmSH3fDcCVI}
+  - key: Station Entrance
+    value:
+    - key: Door to Docking Bay Shaft
+      value:
+      - key: Other to Spitter Speedway
+        value:
+        - {difficulty: Disabled, start_time: 0, video_id: 2WbnkPhd7tk}
+        - {difficulty: Intermediate, start_time: 0, video_id: QpbgjolExgE}
 - key: Sector 1 (SRX)
   value:
+  - key: Atmospheric Stabilizer Central
+    value:
+    - key: Door to Checkpoint
+      value:
+      - key: Event - Stabilizer 5 Online
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: 2biI4SB_wAs}
   - key: Atmospheric Stabilizer Northeast
     value:
     - key: Room Center
       value:
       - key: Event - Stabilizer 2 Online
         value:
-        - {difficulty: Advanced, start_time: 0, video_id: uppVC5hM3t0}
+        - {difficulty: Advanced, start_time: 0, video_id: I9YH_s989sQ}
   - key: Atmospheric Stabilizer Northwest
     value:
     - key: Room Center
       value:
       - key: Event - Stabilizer 1 Online
         value:
-        - {difficulty: Intermediate, start_time: 0, video_id: MIwjinIyBn4}
+        - {difficulty: Intermediate, start_time: 0, video_id: DpeSE126r3M}
   - key: Atmospheric Stabilizer Southeast
     value:
     - key: Room Center
       value:
       - key: Event - Stabilizer 4 Online
         value:
-        - {difficulty: Advanced, start_time: 0, video_id: IP4zjb-1kP4}
+        - {difficulty: Advanced, start_time: 0, video_id: SrshBBv-MCw}
         - {difficulty: Expert, start_time: 0, video_id: WsY4pSmBAyo}
   - key: Charge Core Arena
     value:
@@ -39,6 +141,9 @@ regions:
       value:
       - key: Pickup (Energy Tank)
         value:
+        - {difficulty: Disabled, start_time: 0, video_id: Z6_miH4qoQY}
+        - {difficulty: Intermediate, start_time: 0, video_id: q7HKdMt4v3g}
+        - {difficulty: Advanced, start_time: 0, video_id: Fo8-jjuPdik}
         - {difficulty: Hypermode, start_time: 0, video_id: BsW39UKOYVw}
   - key: Lava Lake
     value:
@@ -54,6 +159,13 @@ regions:
       - key: Door to Ridley Arena Access
         value:
         - {difficulty: Advanced, start_time: 0, video_id: trYxYGq7PMs}
+  - key: Ridley Arena Access
+    value:
+    - key: Door to Tourian Hub West
+      value:
+      - key: Door to Ridley Arena
+        value:
+        - {difficulty: Advanced, start_time: 0, video_id: 6LnIEbN2deg}
   - key: Screw Shaft
     value:
     - key: Door to Tourian Entrance
@@ -63,6 +175,28 @@ regions:
         - {difficulty: Expert, start_time: 0, video_id: 6ha7hZ0iW1I}
         - {difficulty: Hypermode, start_time: 0, video_id: T_aded4xYeU}
         - {difficulty: Hypermode, start_time: 0, video_id: o91JwaZoFTg}
+  - key: Tourian Entrance
+    value:
+    - key: Door to Tourian Shaft East
+      value:
+      - key: Door to Screw Shaft
+        value:
+        - {difficulty: Advanced, start_time: 0, video_id: rjzsSJlkeKw}
+  - key: Zebesian Zag
+    value:
+    - key: Door to Atmospheric Stabilizer Southeast
+      value:
+      - key: Door to Checkpoint Intersection
+        value:
+        - {difficulty: Disabled, start_time: 0, video_id: _PmmHN9YvKw}
+        - {difficulty: Intermediate, start_time: 0, video_id: Lh9D7Ye3rw8}
+  - key: Zebesian Zig
+    value:
+    - key: Door to Sciser Puddle
+      value:
+      - key: Door to Moto Motorway
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: kaOpAnrvgqk}
 - key: Sector 2 (TRO)
   value:
   - key: Data Hub
@@ -94,6 +228,27 @@ regions:
         - {difficulty: Hypermode, start_time: 0, video_id: Cqf5mZg1NZc}
 - key: Sector 3 (PYR)
   value:
+  - key: Alcove
+    value:
+    - key: Below E-Tank
+      value:
+      - key: Other to Entrance Lobby
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: UBvgvEpVc-Q}
+    - key: Bottom Right
+      value:
+      - key: Door to Deserted Runway
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: ZU70fb8aivM}
+        - {difficulty: Beginner, start_time: 0, video_id: s6HpLtE82Ug}
+        - {difficulty: Intermediate, start_time: 0, video_id: vIQJEjCc5n0}
+  - key: Checkpoint Crossing
+    value:
+    - key: Door to Entrance Lobby
+      value:
+      - key: Other to Namihe's Lair
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: 3sm2XhRsRRI}
   - key: Deserted Runway
     value:
     - key: Door to Alcove
@@ -101,8 +256,113 @@ regions:
       - key: Door to Glass Tube to Sector 1 (SRX)
         value:
         - {difficulty: Intermediate, start_time: 0, video_id: 7dIXfR4dkTA}
+  - key: Processing Access
+    value:
+    - key: Door to Red Tower
+      value:
+      - key: Door to Sova Processing (Upper)
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: 0ILTTSV-Uc4}
+  - key: Pyrochamber Access
+    value:
+    - key: Door to Sova Suite
+      value:
+      - key: Door to Pyrochamber
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: vxQS1_ohmS4}
+- key: Sector 4 (AQA)
+  value:
+  - key: Aquarium Hub
+    value:
+    - key: Door to Aquarium Speedway
+      value:
+      - key: Door to Drain Pipe
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: ID3TOSUmCa8}
+  - key: Aquarium Tank
+    value:
+    - key: Pickup (Missile Tank)
+      value:
+      - key: Door to Aquarium Shaft West
+        value:
+        - {difficulty: Advanced, start_time: 0, video_id: 4Msq5vtRTzw}
+  - key: Cargo Hold to Sector 5 (ARC)
+    value:
+    - key: Small Nook
+      value:
+      - key: Other to Aquarium Shaft West
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: zyazrYLRuSk}
+  - key: Evir Shaft
+    value:
+    - key: Door to Aquarium Tank
+      value:
+      - key: Door to Aquarium Hub Access
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: mm0dFQdA1sM}
+        - {difficulty: Beginner, start_time: 0, video_id: M6cyTUajA1s}
+        - {difficulty: Intermediate, start_time: 0, video_id: E-9GLV0t_sE}
+        - {difficulty: Advanced, start_time: 0, video_id: -g0hi1wELtI}
+  - key: Powamp Shaft
+    value:
+    - key: Door to Owtch Atrium
+      value:
+      - key: Other to Diffusion Connection Access
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: kxyotciTTXM}
+    - key: Upper Ladder
+      value:
+      - key: Other to Diffusion Connection Access
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: kxyotciTTXM&t=6}
+  - key: Pump Control Unit
+    value:
+    - key: Door to Pump Control Access
+      value:
+      - key: Pickup (Missile Tank)
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: 5cASpPGdiig}
+  - key: Reservoir East
+    value:
+    - key: Room Center
+      value:
+      - key: Door to Sciser Stall
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: h8Q6TKHg8kM}
+        - {difficulty: Beginner, start_time: 0, video_id: 3taYvq79AmA}
+  - key: Security Access
+    value:
+    - key: By Hole
+      value:
+      - key: Door to Cheddar Bay
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: TDwTWYNa_F8}
+      - key: Other to Sciser Sanctuary
+        value:
+        - {difficulty: Advanced, start_time: 0, video_id: PtkMTguvNwE}
+  - key: Serris Escape
+    value:
+    - key: Door to Escape Save Room
+      value:
+      - key: Beside Pickup
+        value:
+        - {difficulty: Advanced, start_time: 0, video_id: F-XptNF7OOg}
 - key: Sector 5 (ARC)
   value:
+  - key: Crow's Nest
+    value:
+    - key: Door to Glass Tube to Sector 3 (PYR)
+      value:
+      - key: Pickup (Hidden Power Bomb Tank)
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: JChKb_XpMlw}
+  - key: Nightmare Hub West
+    value:
+    - key: Door to Nightmare Save Room
+      value:
+      - key: Door to Nightmare Recharge Room
+        value:
+        - {difficulty: Expert, start_time: 0, video_id: H1K0xkWlhAU}
   - key: Nightmare Nook
     value:
     - key: Door to Nightmare Hub East
@@ -110,4 +370,80 @@ regions:
       - key: Pickup (Energy Tank)
         value:
         - {difficulty: Advanced, start_time: 0, video_id: uUAoOZGU9HI}
+  - key: Nightmare Training Grounds
+    value:
+    - key: Door to Gerubus Gully
+      value:
+      - key: Door to Entrance Lobby
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: weMdKWzp31g}
+      - key: Door to Training Aerie
+        value:
+        - {difficulty: Advanced, start_time: 0, video_id: Qe9eMPmoUcU}
+  - key: Security Shaft East
+    value:
+    - key: Door to Level 3 Security Room
+      value:
+      - key: Door to Security Cache
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: a7A00q8XP9M}
+- key: Sector 6 (NOC)
+  value:
+  - key: Big Shell 1
+    value:
+    - key: Door to Big Shell 2
+      value:
+      - key: Door to Shell Access
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: zONETruT9GE}
+        - {difficulty: Advanced, start_time: 0, video_id: sllAuRCH1UM}
+  - key: Blue X Blockade
+    value:
+    - key: Door to Data Access
+      value:
+      - key: Door to Big Shell 2
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: AiYGhtYXWGI}
+  - key: Clogged Cavern
+    value:
+    - key: Door to Cavern Save Access
+      value:
+      - key: Door to Nocturnal Playground
+        value:
+        - {difficulty: Intermediate, start_time: 0, video_id: 8j_pwpvapbw}
+  - key: Geron's Crossing
+    value:
+    - key: Door to Entrance Lobby
+      value:
+      - key: Door to Nocturnal Access
+        value:
+        - {difficulty: Advanced, start_time: 0, video_id: 4vs0MvX4oew}
+  - key: Pillar Puzzle
+    value:
+    - key: Door to Nocturnal Shaft
+      value:
+      - key: Pickup (Energy Tank)
+        value:
+        - {difficulty: Expert, start_time: 0, video_id: 8Gl3-ZWtDAQ}
+  - key: Shell Access
+    value:
+    - key: Door to Big Shell 1
+      value:
+      - key: Door to Clogged Cavern
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: OKuCxGiJQTI}
+  - key: Twin Caverns West
+    value:
+    - key: Ledge
+      value:
+      - key: Pickup (Hidden Missile Tank)
+        value:
+        - {difficulty: Beginner, start_time: 0, video_id: H7t8QXqLuKg}
+    - key: Pickup (Missile Tank)
+      value:
+      - key: Door to Twin Caverns East (Upper)
+        value:
+        - {difficulty: Expert, start_time: 0, video_id: FVO9oTKMA3c}
+        - {difficulty: Expert, start_time: 0, video_id: zIZTb7Y3Q9o}
+        - {difficulty: Expert, start_time: 0, video_id: ai9uskBbhUY}
 ---
diff --git a/_videos/prime1.md b/_videos/prime1.md
index d598b92b..11bc82fa 100644
--- a/_videos/prime1.md
+++ b/_videos/prime1.md
@@ -488,11 +488,6 @@ regions:
   value:
   - key: Central Dynamo
     value:
-    - key: Door to Quarantine Access A
-      value:
-      - key: Pickup (Main Power Bombs)
-        value:
-        - {difficulty: Intermediate, start_time: 0, video_id: LRmJn2BAYwc}
     - key: Fight Trigger
       value:
       - key: Event - Security Drone
@@ -1258,9 +1253,11 @@ regions:
         - {difficulty: Intermediate, start_time: 0, video_id: UVXjHNV3dWU}
     - key: Door to Root Tunnel
       value:
+      - key: Out of Bounds (Skywalk)
+        value:
+        - {difficulty: Expert, start_time: 0, video_id: imhkxmwiU9o}
       - key: Pickup (Missile Expansion)
         value:
         - {difficulty: Intermediate, start_time: 0, video_id: x2zjlvSy0Og}
         - {difficulty: Intermediate, start_time: 0, video_id: i2J6z6wrLGw}
-        - {difficulty: Expert, start_time: 0, video_id: imhkxmwiU9o}
 ---
diff --git a/_videos/prime3.md b/_videos/prime3.md
index 3c5ea120..768765cf 100644
--- a/_videos/prime3.md
+++ b/_videos/prime3.md
@@ -123,6 +123,11 @@ regions:
       - key: Door to Repair Bay
         value:
         - {difficulty: Advanced, start_time: 0, video_id: l8ICCVjhcq0}
+    - key: Door to Repair Bay
+      value:
+      - key: Door to Docking Bay 5
+        value:
+        - {difficulty: Expert, start_time: 0, video_id: l8ICCVjhcq0}
   - key: Repair Bay
     value:
     - key: Door to Hangar A Access
diff --git a/_videos/samus_returns.md b/_videos/samus_returns.md
index b05de141..4ad3461f 100644
--- a/_videos/samus_returns.md
+++ b/_videos/samus_returns.md
@@ -353,6 +353,13 @@ regions:
       - key: Door to Ramulken Rollway
         value:
         - {difficulty: Intermediate, start_time: 0, video_id: 6knVhkzcL9Q}
+    - key: Door to Ramulken Rollway
+      value:
+      - key: Pickup (Missile Tank)
+        value:
+        - {difficulty: Intermediate, start_time: 9, video_id: uM1DHyPmGiM}
+        - {difficulty: Intermediate, start_time: 0, video_id: uM1DHyPmGiM}
+        - {difficulty: Advanced, start_time: 14, video_id: uM1DHyPmGiM}
   - key: Gamma Arena South
     value:
     - key: Left of Fan
diff --git a/assets/games/factorio.png b/assets/games/factorio.png
new file mode 100644
index 00000000..53d813b3
Binary files /dev/null and b/assets/games/factorio.png differ
diff --git a/ci.sh b/ci.sh
index b889bd77..37443450 100755
--- a/ci.sh
+++ b/ci.sh
@@ -4,7 +4,7 @@ set -e -x
 shopt -s extglob
 cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 
-randovania_version=8.0.0
+randovania_version=8.1.0
 
 echo "Installing Requirements"