diff --git a/worlds/witness/data/WitnessLogic.txt b/worlds/witness/data/WitnessLogic.txt
index fabd1428810b..db4e7ed2e9cd 100644
--- a/worlds/witness/data/WitnessLogic.txt
+++ b/worlds/witness/data/WitnessLogic.txt
@@ -754,12 +754,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
 158300 - 0x00987 (Intro Back 7) - 0x00985 - Shapers
 158301 - 0x181A9 (Intro Back 8) - 0x00987 - Shapers
 
-Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
+Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
 158302 - 0x00609 (Sliding Bridge) - True - Shapers
 159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
 159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True
 
-Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
+Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
 158313 - 0x00982 (Platform Row 1) - True - Shapers
 158314 - 0x0097F (Platform Row 2) - 0x00982 - Shapers
 158315 - 0x0098F (Platform Row 3) - 0x0097F - Shapers
diff --git a/worlds/witness/data/WitnessLogicExpert.txt b/worlds/witness/data/WitnessLogicExpert.txt
index 200138dee1f7..cf153753a8c3 100644
--- a/worlds/witness/data/WitnessLogicExpert.txt
+++ b/worlds/witness/data/WitnessLogicExpert.txt
@@ -754,12 +754,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
 158300 - 0x00987 (Intro Back 7) - 0x00985 - Shapers & Rotated Shapers & Triangles & Black/White Squares
 158301 - 0x181A9 (Intro Back 8) - 0x00987 - Rotated Shapers & Triangles & Black/White Squares
 
-Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
+Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
 158302 - 0x00609 (Sliding Bridge) - True - Shapers & Black/White Squares
 159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
 159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True
 
-Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
+Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
 158313 - 0x00982 (Platform Row 1) - True - Rotated Shapers
 158314 - 0x0097F (Platform Row 2) - 0x00982 - Rotated Shapers
 158315 - 0x0098F (Platform Row 3) - 0x0097F - Rotated Shapers
diff --git a/worlds/witness/data/WitnessLogicVanilla.txt b/worlds/witness/data/WitnessLogicVanilla.txt
index 67a42ba7e4d4..2846118bf6a4 100644
--- a/worlds/witness/data/WitnessLogicVanilla.txt
+++ b/worlds/witness/data/WitnessLogicVanilla.txt
@@ -754,12 +754,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
 158300 - 0x00987 (Intro Back 7) - 0x00985 - Shapers
 158301 - 0x181A9 (Intro Back 8) - 0x00987 - Shapers
 
-Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
+Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
 158302 - 0x00609 (Sliding Bridge) - True - Shapers
 159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
 159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True
 
-Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
+Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
 158313 - 0x00982 (Platform Row 1) - True - Shapers
 158314 - 0x0097F (Platform Row 2) - 0x00982 - Shapers
 158315 - 0x0098F (Platform Row 3) - 0x0097F - Shapers
diff --git a/worlds/witness/data/WitnessLogicVariety.txt b/worlds/witness/data/WitnessLogicVariety.txt
index a3c388dfb1e4..4edb9d415a03 100644
--- a/worlds/witness/data/WitnessLogicVariety.txt
+++ b/worlds/witness/data/WitnessLogicVariety.txt
@@ -754,12 +754,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
 158300 - 0x00987 (Intro Back 7) - 0x00985 - Rotated Shapers & Triangles
 158301 - 0x181A9 (Intro Back 8) - 0x00987 - Shapers & Triangles
 
-Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
+Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
 158302 - 0x00609 (Sliding Bridge) - True - Shapers
 159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
 159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True
 
-Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
+Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
 158313 - 0x00982 (Platform Row 1) - True - Shapers
 158314 - 0x0097F (Platform Row 2) - 0x00982 - Shapers
 158315 - 0x0098F (Platform Row 3) - 0x0097F - Shapers
diff --git a/worlds/witness/options.py b/worlds/witness/options.py
index 4de966abe96d..f2877399f3fc 100644
--- a/worlds/witness/options.py
+++ b/worlds/witness/options.py
@@ -164,6 +164,16 @@ class ObeliskKeys(DefaultOnToggle):
     display_name = "Obelisk Keys"
 
 
+class UnlockableWarps(Toggle):
+    """
+    Adds unlockable fast travel points to the game.
+    These warp points are represented by spheres in game. You walk up to one, you unlock it for warping.
+
+    The warp points are: Entry, Symmetry Island, Desert, Quarry, Keep, Shipwreck, Town, Jungle, Bunker, Treehouse, Mountaintop, Caves.
+    """
+    display_name = "Unlockable Fast Travel Points"
+
+
 class ShufflePostgame(Toggle):
     """
     Adds locations into the pool that are guaranteed to become accessible after or at the same time as your goal.
@@ -413,6 +423,7 @@ class TheWitnessOptions(PerGameCommonOptions):
     shuffle_discarded_panels: ShuffleDiscardedPanels
     shuffle_vault_boxes: ShuffleVaultBoxes
     obelisk_keys: ObeliskKeys
+    unlockable_warps: UnlockableWarps
     shuffle_EPs: ShuffleEnvironmentalPuzzles  # noqa: N815
     EP_difficulty: EnvironmentalPuzzlesDifficulty
     shuffle_postgame: ShufflePostgame
@@ -467,6 +478,9 @@ class TheWitnessOptions(PerGameCommonOptions):
         ShuffleBoat,
         ObeliskKeys,
     ]),
+    OptionGroup("Warps", [
+       UnlockableWarps,
+    ]),
     OptionGroup("Filler Items", [
         PuzzleSkipAmount,
         TrapPercentage,