diff --git a/P3D/Content/Data/Scripts/lavender/fuji.dat b/P3D/Content/Data/Scripts/lavender/fuji.dat
index f5d304821..42ac0ec2a 100644
Binary files a/P3D/Content/Data/Scripts/lavender/fuji.dat and b/P3D/Content/Data/Scripts/lavender/fuji.dat differ
diff --git a/P3D/Content/Data/Scripts/lighthouse/ampharos.dat b/P3D/Content/Data/Scripts/lighthouse/ampharos.dat
index f3779994d..0c4e896c9 100644
Binary files a/P3D/Content/Data/Scripts/lighthouse/ampharos.dat and b/P3D/Content/Data/Scripts/lighthouse/ampharos.dat differ
diff --git a/P3D/Content/Data/Scripts/pallet/bulbasaur.dat b/P3D/Content/Data/Scripts/pallet/bulbasaur.dat
index 2d185a4be..4e4a657fe 100644
Binary files a/P3D/Content/Data/Scripts/pallet/bulbasaur.dat and b/P3D/Content/Data/Scripts/pallet/bulbasaur.dat differ
diff --git a/P3D/Content/Data/Scripts/pallet/charmander.dat b/P3D/Content/Data/Scripts/pallet/charmander.dat
index 79b1b48e7..b4eb24c07 100644
Binary files a/P3D/Content/Data/Scripts/pallet/charmander.dat and b/P3D/Content/Data/Scripts/pallet/charmander.dat differ
diff --git a/P3D/Content/Data/Scripts/pallet/squirtle.dat b/P3D/Content/Data/Scripts/pallet/squirtle.dat
index ec4549925..ef083474e 100644
Binary files a/P3D/Content/Data/Scripts/pallet/squirtle.dat and b/P3D/Content/Data/Scripts/pallet/squirtle.dat differ
diff --git a/P3D/Content/Data/Scripts/slenderman.dat b/P3D/Content/Data/Scripts/slenderman.dat
index ff2557fe2..82889a2dc 100644
Binary files a/P3D/Content/Data/Scripts/slenderman.dat and b/P3D/Content/Data/Scripts/slenderman.dat differ
diff --git a/P3D/Content/Data/maps/chrono/memorial.dat b/P3D/Content/Data/maps/chrono/memorial.dat
index b7f805d1c..05815b1c0 100644
Binary files a/P3D/Content/Data/maps/chrono/memorial.dat and b/P3D/Content/Data/maps/chrono/memorial.dat differ
diff --git a/P3D/Content/Data/maps/cinnabar/main.dat b/P3D/Content/Data/maps/cinnabar/main.dat
index d947e0398..229240669 100644
Binary files a/P3D/Content/Data/maps/cinnabar/main.dat and b/P3D/Content/Data/maps/cinnabar/main.dat differ
diff --git a/P3D/Content/Data/maps/darkcave/darkcave1.dat b/P3D/Content/Data/maps/darkcave/darkcave1.dat
index ad31ff839..2f5ef592f 100644
Binary files a/P3D/Content/Data/maps/darkcave/darkcave1.dat and b/P3D/Content/Data/maps/darkcave/darkcave1.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower5f.dat b/P3D/Content/Data/maps/ecruteak/tintower5f.dat
index e5bcf96a3..73bd18505 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower5f.dat and b/P3D/Content/Data/maps/ecruteak/tintower5f.dat differ
diff --git a/P3D/Content/Data/maps/fuchsia/main.dat b/P3D/Content/Data/maps/fuchsia/main.dat
index 163dfbd4b..43b10799d 100644
Binary files a/P3D/Content/Data/maps/fuchsia/main.dat and b/P3D/Content/Data/maps/fuchsia/main.dat differ
diff --git a/P3D/Content/Data/maps/icefall/basement.dat b/P3D/Content/Data/maps/icefall/basement.dat
index 3d753aa35..07360151d 100644
Binary files a/P3D/Content/Data/maps/icefall/basement.dat and b/P3D/Content/Data/maps/icefall/basement.dat differ
diff --git a/P3D/Content/Data/maps/ilexforest.dat b/P3D/Content/Data/maps/ilexforest.dat
index 7586b7fec..c8b22a8ea 100644
Binary files a/P3D/Content/Data/maps/ilexforest.dat and b/P3D/Content/Data/maps/ilexforest.dat differ
diff --git a/P3D/Content/Data/maps/lakeofrage.dat b/P3D/Content/Data/maps/lakeofrage.dat
index 571547cd2..4f99524e9 100644
Binary files a/P3D/Content/Data/maps/lakeofrage.dat and b/P3D/Content/Data/maps/lakeofrage.dat differ
diff --git a/P3D/Content/Data/maps/lavender/main.dat b/P3D/Content/Data/maps/lavender/main.dat
index 40a087a8b..694aaf099 100644
Binary files a/P3D/Content/Data/maps/lavender/main.dat and b/P3D/Content/Data/maps/lavender/main.dat differ
diff --git a/P3D/Content/Data/maps/mtmoon/square.dat b/P3D/Content/Data/maps/mtmoon/square.dat
index 7a803407a..97d874f72 100644
Binary files a/P3D/Content/Data/maps/mtmoon/square.dat and b/P3D/Content/Data/maps/mtmoon/square.dat differ
diff --git a/P3D/Content/Data/maps/nationalpark/nationalpark0.dat b/P3D/Content/Data/maps/nationalpark/nationalpark0.dat
index 9acd45b34..3937836b3 100644
Binary files a/P3D/Content/Data/maps/nationalpark/nationalpark0.dat and b/P3D/Content/Data/maps/nationalpark/nationalpark0.dat differ
diff --git a/P3D/Content/Data/maps/rocktunnel/bf2.dat b/P3D/Content/Data/maps/rocktunnel/bf2.dat
index 53cc90bf2..a47a4a3a0 100644
Binary files a/P3D/Content/Data/maps/rocktunnel/bf2.dat and b/P3D/Content/Data/maps/rocktunnel/bf2.dat differ
diff --git a/P3D/Content/Data/maps/saffron/main.dat b/P3D/Content/Data/maps/saffron/main.dat
index 2b5fa6823..0855149a0 100644
Binary files a/P3D/Content/Data/maps/saffron/main.dat and b/P3D/Content/Data/maps/saffron/main.dat differ
diff --git a/P3D/Content/Data/maps/violet.dat b/P3D/Content/Data/maps/violet.dat
index b76dba94c..6d7278c10 100644
Binary files a/P3D/Content/Data/maps/violet.dat and b/P3D/Content/Data/maps/violet.dat differ
diff --git a/P3D/Screens/MainMenu/JoinServerScreen.vb b/P3D/Screens/MainMenu/JoinServerScreen.vb
index 68d50e2ee..354a7176d 100644
--- a/P3D/Screens/MainMenu/JoinServerScreen.vb
+++ b/P3D/Screens/MainMenu/JoinServerScreen.vb
@@ -270,6 +270,7 @@ Public Class JoinServerScreen
                 SelectedServer = Me.ServerList(selectIndex)
                 ServerList.Move(selectIndex, 1)
                 SaveServerlist()
+                Core.SetScreen(New OverworldScreen())
                 Core.SetScreen(New ConnectScreen(ConnectScreen.Modes.Connect, "Connecting to server", "Please wait...", Core.CurrentScreen))
             End If
         End If
diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe
index a9829eb6b..5e4fa6961 100644
Binary files a/lib/build/Pokemon3D.exe and b/lib/build/Pokemon3D.exe differ