diff --git a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_-1/mw$default_2.txt b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_-1/mw$default_2.txt
index a592213..7bfdd07 100644
--- a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_-1/mw$default_2.txt
+++ b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_-1/mw$default_2.txt
@@ -1,17 +1,16 @@
 #
-#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:global
+#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:visibility_type:destination
 #
-waypoint:Anarchy:A:79:128:328:13:false:0:gui.xaero_default:false:0:false
-waypoint:Other roof hole:O:147:128:296:1:false:0:gui.xaero_default:false:0:false
-waypoint:Carter:C:-125:128:-164:2:false:0:gui.xaero_default:false:0:false
-waypoint:Percy:P:-42:132:223:10:false:0:gui.xaero_default:false:0:false
-waypoint:cat:C:-51:128:536:5:false:0:gui.xaero_default:false:0:false
-waypoint:Mountain Base:M:-172:131:6:2:false:0:gui.xaero_default:false:0:false
-waypoint:james:J:-63:131:-64:2:false:0:gui.xaero_default:false:0:false
-waypoint:Ladder to Top:L:-92:89:-30:2:false:0:gui.xaero_default:false:0:false
-waypoint:te:T:6:38:251:4:false:0:gui.xaero_default:false:0:false
-waypoint:ice portal:I:-650:128:-250:3:false:0:gui.xaero_default:false:0:false
-waypoint:End:E:-213:131:-78:12:false:0:gui.xaero_default:false:0:false
-waypoint:Home:H:-24:132:128:0:false:0:gui.xaero_default:false:0:false
-waypoint:Spawn Portal:S:-74:83:2:0:false:0:gui.xaero_default:false:0:false
-
+waypoint:Anarchy:A:79:128:328:13:false:0:gui.xaero_default:false:0:0:false
+waypoint:Other roof hole:O:147:128:296:1:false:0:gui.xaero_default:false:0:0:false
+waypoint:Carter:C:-125:128:-164:2:false:0:gui.xaero_default:false:0:0:false
+waypoint:Percy:P:-42:132:223:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:cat:C:-51:128:536:5:false:0:gui.xaero_default:false:0:0:false
+waypoint:Mountain Base:M:-172:131:6:2:false:0:gui.xaero_default:false:0:0:false
+waypoint:james:J:-63:131:-64:2:false:0:gui.xaero_default:false:0:0:false
+waypoint:Ladder to Top:L:-92:89:-30:2:false:0:gui.xaero_default:false:0:0:false
+waypoint:te:T:6:38:251:4:false:0:gui.xaero_default:false:0:0:false
+waypoint:ice portal:I:-650:128:-250:3:false:0:gui.xaero_default:false:0:0:false
+waypoint:End:E:-213:131:-78:12:false:0:gui.xaero_default:false:0:0:false
+waypoint:Home:H:-24:132:128:0:false:0:gui.xaero_default:false:0:0:false
+waypoint:Spawn Portal:S:-74:83:2:0:false:0:gui.xaero_default:false:0:0:false
diff --git a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_-1/mw-1,0,0_3.txt b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_-1/mw-1,0,0_3.txt
index 894f424..b964de6 100644
--- a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_-1/mw-1,0,0_3.txt
+++ b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_-1/mw-1,0,0_3.txt
@@ -1,6 +1,5 @@
 #
-#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:global
+#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:visibility_type:destination
 #
-waypoint:jake:J:-32:131:-110:9:false:0:gui.xaero_default:false:0:false
-waypoint:Home:H:-10:132:129:5:false:0:gui.xaero_default:false:0:false
-
+waypoint:jake:J:-32:131:-110:9:false:0:gui.xaero_default:false:0:0:false
+waypoint:Home:H:-10:132:129:5:false:0:gui.xaero_default:false:0:0:false
diff --git a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw$default_1.txt b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw$default_1.txt
index cd8155b..008da9d 100644
--- a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw$default_1.txt
+++ b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw$default_1.txt
@@ -1,39 +1,38 @@
 sets:gui.xaero_default:RemotePlayers_Temp:Bases
 #
-#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:global
+#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:visibility_type:destination
 #
