diff --git a/Data/Map010.rxdata b/Data/Map010.rxdata
index 66fae0012..7d6ea2bca 100644
Binary files a/Data/Map010.rxdata and b/Data/Map010.rxdata differ
diff --git a/Data/Map341.rxdata b/Data/Map341.rxdata
index 9538d3d4f..b7d7c47f7 100644
Binary files a/Data/Map341.rxdata and b/Data/Map341.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 6aee65d37..fdb3d0436 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/050_Outfits/UI/LayeredClothes_Menus.rb b/Data/Scripts/050_Outfits/UI/LayeredClothes_Menus.rb
index 7f307858f..3f1fa4155 100644
--- a/Data/Scripts/050_Outfits/UI/LayeredClothes_Menus.rb
+++ b/Data/Scripts/050_Outfits/UI/LayeredClothes_Menus.rb
@@ -43,32 +43,49 @@ def selectHairstyle(all_unlocked = false)
   $Trainer.hat = hat
 end
 
+def swapToNextHairVersion()
+  split_hair = getSplitHairFilenameAndVersionFromID($Trainer.hair)
+  hair_version = split_hair[0]
+  hair_style = split_hair[1]
+  current_version = hair_version
+  pbSEPlay("GUI party switch", 80, 100)
+  newVersion = current_version.to_i + 1
+  lastVersion = findLastHairVersion(hair_style)
+  newVersion = lastVersion if newVersion <= 0
+  newVersion = 1 if newVersion > lastVersion
+  $Trainer.hair = getFullHairId(hair_style,newVersion)
+end
 
 def selectHairColor
   original_color = $Trainer.hair_color
+  original_hair = $Trainer.hair
   $game_switches[SWITCH_SELECTING_CLOTHES]=true
   $game_map.update
   display_outfit_preview()
   hat = $Trainer.hat
-  commands = ["Shift up", "Shift down", "Toggle hat", "Reset", "Confirm", "Never Mind"]
+  commands = ["Swap base color", "Shift up", "Shift down", "Toggle hat", "Remove dye", "Confirm", "Never Mind"]
   previous_input = 0
 
   while (true)
     choice = pbShowCommands(nil, commands, commands.length, previous_input)
     previous_input = choice
     case choice
-    when 0 #NEXT
+    when 0 #change base
+      swapToNextHairVersion()
+      display_outfit_preview()
+      ret = false
+    when 1 #NEXT
       #playOutfitChangeAnimation()
       pbSEPlay("GUI storage pick up", 80, 100)
       shiftHairColor(10)
       display_outfit_preview()
       ret = true
-    when 1 #PREVIOUS
+    when 2 #PREVIOUS
       pbSEPlay("GUI storage pick up", 80, 100)
       shiftHairColor(-10)
       display_outfit_preview()
       ret = true
-    when 2 #Toggle hat
+    when 3 #Toggle hat
       pbSEPlay("GUI storage put down", 80, 100)
       if hat == $Trainer.hat
         $Trainer.hat = nil
@@ -76,15 +93,16 @@ def selectHairColor
         $Trainer.hat = hat
       end
       display_outfit_preview()
-    when 3 #Reset
+    when 4 #Reset
       pbSEPlay("GUI storage put down", 80, 100)
       $Trainer.hair_color = 0
       display_outfit_preview()
       ret = false
-    when 4 #Confirm
+    when 5 #Confirm
       break
     else
       $Trainer.hair_color = original_color
+      $Trainer.hair = original_hair
       ret = false
       break
     end
diff --git a/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb b/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb
index 83c03b918..5224b63af 100644
--- a/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb
+++ b/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb
@@ -156,6 +156,8 @@ def findLastHairVersion(hairId)
   last_version = 0
   possible_versions.each { |version|
     hair_id = getFullHairId(hairId, version)
+    echoln hair_id
+    echoln pbResolveBitmap(getOverworldHairFilename(hair_id))
     if pbResolveBitmap(getOverworldHairFilename(hair_id))
       last_version = version
     else
diff --git a/Data/Scripts/052_AddOns/WonderTrade_names.rb b/Data/Scripts/052_AddOns/WonderTrade_names.rb
index 0af42e3d9..3b0d20cc8 100644
--- a/Data/Scripts/052_AddOns/WonderTrade_names.rb
+++ b/Data/Scripts/052_AddOns/WonderTrade_names.rb
@@ -476,9 +476,6 @@ RandPokeNick = [
   "Carlos",
   "hm_slave",
   "Varicelle",
-  "Google",
-  "Twitter",
-  "Facebook",
   "Mia",
   "miam",
   "Lame-o",
diff --git a/Data/Scripts/DownloadedSettings.rb b/Data/Scripts/DownloadedSettings.rb
index 2e82bc22e..cfe4f8b7f 100644
--- a/Data/Scripts/DownloadedSettings.rb
+++ b/Data/Scripts/DownloadedSettings.rb
@@ -14,7 +14,7 @@ module Settings
 
 
   VERSION_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/VERSION"
-  CUSTOM_DEX_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/dex.json"
+  CUSTOM_DEX_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/pif-downloadables/refs/heads/master/dex.json"
 
   # CUSTOM SPRITES
   AUTOGEN_SPRITES_REPO_URL = ""
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 70001652e..640d3789a 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/messages.dat b/Data/messages.dat
index 537065e87..cdfc15e3b 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