diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 826e1e8a6..8e67182ba 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index eba36f0b2..22a06f68e 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map237.rxdata b/Data/Map237.rxdata
index 4b2708af1..99fa227b6 100644
Binary files a/Data/Map237.rxdata and b/Data/Map237.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 5e7e2b538..a67ee3204 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index f61f78792..700126d63 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -6,7 +6,7 @@
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
   GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "5.3.0"
+  GAME_VERSION_NUMBER = "5.3.0.5"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
index 41b54e213..fe7a82c0f 100644
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -1674,7 +1674,7 @@ class PokemonStorageScreen
                   commands[cmdFuse = commands.length] = _INTL("Fuse") if !@heldpkmn
                 end
               end
-              commands[cmdNickname = commands.length] = _INTL("Nickname")
+              commands[cmdNickname = commands.length] = _INTL("Nickname") if !@heldpkmn
               commands[cmdWithdraw = commands.length] = (selected[0] == -1) ? _INTL("Store") : _INTL("Withdraw")
               commands[cmdItem = commands.length] = _INTL("Item")
 
diff --git a/Data/Scripts/025-Randomizer/randomizer.rb b/Data/Scripts/025-Randomizer/randomizer.rb
index 30683faf0..8ca4fe972 100644
--- a/Data/Scripts/025-Randomizer/randomizer.rb
+++ b/Data/Scripts/025-Randomizer/randomizer.rb
@@ -303,7 +303,9 @@ end
 
 def tryRandomizeGiftPokemon(pokemon, dontRandomize = false)
   if $game_switches[SWITCH_RANDOM_GIFT_POKEMON] && $game_switches[SWITCH_RANDOM_WILD] && !dontRandomize
-    oldSpecies = dexNum(pokemon.species)
-    pokemon.species = getSpecies($PokemonGlobal.psuedoBSTHash[oldSpecies])
+    oldSpecies = pokemon.is_a?(Pokemon) ? dexNum(pokemon) : dexNum(pokemon.species)
+    if $PokemonGlobal.psuedoBSTHash[oldSpecies]
+      pokemon.species = getSpecies($PokemonGlobal.psuedoBSTHash[oldSpecies])
+    end
   end
 end
\ No newline at end of file
diff --git a/Data/Scripts/050_AddOns/ExperimentalOptions.rb b/Data/Scripts/050_AddOns/ExperimentalOptions.rb
index 87880e3d3..d9eb32d3f 100644
--- a/Data/Scripts/050_AddOns/ExperimentalOptions.rb
+++ b/Data/Scripts/050_AddOns/ExperimentalOptions.rb
@@ -36,15 +36,15 @@ class ExperimentalOptionsScene < PokemonOption_Scene
                      proc { |value|
                        $game_switches[SWITCH_NO_LEVELS_MODE] = value == 0
                      }, "All Pokémon use their base stats, regardless of levels."
-      ),
-          EnumOption.new(_INTL("Double abilities"), [_INTL("On"), _INTL("Off")],
-                         proc {
-                           $game_switches[SWITCH_DOUBLE_ABILITIES] ? 0 : 1
-                         },
-                         proc { |value|
-                           $game_switches[SWITCH_DOUBLE_ABILITIES] = value == 0
-                         }, "Fused Pokémon have two abilities at the same time"
-    )
+      )#,
+          # EnumOption.new(_INTL("Double abilities"), [_INTL("On"), _INTL("Off")],
+          #                proc {
+          #                  $game_switches[SWITCH_DOUBLE_ABILITIES] ? 0 : 1
+          #                },
+          #                proc { |value|
+          #                  $game_switches[SWITCH_DOUBLE_ABILITIES] = value == 0
+          #                }, "Fused Pokémon have two abilities at the same time"
+          #)
 
     ]
     return options
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index cc4b6c485..6879ef703 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 328f9c904..3aeb3d610 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