-waypoint:Anarchy:A:687:32:2547:13:false:0:gui.xaero_default:false:0:false
-waypoint:Nice spot:N:257:81:319:14:false:0:gui.xaero_default:false:0:false
-waypoint:Carter:C:-994:65:-1305:10:false:0:gui.xaero_default:false:0:false
-waypoint:Ice portal:I:-5201:86:-1988:2:false:0:gui.xaero_default:false:0:false
-waypoint:Percy:P:-327:71:1801:10:false:0:gui.xaero_default:false:0:false
-waypoint:Cat's Secret Base:C:-450:64:4368:12:false:0:gui.xaero_default:false:0:false
-waypoint:Squid Farm:S:1140:64:-1625:0:false:0:gui.xaero_default:false:0:false
-waypoint:Chicken Farm:C:-267:55:150:0:false:0:gui.xaero_default:false:0:false
-waypoint:t:T:-2391:80:1305:0:false:0:gui.xaero_default:false:0:false
-waypoint:Sally:S:-1439:64:-59:10:false:0:gui.xaero_default:false:0:false
-waypoint:Skeleton Farm:S:1718:70:384:0:false:0:gui.xaero_default:false:0:false
-waypoint:CommonOctopus:C:1662:68:306:10:false:0:gui.xaero_default:false:0:false
-waypoint:Totem farm:T:-38:71:1656:0:false:0:gui.xaero_default:false:0:false
-waypoint:Wills monument:W:-1909:56:798:3:false:0:gui.xaero_default:false:0:false
-waypoint:Monument:M:2799:52:1376:3:false:0:gui.xaero_default:false:0:false
-waypoint:Will:W:-483:62:338:10:false:0:gui.xaero_default:false:0:false
-waypoint:Tyson:T:3298:178:-2820:10:false:0:gui.xaero_default:false:0:false
-waypoint:Sydney:S:-1748:110:320:10:false:0:gui.xaero_default:false:0:false
-waypoint:Ethan:E:-1447:67:-830:10:false:0:gui.xaero_default:false:0:false
-waypoint:Ian:I:162:105:-125:10:false:0:gui.xaero_default:false:0:false
-waypoint:Cat:C:-278:70:-290:10:false:0:gui.xaero_default:false:0:false
-waypoint:Turtles:T:-1761:65:40:15:false:0:gui.xaero_default:false:0:false
-waypoint:Trident Farm:T:97:200:-2280:0:false:0:gui.xaero_default:false:0:false
-waypoint:Test Site:T:-841:65:1421:15:false:0:gui.xaero_default:false:0:false
-waypoint:Zombie Farm:Z:-475:26:1021:0:false:0:gui.xaero_default:false:0:false
-waypoint:Mountain Base:M:-1304:79:-7:10:false:0:gui.xaero_default:false:0:false
-waypoint:Jake:J:-435:69:-851:10:false:0:gui.xaero_default:false:0:false
-waypoint:James:J:-501:66:-514:10:false:0:gui.xaero_default:false:0:false
-waypoint:Nether Fortress:G:307:83:1452:6:false:0:gui.xaero_default:false:0:false
-waypoint:End Portal:E:-1712:31:-622:6:false:0:gui.xaero_default:false:0:false
-waypoint:Large Village:V:331:63:1396:4:false:0:gui.xaero_default:false:0:false
-waypoint:Evan:H:-170:63:1038:10:false:0:gui.xaero_default:false:0:false
-waypoint:Community Centre:C:-499:67:79:12:false:0:gui.xaero_default:false:0:false
-waypoint:test:T:-144:68:1024:5:false:0:Bases:false:0:false
-
+waypoint:Anarchy:A:687:32:2547:13:false:0:gui.xaero_default:false:0:0:false
+waypoint:Nice spot:N:257:81:319:14:false:0:gui.xaero_default:false:0:0:false
+waypoint:Carter:C:-994:65:-1305:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Ice portal:I:-5201:86:-1988:2:false:0:gui.xaero_default:false:0:0:false
+waypoint:Percy:P:-327:71:1801:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Cat's Secret Base:C:-450:64:4368:12:false:0:gui.xaero_default:false:0:0:false
+waypoint:Squid Farm:S:1140:64:-1625:0:false:0:gui.xaero_default:false:0:0:false
+waypoint:Chicken Farm:C:-267:55:150:0:false:0:gui.xaero_default:false:0:0:false
+waypoint:t:T:-2391:80:1305:0:false:0:gui.xaero_default:false:0:0:false
+waypoint:Sally:S:-1439:64:-59:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Skeleton Farm:S:1718:70:384:0:false:0:gui.xaero_default:false:0:0:false
+waypoint:CommonOctopus:C:1662:68:306:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Totem farm:T:-38:71:1656:0:false:0:gui.xaero_default:false:0:0:false
+waypoint:Wills monument:W:-1909:56:798:3:false:0:gui.xaero_default:false:0:0:false
+waypoint:Monument:M:2799:52:1376:3:false:0:gui.xaero_default:false:0:0:false
+waypoint:Will:W:-483:62:338:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Tyson:T:3298:178:-2820:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Sydney:S:-1748:110:320:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Ethan:E:-1447:67:-830:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Ian:I:162:105:-125:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Cat:C:-278:70:-290:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Turtles:T:-1761:65:40:15:false:0:gui.xaero_default:false:0:0:false
+waypoint:Trident Farm:T:97:200:-2280:0:false:0:gui.xaero_default:false:0:0:false
+waypoint:Test Site:T:-841:65:1421:15:false:0:gui.xaero_default:false:0:0:false
+waypoint:Zombie Farm:Z:-475:26:1021:0:false:0:gui.xaero_default:false:0:0:false
+waypoint:Mountain Base:M:-1304:79:-7:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Jake:J:-435:69:-851:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:James:J:-501:66:-514:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Nether Fortress:G:307:83:1452:6:false:0:gui.xaero_default:false:0:0:false
+waypoint:End Portal:E:-1712:31:-622:6:false:0:gui.xaero_default:false:0:0:false
+waypoint:Large Village:V:331:63:1396:4:false:0:gui.xaero_default:false:0:0:false
+waypoint:Evan:H:-170:63:1038:10:false:0:gui.xaero_default:false:0:0:false
+waypoint:Community Centre:C:-499:67:79:12:false:0:gui.xaero_default:false:0:0:false
+waypoint:test:T:-144:68:1024:5:false:0:Bases:false:0:0:false
diff --git a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw$old_3.txt b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw$old_3.txt
index 3513847..39d2827 100644
--- a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw$old_3.txt
+++ b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw$old_3.txt
@@ -1,6 +1,5 @@
 #
