diff --git a/worlds/timespinner/docs/setup_de.md b/worlds/timespinner/docs/setup_de.md
index 0fe3fe17..463568ec 100644
--- a/worlds/timespinner/docs/setup_de.md
+++ b/worlds/timespinner/docs/setup_de.md
@@ -5,7 +5,7 @@
 - [Timespinner (Steam)](https://store.steampowered.com/app/368620/Timespinner/)
   , [Timespinner (Humble)](https://www.humblebundle.com/store/timespinner)
   oder [Timespinner (GOG)](https://www.gog.com/game/timespinner) (andere Versionen werden nicht unterstützt)
-- [Timespinner Randomizer](https://github.com/JarnoWesthof/TsRandomizer)
+- [Timespinner Randomizer](https://github.com/Jarno458/TsRandomizer)
 
 ## Wie funktioniert's?
 
@@ -15,7 +15,7 @@ die Randomisierung der Gegenstände zu erlauben
 ## Installationsanweisungen
 
 1. Die aktuellsten Dateien des Randomizers findest du ganz oben auf dieser
-   Webseite: [Timespinner Randomizer Releases](https://github.com/JarnoWesthof/TsRandomizer/releases). Lade dir unter '
+   Webseite: [Timespinner Randomizer Releases](https://github.com/Jarno458/TsRandomizer/releases). Lade dir unter '
    Assets' die .zip Datei für dein Betriebssystem herunter
 2. Entpacke die .zip Datei im Ordner, in dem das Spiel Timespinner installiert ist
 
@@ -27,7 +27,7 @@ die Randomisierung der Gegenstände zu erlauben
 
 ... im Ordner in dem die Inhalte aus der .zip Datei entpackt wurden
 
-Weitere Informationen zum Randomizer findest du hier: [ReadMe](https://github.com/JarnoWesthof/TsRandomizer)
+Weitere Informationen zum Randomizer findest du hier: [ReadMe](https://github.com/Jarno458/TsRandomizer)
 
 ## An einer Multiworld teilnehmen
 
diff --git a/worlds/timespinner/docs/setup_en.md b/worlds/timespinner/docs/setup_en.md
index ae8c97a1..c47c639c 100644
--- a/worlds/timespinner/docs/setup_en.md
+++ b/worlds/timespinner/docs/setup_en.md
@@ -5,7 +5,7 @@
 - [Timespinner (Steam)](https://store.steampowered.com/app/368620/Timespinner/)
   , [Timespinner (Humble)](https://www.humblebundle.com/store/timespinner)
   or [Timespinner (GOG)](https://www.gog.com/game/timespinner) (other versions are not supported)
-- [Timespinner Randomizer](https://github.com/JarnoWesthof/TsRandomizer)
+- [Timespinner Randomizer](https://github.com/Jarno458/TsRandomizer)
 
 ## General Concept
 
@@ -14,11 +14,11 @@ randomization of the items
 
 ## Installation Procedures
 
-Download latest release on [Timespinner Randomizer Releases](https://github.com/JarnoWesthof/TsRandomizer/releases) you
+Download latest release on [Timespinner Randomizer Releases](https://github.com/Jarno458/TsRandomizer/releases) you
 can find the .zip files on the releases page. Download the zip for your current platform. Then extract the zip to the
 folder where your Timespinner game is installed. Then just run TsRandomizer.exe (on Windows) or
 TsRandomizer.bin.x86_64 (on Linux) or TsRandomizer.bin.osx (on Mac) instead of Timespinner.exe to start the game in
-randomized mode. For more info see the [ReadMe](https://github.com/JarnoWesthof/TsRandomizer)
+randomized mode. For more info see the [ReadMe](https://github.com/Jarno458/TsRandomizer)
 
 ## Joining a MultiWorld Game
 
diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py
index 8c6dc40c..0857ef6b 100644
--- a/worlds/witness/__init__.py
+++ b/worlds/witness/__init__.py
@@ -35,6 +35,8 @@ class WitnessWorld(World):
     """
     game = "The Witness"
     topology_present = False
+    data_version = 2
+
     static_logic = StaticWitnessLogic()
     static_locat = StaticWitnessLocations()
     static_items = StaticWitnessItems()
diff --git a/worlds/witness/docs/setup_en.md b/worlds/witness/docs/setup_en.md
index df114e12..d577953c 100644
--- a/worlds/witness/docs/setup_en.md
+++ b/worlds/witness/docs/setup_en.md
@@ -3,7 +3,7 @@
 ## Required Software
 
 - [The Witness for 64-bit Windows (e.g. Steam version)](https://store.steampowered.com/app/210970/The_Witness/)
-- [The Witness Archipelago Randomizer](https://github.com/JarnoWesthof/The-Witness-Randomizer-for-Archipelago/releases)
+- [The Witness Archipelago Randomizer](https://github.com/Jarno458/The-Witness-Randomizer-for-Archipelago/releases)
 
 ## Optional Software
 
@@ -18,7 +18,7 @@ It is recommended to do every single one of these steps when you connect to a wo
 1. Launch The Witness
 2. Start a fresh save (unless you have absolutely no other choice)
 3. Do not move
-4. Launch [The Witness Archipelago Randomizer](https://github.com/JarnoWesthof/The-Witness-Randomizer-for-Archipelago)
+4. Launch [The Witness Archipelago Randomizer](https://github.com/Jarno458/The-Witness-Randomizer-for-Archipelago)
 5. Enter the Archipelago address, slot name and password
 6. Press "Randomize"
 7. Wait for the randomization to fully finish before moving in-game