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 6f0a5a836..ae45168bf 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/Map008.rxdata b/Data/Map008.rxdata
index 3205e18b9..d69433679 100644
Binary files a/Data/Map008.rxdata and b/Data/Map008.rxdata differ
diff --git a/Data/Map066.rxdata b/Data/Map066.rxdata
index 91d1bc7b8..552d29eeb 100644
Binary files a/Data/Map066.rxdata and b/Data/Map066.rxdata differ
diff --git a/Data/Map079.rxdata b/Data/Map079.rxdata
index 0dd9f980f..fa53344b2 100644
Binary files a/Data/Map079.rxdata and b/Data/Map079.rxdata differ
diff --git a/Data/Map129.rxdata b/Data/Map129.rxdata
index 6a726de78..3719f0a45 100644
Binary files a/Data/Map129.rxdata and b/Data/Map129.rxdata differ
diff --git a/Data/Map295.rxdata b/Data/Map295.rxdata
index 131a25304..a4922a7ab 100644
Binary files a/Data/Map295.rxdata and b/Data/Map295.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index bf906a182..f5624ba37 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 324a69ac5..a586549a0 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.0.32 - beta"
+  GAME_VERSION_NUMBER = "5.0.33 - beta"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
diff --git a/Data/Scripts/025-Randomizer/randomizer - encounters.rb b/Data/Scripts/025-Randomizer/randomizer - encounters.rb
index 97816492e..9a744a906 100644
--- a/Data/Scripts/025-Randomizer/randomizer - encounters.rb	
+++ b/Data/Scripts/025-Randomizer/randomizer - encounters.rb	
@@ -19,7 +19,7 @@ def Kernel.randomizeWildPokemonByRoute()
     types_hash = {}
     enc_data.types.each do |key, value|
       pokemonList = value
-      newType = randomizePokemonList(pokemonList,bstRange,maxSpecies,randomizeToFusions,customsList)
+      newType = randomizePokemonList(pokemonList,bstRange,maxSpecies,onlyCustoms,customsList)
       types_hash[key]= newType
     end
     encounters_hash[:types] = types_hash
diff --git a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb
index 46705288c..144b7ab55 100644
--- a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb	
+++ b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb	
@@ -30,7 +30,10 @@
 
 
 #GYM_TYPES_ARRAY = [0,5,11,13,12,3,14,10,4,1,0,6,2,16,7,15,1,8,15,1,7,16,18,17,7,16]
-GYM_TYPES_ARRAY = [:NORMAL,:ROCK,:WATER,:ELECTRIC,:GRASS,:POISON,:PSYCHIC,:FIRE,:GROUND,:FIGHTING,:NORMAL,:BUG,:FLYING,:DRAGON,:GHOST,:ICE,:FIGHTING,:STEEL,:ICE,:FIGHTING,:GHOST,:DRAGON,:FAIRY,:DARK,:GHOST,:DRAGON]
+GYM_TYPES_CLASSIC = [:NORMAL,:ROCK,:WATER,:ELECTRIC,:GRASS,:POISON,:PSYCHIC,:FIRE,:GROUND,:FIGHTING,:NORMAL,:BUG,:FLYING,:DRAGON,:GHOST,:ICE,:FIGHTING,:STEEL,:ICE,:FIGHTING,:GHOST,:DRAGON,:FAIRY,:DARK,:GHOST,:DRAGON]
+GYM_TYPES_MODERN = [:NORMAL,:STEEL,:ICE,:FIGHTING,:BUG,:DARK,:FAIRY,:PSYCHIC,:NORMAL,:FIGHTING,:FAIRY,:GRASS,:BUG,:DRAGON,:FIRE,:GHOST,:GROUND,:ELECTRIC,:WATER,:ROCK,:POISON,:FLYING,:FAIRY,:DARK,:GHOST,:DRAGON]
+GYM_TYPES_ARRAY = ($game_switches && $game_switches[SWITCH_MODERN_MODE]) ? GYM_TYPES_MODERN : GYM_TYPES_CLASSIC
+
 
 #$randomTrainersArray = []
 
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 04d111aeb..8a75d3f42 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 8d4c2fd59..6d18cb3a3 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
diff --git a/Data/encounters_randomized.dat b/Data/encounters_randomized.dat
index 35e37e06b..71dceae31 100644
Binary files a/Data/encounters_randomized.dat and b/Data/encounters_randomized.dat differ
diff --git a/Data/encounters_randomized2.dat b/Data/encounters_randomized2.dat
deleted file mode 100644
index eea72a02a..000000000
Binary files a/Data/encounters_randomized2.dat and /dev/null differ