-#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:global
+#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:visibility_type:destination
 #
-waypoint:gui.xaero_deathpoint:D:-471:65:76:0:false:1:gui.xaero_default:false:0:true
-waypoint:gui.xaero_deathpoint_old:D:-200:70:0:0:false:0:gui.xaero_default:false:0:true
-
+waypoint:gui.xaero_deathpoint:D:-471:65:76:0:false:1:gui.xaero_default:false:0:1:true
+waypoint:gui.xaero_deathpoint_old:D:-200:70:0:0:false:0:gui.xaero_default:false:0:1:false
diff --git a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw-4,0,2_2.txt b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw-4,0,2_2.txt
index ec14331..fa0d9c8 100644
--- a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw-4,0,2_2.txt
+++ b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_0/mw-4,0,2_2.txt
@@ -1,4 +1,3 @@
 #
-#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:global
+#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:visibility_type:destination
 #
-
diff --git a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_1/mw$default_1.txt b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_1/mw$default_1.txt
index 5bd4f09..1a5ae96 100644
--- a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_1/mw$default_1.txt
+++ b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.rsninja.dev/dim_1/mw$default_1.txt
@@ -1,10 +1,9 @@
 #
-#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:global
+#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:visibility_type:destination
 #
-waypoint:e:E:392:49:-2200:2:false:0:gui.xaero_default:false:0:false
-waypoint:XP Farm:X:375:1:-8:0:false:0:gui.xaero_default:false:0:false
-waypoint:Portal:P:0:68:0:5:false:0:gui.xaero_default:false:0:false
-waypoint:another portal:A:289:60:1365:2:false:0:gui.xaero_default:false:0:false
-waypoint:island:I:-576:62:1050:3:false:0:gui.xaero_default:false:0:false
-waypoint:island:I:-576:62:1050:12:false:0:gui.xaero_default:false:0:false
-
+waypoint:e:E:392:49:-2200:2:false:0:gui.xaero_default:false:0:0:false
+waypoint:XP Farm:X:375:1:-8:0:false:0:gui.xaero_default:false:0:0:false
+waypoint:Portal:P:0:68:0:5:false:0:gui.xaero_default:false:0:0:false
+waypoint:another portal:A:289:60:1365:2:false:0:gui.xaero_default:false:0:0:false
+waypoint:island:I:-576:62:1050:3:false:0:gui.xaero_default:false:0:0:false
+waypoint:island:I:-576:62:1050:12:false:0:gui.xaero_default:false:0:0:false
diff --git a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.sdf.org/dim%0/mw$default_1.txt b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.sdf.org/dim%0/mw$default_1.txt
index 03f7994..c2d372a 100644
--- a/configs/minecraft/XaeroWaypoints/Multiplayer_mc.sdf.org/dim%0/mw$default_1.txt
+++ b/configs/minecraft/XaeroWaypoints/Multiplayer_mc.sdf.org/dim%0/mw$default_1.txt
@@ -2,6 +2,17 @@ sets:gui.xaero_default:Buildings:Subway Stations
 #
 #waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:visibility_type:destination
 #
+waypoint:Carter:C:-1069:70:-710:7:false:0:gui.xaero_default:false:0:0:false
+waypoint:Slime Farm:S:4975:4:5854:1:false:0:gui.xaero_default:false:0:0:false
+waypoint:Northern Village:N:37:74:-10056:8:false:0:gui.xaero_default:false:0:0:false
+waypoint:Creeper Farm:C:5092:5:5481:9:false:0:gui.xaero_default:false:0:0:false
+waypoint:Warp Room:W:-4328:7:-2168:14:false:0:gui.xaero_default:false:0:0:false
+waypoint:New Base:N:-532:73:-2308:4:false:0:gui.xaero_default:false:0:1:false
+waypoint:Percy Home:X:-131:66:-102:9:false:0:gui.xaero_default:false:0:1:false
+waypoint:End Portal:E:921:23:1221:5:false:0:gui.xaero_default:false:0:0:false
+waypoint:Miwu Home:M:-287:77:-432:9:false:0:gui.xaero_default:false:0:1:false
+waypoint:Home:H:-198:69:-303:9:false:0:gui.xaero_default:false:0:1:false
+waypoint:Spawn:*:-137:70:-256:0:false:0:gui.xaero_default:false:0:1:false
 waypoint:Iron Farm:I:-186:57:-217:8:false:0:Buildings:false:0:0:false
 waypoint:Spawn Inn:S:-136:70:-233:8:false:0:Buildings:false:0:0:false
 waypoint:Kenny Rogers Roaster:K:-156:70:-233:8:false:0:Buildings:false:0:0:false
@@ -103,13 +114,3 @@ waypoint:[NDK] North Docks Station:S:-187:41:-1519:14:false:0:Subway Stations:fa
 waypoint:[BOH] Boathouse Station:S:-187:42:-839:14:false:0:Subway Stations:false:0:0:false
 waypoint:[RST] Riverside Station:S:-189:42:-321:14:false:0:Subway Stations:false:0:0:false
 waypoint:Spawn Central Station:S:-213:42:-258:13:false:0:Subway Stations:false:0:0:false
-waypoint:Slime Farm:S:4975:4:5854:1:false:0:gui.xaero_default:false:0:0:false
-waypoint:Northern Village:N:37:74:-10056:8:false:0:gui.xaero_default:false:0:0:false
-waypoint:Creeper Farm:C:5092:5:5481:9:false:0:gui.xaero_default:false:0:0:false
-waypoint:Warp Room:W:-4328:7:-2168:14:false:0:gui.xaero_default:false:0:0:false
-waypoint:New Base:N:-532:73:-2308:4:false:0:gui.xaero_default:false:0:1:false
-waypoint:Percy Home:X:-131:66:-102:9:false:0:gui.xaero_default:false:0:1:false
-waypoint:End Portal:E:921:23:1221:5:false:0:gui.xaero_default:false:0:0:false
-waypoint:Miwu Home:M:-287:77:-432:9:false:0:gui.xaero_default:false:0:1:false
-waypoint:Home:H:-198:69:-303:9:false:0:gui.xaero_default:false:0:1:false
-waypoint:Spawn:*:-137:70:-256:0:false:0:gui.xaero_default:false:0:1:false
diff --git a/configs/minecraft/scripts/mc_postexit.py b/configs/minecraft/scripts/mc_postexit.py
index 1b5eb08..797ff8a 100644
--- a/configs/minecraft/scripts/mc_postexit.py
+++ b/configs/minecraft/scripts/mc_postexit.py
@@ -6,7 +6,7 @@ import shutil
 from pathlib import Path
 
 MINECRAFT_DIR = Path(os.environ["INST_MC_DIR"])
-WAYPOINT_BASE_DIR = MINECRAFT_DIR / "XaeroWaypoints"
+WAYPOINT_BASE_DIR = MINECRAFT_DIR / "xaero" / "minimap"
 GLOBAL_WAYPOINT_DIR = (
     Path(os.path.expanduser("~")) / ".config" / "minecraft" / "XaeroWaypoints"
 )
diff --git a/configs/minecraft/scripts/mc_prelaunch.py b/configs/minecraft/scripts/mc_prelaunch.py
index 20ed4d2..53fc8b1 100644
--- a/configs/minecraft/scripts/mc_prelaunch.py
+++ b/configs/minecraft/scripts/mc_prelaunch.py
@@ -6,7 +6,7 @@ import shutil
 from pathlib import Path
 
 MINECRAFT_DIR = Path(os.environ["INST_MC_DIR"])
-WAYPOINT_BASE_DIR = MINECRAFT_DIR / "XaeroWaypoints"
+WAYPOINT_BASE_DIR = MINECRAFT_DIR / "xaero" / "minimap"
 GLOBAL_WAYPOINT_DIR = (
     Path(os.path.expanduser("~")) / ".config" / "minecraft" / "XaeroWaypoints"
 )