diff --git a/CREDITS.md b/CREDITS.md
index bca89c816ca..6bd73d72901 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -24,9 +24,10 @@
 - Pokémon Sword/Shield
 - Pokémon Legends: Arceus
 - Pokémon Scarlet/Violet
-- Firel (Custom Graveyard, Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, and Volcano biome music)
+- Firel (Custom Graveyard, Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, Volcano, and Desert biome music)
 - Lmz (Custom Ancient Ruins, Jungle, and Lake biome music)
-- Andr06 (Custom Forest, Slum and Sea biome music)
+- Andr06 (Custom Forest, Slum, Sea, and Fairy Cave biome music)
+- Leavannite (Custom Wasteland biome music)
 - _tresnoir
 - unveiler
 
diff --git a/public/audio/bgm/wasteland.mp3 b/public/audio/bgm/wasteland.mp3
index 646cbd89a1f..ee096af99ac 100644
Binary files a/public/audio/bgm/wasteland.mp3 and b/public/audio/bgm/wasteland.mp3 differ
diff --git a/public/images/items/ampharosite.png b/public/images/items/ampharosite.png
index 154f7ea5609..3297b4a90b8 100644
Binary files a/public/images/items/ampharosite.png and b/public/images/items/ampharosite.png differ
diff --git a/public/images/items/amulet_coin.png b/public/images/items/amulet_coin.png
index 727562836c4..8c86df496e4 100644
Binary files a/public/images/items/amulet_coin.png and b/public/images/items/amulet_coin.png differ
diff --git a/public/images/items/blunder_policy.png b/public/images/items/blunder_policy.png
index 8104d00c40c..ba7b12ebaab 100644
Binary files a/public/images/items/blunder_policy.png and b/public/images/items/blunder_policy.png differ
diff --git a/public/images/items/bug_memory.png b/public/images/items/bug_memory.png
index a71637ceb5a..fce22e69081 100644
Binary files a/public/images/items/bug_memory.png and b/public/images/items/bug_memory.png differ
diff --git a/public/images/items/catching_charm.png b/public/images/items/catching_charm.png
index 4699b8c3d85..8fd89791206 100644
Binary files a/public/images/items/catching_charm.png and b/public/images/items/catching_charm.png differ
diff --git a/public/images/items/diancite.png b/public/images/items/diancite.png
index fbb0267fb59..3c871b3158b 100644
Binary files a/public/images/items/diancite.png and b/public/images/items/diancite.png differ
diff --git a/public/images/items/galarica_cuff.png b/public/images/items/galarica_cuff.png
index 4706279c43d..223be91acee 100644
Binary files a/public/images/items/galarica_cuff.png and b/public/images/items/galarica_cuff.png differ
diff --git a/public/images/items/gardevoirite.png b/public/images/items/gardevoirite.png
index 9180b369df4..5f5d75f7ca5 100644
Binary files a/public/images/items/gardevoirite.png and b/public/images/items/gardevoirite.png differ
diff --git a/public/images/items/gb.png b/public/images/items/gb.png
index bcc88593fad..3a47a5cd3ce 100644
Binary files a/public/images/items/gb.png and b/public/images/items/gb.png differ
diff --git a/public/images/items/hp_up.png b/public/images/items/hp_up.png
index b9284383978..ddbca745436 100644
Binary files a/public/images/items/hp_up.png and b/public/images/items/hp_up.png differ
diff --git a/public/images/items/leftovers.png b/public/images/items/leftovers.png
index c06eaf073d9..43200bfe559 100644
Binary files a/public/images/items/leftovers.png and b/public/images/items/leftovers.png differ
diff --git a/public/images/items/magnet.png b/public/images/items/magnet.png
index f8668e72abd..13a602d7140 100644
Binary files a/public/images/items/magnet.png and b/public/images/items/magnet.png differ
diff --git a/public/images/items/max_mushrooms.png b/public/images/items/max_mushrooms.png
index 10ff9f5a72f..e1b066b0267 100644
Binary files a/public/images/items/max_mushrooms.png and b/public/images/items/max_mushrooms.png differ
diff --git a/public/images/items/mega_bracelet.png b/public/images/items/mega_bracelet.png
index 674c59a8f5a..5dde0be94ac 100644
Binary files a/public/images/items/mega_bracelet.png and b/public/images/items/mega_bracelet.png differ
diff --git a/public/images/items/mint_atk.png b/public/images/items/mint_atk.png
index f42e0cccfc0..0af6364f09c 100644
Binary files a/public/images/items/mint_atk.png and b/public/images/items/mint_atk.png differ
diff --git a/public/images/items/n_solarizer.png b/public/images/items/n_solarizer.png
index 787d2b49bc4..6060fe4e5fb 100644
Binary files a/public/images/items/n_solarizer.png and b/public/images/items/n_solarizer.png differ
diff --git a/public/images/items/poison_barb.png b/public/images/items/poison_barb.png
index b85f7d3b777..0454c5b5e78 100644
Binary files a/public/images/items/poison_barb.png and b/public/images/items/poison_barb.png differ
diff --git a/public/images/items/power_herb.png b/public/images/items/power_herb.png
index 477e32e3271..9f877f62396 100644
Binary files a/public/images/items/power_herb.png and b/public/images/items/power_herb.png differ
diff --git a/public/images/items/rayquazite.png b/public/images/items/rayquazite.png
index 6617924c434..80f467522fd 100644
Binary files a/public/images/items/rayquazite.png and b/public/images/items/rayquazite.png differ
diff --git a/public/images/items/ribbon_gen4.png b/public/images/items/ribbon_gen4.png
index ad4cb139a7e..a7765d1de50 100644
Binary files a/public/images/items/ribbon_gen4.png and b/public/images/items/ribbon_gen4.png differ
diff --git a/public/images/items/ribbon_gen5.png b/public/images/items/ribbon_gen5.png
index a4f99ffb7f2..00b84aab978 100644
Binary files a/public/images/items/ribbon_gen5.png and b/public/images/items/ribbon_gen5.png differ
diff --git a/public/images/items/sceptilite.png b/public/images/items/sceptilite.png
index 4b255b1ff6d..4411c172826 100644
Binary files a/public/images/items/sceptilite.png and b/public/images/items/sceptilite.png differ
diff --git a/public/images/items/scroll_of_waters.png b/public/images/items/scroll_of_waters.png
index 9195a26abe1..adacf66398f 100644
Binary files a/public/images/items/scroll_of_waters.png and b/public/images/items/scroll_of_waters.png differ
diff --git a/public/images/items/soothe_bell.png b/public/images/items/soothe_bell.png
index d21da03f663..8ca868108d3 100644
Binary files a/public/images/items/soothe_bell.png and b/public/images/items/soothe_bell.png differ
diff --git a/public/images/items/sweet_apple.png b/public/images/items/sweet_apple.png
index de183d1c644..591961604f8 100644
Binary files a/public/images/items/sweet_apple.png and b/public/images/items/sweet_apple.png differ
diff --git a/public/images/items/tm_ice.png b/public/images/items/tm_ice.png
index eece8623654..26354211f6d 100644
Binary files a/public/images/items/tm_ice.png and b/public/images/items/tm_ice.png differ
diff --git a/public/images/items/tm_normal.png b/public/images/items/tm_normal.png
index cede4cb96e2..8bc5e6b6a24 100644
Binary files a/public/images/items/tm_normal.png and b/public/images/items/tm_normal.png differ
diff --git a/public/images/items/toxic_orb.png b/public/images/items/toxic_orb.png
index 8b8a1026f92..f18a55c43dc 100644
Binary files a/public/images/items/toxic_orb.png and b/public/images/items/toxic_orb.png differ
diff --git a/public/images/items/unknown.png b/public/images/items/unknown.png
index 17697d0d640..7a1dc347093 100644
Binary files a/public/images/items/unknown.png and b/public/images/items/unknown.png differ
diff --git a/public/images/items/white_herb.png b/public/images/items/white_herb.png
index 0729602fd15..9e6aa77eeff 100644
Binary files a/public/images/items/white_herb.png and b/public/images/items/white_herb.png differ
diff --git a/public/images/items/wl_antidote.png b/public/images/items/wl_antidote.png
index 18a74292dcf..3a60ed639a7 100644
Binary files a/public/images/items/wl_antidote.png and b/public/images/items/wl_antidote.png differ
diff --git a/public/images/items/wl_awakening.png b/public/images/items/wl_awakening.png
index 4fa59e2d10d..27bbd49253a 100644
Binary files a/public/images/items/wl_awakening.png and b/public/images/items/wl_awakening.png differ
diff --git a/public/images/items/wl_burn_heal.png b/public/images/items/wl_burn_heal.png
index 98fa6c11766..3bbf5298a1d 100644
Binary files a/public/images/items/wl_burn_heal.png and b/public/images/items/wl_burn_heal.png differ
diff --git a/public/images/items/wl_custom_thief.png b/public/images/items/wl_custom_thief.png
index aa6f9e0acc7..8d54f18e739 100644
Binary files a/public/images/items/wl_custom_thief.png and b/public/images/items/wl_custom_thief.png differ
diff --git a/public/images/items/wl_elixir.png b/public/images/items/wl_elixir.png
index e9b7b48ab87..8146091e46b 100644
Binary files a/public/images/items/wl_elixir.png and b/public/images/items/wl_elixir.png differ
diff --git a/public/images/items/wl_ether.png b/public/images/items/wl_ether.png
index 457f2bf0649..03be51f7532 100644
Binary files a/public/images/items/wl_ether.png and b/public/images/items/wl_ether.png differ
diff --git a/public/images/items/wl_full_heal.png b/public/images/items/wl_full_heal.png
index 361d432781a..2f0d58e201d 100644
Binary files a/public/images/items/wl_full_heal.png and b/public/images/items/wl_full_heal.png differ
diff --git a/public/images/items/wl_hyper_potion.png b/public/images/items/wl_hyper_potion.png
index 016c257a1eb..7d6028eb784 100644
Binary files a/public/images/items/wl_hyper_potion.png and b/public/images/items/wl_hyper_potion.png differ
diff --git a/public/images/items/wl_ice_heal.png b/public/images/items/wl_ice_heal.png
index 619d30d9ca9..3d94ca63a3b 100644
Binary files a/public/images/items/wl_ice_heal.png and b/public/images/items/wl_ice_heal.png differ
diff --git a/public/images/items/wl_max_elixir.png b/public/images/items/wl_max_elixir.png
index 4df3eaff10a..40ed8baa441 100644
Binary files a/public/images/items/wl_max_elixir.png and b/public/images/items/wl_max_elixir.png differ
diff --git a/public/images/items/wl_max_ether.png b/public/images/items/wl_max_ether.png
index 0e174f9eba4..eeaad41fa05 100644
Binary files a/public/images/items/wl_max_ether.png and b/public/images/items/wl_max_ether.png differ
diff --git a/public/images/items/wl_max_potion.png b/public/images/items/wl_max_potion.png
index 2f334795489..4c37c175e38 100644
Binary files a/public/images/items/wl_max_potion.png and b/public/images/items/wl_max_potion.png differ
diff --git a/public/images/items/wl_paralyze_heal.png b/public/images/items/wl_paralyze_heal.png
index ba9c172fa17..35d29b54452 100644
Binary files a/public/images/items/wl_paralyze_heal.png and b/public/images/items/wl_paralyze_heal.png differ
diff --git a/public/images/items/wl_potion.png b/public/images/items/wl_potion.png
index a70bba17b2f..cce66644ed9 100644
Binary files a/public/images/items/wl_potion.png and b/public/images/items/wl_potion.png differ
diff --git a/public/images/items/wl_super_potion.png b/public/images/items/wl_super_potion.png
index 5bf5dd8fc89..62177ddbb26 100644
Binary files a/public/images/items/wl_super_potion.png and b/public/images/items/wl_super_potion.png differ
diff --git a/public/images/logo_fake.png b/public/images/logo_fake.png
index 9fdb8724025..42d1aeca7a5 100755
Binary files a/public/images/logo_fake.png and b/public/images/logo_fake.png differ
diff --git a/public/images/pokeball/gb_opening.png b/public/images/pokeball/gb_opening.png
index 075aafeb460..4122b2ffbc8 100644
Binary files a/public/images/pokeball/gb_opening.png and b/public/images/pokeball/gb_opening.png differ
diff --git a/public/images/pokeball/pb_open.png b/public/images/pokeball/pb_open.png
index 0fdfa7b98fa..bfb8e592742 100644
Binary files a/public/images/pokeball/pb_open.png and b/public/images/pokeball/pb_open.png differ
diff --git a/public/images/pokeball/pb_opening.png b/public/images/pokeball/pb_opening.png
index 1a7136f186d..415d0f92f1f 100644
Binary files a/public/images/pokeball/pb_opening.png and b/public/images/pokeball/pb_opening.png differ
diff --git a/public/images/pokeball/rb_open.png b/public/images/pokeball/rb_open.png
index 3fe5f6e81c7..db65009898c 100644
Binary files a/public/images/pokeball/rb_open.png and b/public/images/pokeball/rb_open.png differ
diff --git a/public/images/pokeball/ub_open.png b/public/images/pokeball/ub_open.png
index 29e5ddac92f..c15a51329b6 100644
Binary files a/public/images/pokeball/ub_open.png and b/public/images/pokeball/ub_open.png differ
diff --git a/public/images/pokeball/ub_opening.png b/public/images/pokeball/ub_opening.png
index 0696c666d95..09f73970f3c 100644
Binary files a/public/images/pokeball/ub_opening.png and b/public/images/pokeball/ub_opening.png differ
diff --git a/public/images/statuses_tl.png b/public/images/statuses_tl.png
index 9f24c6a0810..cdec7a29e8b 100644
Binary files a/public/images/statuses_tl.png and b/public/images/statuses_tl.png differ
diff --git a/public/images/trainer/aether_grunt_m.png b/public/images/trainer/aether_grunt_m.png
index c61970f4c98..08ab681d2fc 100644
Binary files a/public/images/trainer/aether_grunt_m.png and b/public/images/trainer/aether_grunt_m.png differ
diff --git a/public/images/trainer/allister.png b/public/images/trainer/allister.png
index c29781660d1..7007a7365a9 100644
Binary files a/public/images/trainer/allister.png and b/public/images/trainer/allister.png differ
diff --git a/public/images/trainer/aqua_grunt_m.png b/public/images/trainer/aqua_grunt_m.png
index bddb6e9fa3c..771c88c9170 100644
Binary files a/public/images/trainer/aqua_grunt_m.png and b/public/images/trainer/aqua_grunt_m.png differ
diff --git a/public/images/trainer/archie.png b/public/images/trainer/archie.png
index 7b047322bfb..e684d847882 100644
Binary files a/public/images/trainer/archie.png and b/public/images/trainer/archie.png differ
diff --git a/public/images/trainer/expert_pokemon_breeder.png b/public/images/trainer/expert_pokemon_breeder.png
index 0c53da6f2dc..83e9bb99816 100644
Binary files a/public/images/trainer/expert_pokemon_breeder.png and b/public/images/trainer/expert_pokemon_breeder.png differ
diff --git a/public/images/trainer/katy.png b/public/images/trainer/katy.png
index 534abca0397..009293a8fc6 100644
Binary files a/public/images/trainer/katy.png and b/public/images/trainer/katy.png differ
diff --git a/public/images/trainer/rocket_boss_giovanni_1.png b/public/images/trainer/rocket_boss_giovanni_1.png
index 8adab2d0575..d7c2e0fe590 100644
Binary files a/public/images/trainer/rocket_boss_giovanni_1.png and b/public/images/trainer/rocket_boss_giovanni_1.png differ
diff --git a/public/images/ui/boolean_sel.png b/public/images/ui/boolean_sel.png
index 7f1c86fbb4d..020708801e0 100644
Binary files a/public/images/ui/boolean_sel.png and b/public/images/ui/boolean_sel.png differ
diff --git a/public/images/ui/champion_ribbon.png b/public/images/ui/champion_ribbon.png
index d70aa92daaf..a19bb01279b 100644
Binary files a/public/images/ui/champion_ribbon.png and b/public/images/ui/champion_ribbon.png differ
diff --git a/public/images/ui/champion_ribbon_bronze.png b/public/images/ui/champion_ribbon_bronze.png
index 8d92b6e0ab1..d30431fa015 100644
Binary files a/public/images/ui/champion_ribbon_bronze.png and b/public/images/ui/champion_ribbon_bronze.png differ
diff --git a/public/images/ui/champion_ribbon_diamond.png b/public/images/ui/champion_ribbon_diamond.png
index 9effbe3669c..0d469640529 100644
Binary files a/public/images/ui/champion_ribbon_diamond.png and b/public/images/ui/champion_ribbon_diamond.png differ
diff --git a/public/images/ui/champion_ribbon_emerald.png b/public/images/ui/champion_ribbon_emerald.png
index 81b111a05a9..29a9503059d 100644
Binary files a/public/images/ui/champion_ribbon_emerald.png and b/public/images/ui/champion_ribbon_emerald.png differ
diff --git a/public/images/ui/champion_ribbon_silver.png b/public/images/ui/champion_ribbon_silver.png
index c4dcd8d7be0..9cf7c40552f 100644
Binary files a/public/images/ui/champion_ribbon_silver.png and b/public/images/ui/champion_ribbon_silver.png differ
diff --git a/public/images/ui/cursor.png b/public/images/ui/cursor.png
index 0e2f9d98a16..961746a63db 100644
Binary files a/public/images/ui/cursor.png and b/public/images/ui/cursor.png differ
diff --git a/public/images/ui/dawn_icon_fg.png b/public/images/ui/dawn_icon_fg.png
index c64f0578073..30d793b509d 100644
Binary files a/public/images/ui/dawn_icon_fg.png and b/public/images/ui/dawn_icon_fg.png differ
diff --git a/public/images/ui/day_icon_fg.png b/public/images/ui/day_icon_fg.png
index a480e4d274d..24d470a70bc 100644
Binary files a/public/images/ui/day_icon_fg.png and b/public/images/ui/day_icon_fg.png differ
diff --git a/public/images/ui/friendship_overlay.png b/public/images/ui/friendship_overlay.png
index b6957ded371..8a7c2e55c38 100644
Binary files a/public/images/ui/friendship_overlay.png and b/public/images/ui/friendship_overlay.png differ
diff --git a/public/images/ui/hall_of_fame_blue.png b/public/images/ui/hall_of_fame_blue.png
index 2b799070cb1..4ef4e0bdeae 100644
Binary files a/public/images/ui/hall_of_fame_blue.png and b/public/images/ui/hall_of_fame_blue.png differ
diff --git a/public/images/ui/hall_of_fame_red.png b/public/images/ui/hall_of_fame_red.png
index df999ae631f..a7685d6cb71 100644
Binary files a/public/images/ui/hall_of_fame_red.png and b/public/images/ui/hall_of_fame_red.png differ
diff --git a/public/images/ui/icon_egg_move.png b/public/images/ui/icon_egg_move.png
index 3b79a6682d0..1356f6077b6 100644
Binary files a/public/images/ui/icon_egg_move.png and b/public/images/ui/icon_egg_move.png differ
diff --git a/public/images/ui/legacy/champion_ribbon.png b/public/images/ui/legacy/champion_ribbon.png
index d70aa92daaf..a19bb01279b 100644
Binary files a/public/images/ui/legacy/champion_ribbon.png and b/public/images/ui/legacy/champion_ribbon.png differ
diff --git a/public/images/ui/legacy/champion_ribbon_bronze.png b/public/images/ui/legacy/champion_ribbon_bronze.png
index 8d92b6e0ab1..d30431fa015 100644
Binary files a/public/images/ui/legacy/champion_ribbon_bronze.png and b/public/images/ui/legacy/champion_ribbon_bronze.png differ
diff --git a/public/images/ui/legacy/champion_ribbon_diamond.png b/public/images/ui/legacy/champion_ribbon_diamond.png
index 9effbe3669c..0d469640529 100644
Binary files a/public/images/ui/legacy/champion_ribbon_diamond.png and b/public/images/ui/legacy/champion_ribbon_diamond.png differ
diff --git a/public/images/ui/legacy/champion_ribbon_emerald.png b/public/images/ui/legacy/champion_ribbon_emerald.png
index 81b111a05a9..29a9503059d 100644
Binary files a/public/images/ui/legacy/champion_ribbon_emerald.png and b/public/images/ui/legacy/champion_ribbon_emerald.png differ
diff --git a/public/images/ui/legacy/champion_ribbon_silver.png b/public/images/ui/legacy/champion_ribbon_silver.png
index c4dcd8d7be0..9cf7c40552f 100644
Binary files a/public/images/ui/legacy/champion_ribbon_silver.png and b/public/images/ui/legacy/champion_ribbon_silver.png differ
diff --git a/public/images/ui/legacy/cursor.png b/public/images/ui/legacy/cursor.png
index deadae321e3..a2c271eebb2 100644
Binary files a/public/images/ui/legacy/cursor.png and b/public/images/ui/legacy/cursor.png differ
diff --git a/public/images/ui/legacy/day_icon_fg.png b/public/images/ui/legacy/day_icon_fg.png
index 79872f95202..a010c3ec9c4 100644
Binary files a/public/images/ui/legacy/day_icon_fg.png and b/public/images/ui/legacy/day_icon_fg.png differ
diff --git a/public/images/ui/legacy/discord.png b/public/images/ui/legacy/discord.png
index 1bb254b1594..e9acf219d3c 100644
Binary files a/public/images/ui/legacy/discord.png and b/public/images/ui/legacy/discord.png differ
diff --git a/public/images/ui/legacy/friendship_overlay.png b/public/images/ui/legacy/friendship_overlay.png
index b6957ded371..8a7c2e55c38 100644
Binary files a/public/images/ui/legacy/friendship_overlay.png and b/public/images/ui/legacy/friendship_overlay.png differ
diff --git a/public/images/ui/legacy/hall_of_fame_blue.png b/public/images/ui/legacy/hall_of_fame_blue.png
index 2b799070cb1..4ef4e0bdeae 100644
Binary files a/public/images/ui/legacy/hall_of_fame_blue.png and b/public/images/ui/legacy/hall_of_fame_blue.png differ
diff --git a/public/images/ui/legacy/hall_of_fame_red.png b/public/images/ui/legacy/hall_of_fame_red.png
index df999ae631f..a7685d6cb71 100644
Binary files a/public/images/ui/legacy/hall_of_fame_red.png and b/public/images/ui/legacy/hall_of_fame_red.png differ
diff --git a/public/images/ui/legacy/icon_egg_move.png b/public/images/ui/legacy/icon_egg_move.png
index 3b79a6682d0..1356f6077b6 100644
Binary files a/public/images/ui/legacy/icon_egg_move.png and b/public/images/ui/legacy/icon_egg_move.png differ
diff --git a/public/images/ui/legacy/link_icon.png b/public/images/ui/legacy/link_icon.png
index 1e20ab56ec7..faf3d64e752 100644
Binary files a/public/images/ui/legacy/link_icon.png and b/public/images/ui/legacy/link_icon.png differ
diff --git a/public/images/ui/legacy/namebox.png b/public/images/ui/legacy/namebox.png
index 5eea1504d77..766a07bdc2a 100644
Binary files a/public/images/ui/legacy/namebox.png and b/public/images/ui/legacy/namebox.png differ
diff --git a/public/images/ui/legacy/overlay_hp.png b/public/images/ui/legacy/overlay_hp.png
index 75607c199f5..56f9b50b734 100644
Binary files a/public/images/ui/legacy/overlay_hp.png and b/public/images/ui/legacy/overlay_hp.png differ
diff --git a/public/images/ui/legacy/overlay_lv_alt.png b/public/images/ui/legacy/overlay_lv_alt.png
index f7a76955e7b..92ec684bf75 100644
Binary files a/public/images/ui/legacy/overlay_lv_alt.png and b/public/images/ui/legacy/overlay_lv_alt.png differ
diff --git a/public/images/ui/legacy/party_bg.png b/public/images/ui/legacy/party_bg.png
index cdade735b4a..707db79f1e2 100644
Binary files a/public/images/ui/legacy/party_bg.png and b/public/images/ui/legacy/party_bg.png differ
diff --git a/public/images/ui/legacy/party_bg_double.png b/public/images/ui/legacy/party_bg_double.png
index 8e00bd6c293..3694e3edf3c 100644
Binary files a/public/images/ui/legacy/party_bg_double.png and b/public/images/ui/legacy/party_bg_double.png differ
diff --git a/public/images/ui/legacy/party_bg_double_manage.png b/public/images/ui/legacy/party_bg_double_manage.png
index 2bf2d63c315..d3954fc14ff 100644
Binary files a/public/images/ui/legacy/party_bg_double_manage.png and b/public/images/ui/legacy/party_bg_double_manage.png differ
diff --git a/public/images/ui/legacy/party_slot_hp_overlay.png b/public/images/ui/legacy/party_slot_hp_overlay.png
index 859adab148c..4f79d34c702 100644
Binary files a/public/images/ui/legacy/party_slot_hp_overlay.png and b/public/images/ui/legacy/party_slot_hp_overlay.png differ
diff --git a/public/images/ui/legacy/party_slot_main_short.png b/public/images/ui/legacy/party_slot_main_short.png
index 0b1e52917ba..54af35bd69c 100644
Binary files a/public/images/ui/legacy/party_slot_main_short.png and b/public/images/ui/legacy/party_slot_main_short.png differ
diff --git a/public/images/ui/legacy/party_slot_overlay_lv_alt.png b/public/images/ui/legacy/party_slot_overlay_lv_alt.png
index 387dfec6b22..7aa9a590a13 100644
Binary files a/public/images/ui/legacy/party_slot_overlay_lv_alt.png and b/public/images/ui/legacy/party_slot_overlay_lv_alt.png differ
diff --git a/public/images/ui/legacy/passive_bg.png b/public/images/ui/legacy/passive_bg.png
index 4a3fa1ec72b..8f89bfc29a2 100644
Binary files a/public/images/ui/legacy/passive_bg.png and b/public/images/ui/legacy/passive_bg.png differ
diff --git a/public/images/ui/legacy/pb_tray_overlay_enemy.png b/public/images/ui/legacy/pb_tray_overlay_enemy.png
index 86ac85f946f..70940db1c58 100644
Binary files a/public/images/ui/legacy/pb_tray_overlay_enemy.png and b/public/images/ui/legacy/pb_tray_overlay_enemy.png differ
diff --git a/public/images/ui/legacy/pbinfo_enemy_type.png b/public/images/ui/legacy/pbinfo_enemy_type.png
index 27cb481e861..8d3b956bb98 100644
Binary files a/public/images/ui/legacy/pbinfo_enemy_type.png and b/public/images/ui/legacy/pbinfo_enemy_type.png differ
diff --git a/public/images/ui/legacy/pbinfo_enemy_type1.png b/public/images/ui/legacy/pbinfo_enemy_type1.png
index df44b5bad5d..9e547234391 100644
Binary files a/public/images/ui/legacy/pbinfo_enemy_type1.png and b/public/images/ui/legacy/pbinfo_enemy_type1.png differ
diff --git a/public/images/ui/legacy/pbinfo_enemy_type2.png b/public/images/ui/legacy/pbinfo_enemy_type2.png
index df44b5bad5d..9e547234391 100644
Binary files a/public/images/ui/legacy/pbinfo_enemy_type2.png and b/public/images/ui/legacy/pbinfo_enemy_type2.png differ
diff --git a/public/images/ui/legacy/pbinfo_player_type1.png b/public/images/ui/legacy/pbinfo_player_type1.png
index df44b5bad5d..9e547234391 100644
Binary files a/public/images/ui/legacy/pbinfo_player_type1.png and b/public/images/ui/legacy/pbinfo_player_type1.png differ
diff --git a/public/images/ui/legacy/pbinfo_player_type2.png b/public/images/ui/legacy/pbinfo_player_type2.png
index df44b5bad5d..9e547234391 100644
Binary files a/public/images/ui/legacy/pbinfo_player_type2.png and b/public/images/ui/legacy/pbinfo_player_type2.png differ
diff --git a/public/images/ui/legacy/pokedex_summary_bg.png b/public/images/ui/legacy/pokedex_summary_bg.png
index 7323f99a913..0f8fed843c9 100644
Binary files a/public/images/ui/legacy/pokedex_summary_bg.png and b/public/images/ui/legacy/pokedex_summary_bg.png differ
diff --git a/public/images/ui/legacy/prompt.png b/public/images/ui/legacy/prompt.png
index d70362d1958..7781688f0ee 100644
Binary files a/public/images/ui/legacy/prompt.png and b/public/images/ui/legacy/prompt.png differ
diff --git a/public/images/ui/legacy/saving_icon.png b/public/images/ui/legacy/saving_icon.png
index 772fa91fb8c..02509d0e40c 100644
Binary files a/public/images/ui/legacy/saving_icon.png and b/public/images/ui/legacy/saving_icon.png differ
diff --git a/public/images/ui/legacy/shiny.png b/public/images/ui/legacy/shiny.png
index 362f8f48ff1..bc2a6c0d916 100644
Binary files a/public/images/ui/legacy/shiny.png and b/public/images/ui/legacy/shiny.png differ
diff --git a/public/images/ui/legacy/summary_bg.png b/public/images/ui/legacy/summary_bg.png
index 261b4974fb7..668a7438bf0 100644
Binary files a/public/images/ui/legacy/summary_bg.png and b/public/images/ui/legacy/summary_bg.png differ
diff --git a/public/images/ui/legacy/summary_moves_cursor.png b/public/images/ui/legacy/summary_moves_cursor.png
index 7375cedcdf6..6a17bccdffd 100644
Binary files a/public/images/ui/legacy/summary_moves_cursor.png and b/public/images/ui/legacy/summary_moves_cursor.png differ
diff --git a/public/images/ui/legacy/summary_profile.png b/public/images/ui/legacy/summary_profile.png
index 0b5b2ffec05..d8cfebb000e 100644
Binary files a/public/images/ui/legacy/summary_profile.png and b/public/images/ui/legacy/summary_profile.png differ
diff --git a/public/images/ui/legacy/summary_profile_ability.png b/public/images/ui/legacy/summary_profile_ability.png
index a803323564b..f839a6249f8 100644
Binary files a/public/images/ui/legacy/summary_profile_ability.png and b/public/images/ui/legacy/summary_profile_ability.png differ
diff --git a/public/images/ui/legacy/summary_stats.png b/public/images/ui/legacy/summary_stats.png
index 660fbee6df6..1da361f6157 100644
Binary files a/public/images/ui/legacy/summary_stats.png and b/public/images/ui/legacy/summary_stats.png differ
diff --git a/public/images/ui/link_icon.png b/public/images/ui/link_icon.png
index 1e20ab56ec7..faf3d64e752 100644
Binary files a/public/images/ui/link_icon.png and b/public/images/ui/link_icon.png differ
diff --git a/public/images/ui/night_icon_fg.png b/public/images/ui/night_icon_fg.png
index ef184e24435..9c173eeaa83 100644
Binary files a/public/images/ui/night_icon_fg.png and b/public/images/ui/night_icon_fg.png differ
diff --git a/public/images/ui/night_icon_mg.png b/public/images/ui/night_icon_mg.png
index f808e50b2c7..94b3529030c 100644
Binary files a/public/images/ui/night_icon_mg.png and b/public/images/ui/night_icon_mg.png differ
diff --git a/public/images/ui/overlay_hp.png b/public/images/ui/overlay_hp.png
index 9612ed8c4c2..8654174a2f1 100644
Binary files a/public/images/ui/overlay_hp.png and b/public/images/ui/overlay_hp.png differ
diff --git a/public/images/ui/overlay_hp_boss.png b/public/images/ui/overlay_hp_boss.png
index 5a011709e0c..215c3ff1158 100644
Binary files a/public/images/ui/overlay_hp_boss.png and b/public/images/ui/overlay_hp_boss.png differ
diff --git a/public/images/ui/overlay_lv.png b/public/images/ui/overlay_lv.png
index ee3f439f7be..6ced2da2660 100644
Binary files a/public/images/ui/overlay_lv.png and b/public/images/ui/overlay_lv.png differ
diff --git a/public/images/ui/party_bg_double.png b/public/images/ui/party_bg_double.png
index c4d381d828c..61cacc222d4 100644
Binary files a/public/images/ui/party_bg_double.png and b/public/images/ui/party_bg_double.png differ
diff --git a/public/images/ui/party_slot_hp_bar.png b/public/images/ui/party_slot_hp_bar.png
index 5381fe0a0b6..181bd04c0ea 100644
Binary files a/public/images/ui/party_slot_hp_bar.png and b/public/images/ui/party_slot_hp_bar.png differ
diff --git a/public/images/ui/party_slot_overlay_lv.png b/public/images/ui/party_slot_overlay_lv.png
index 3d7dafd6737..122d3f7151c 100644
Binary files a/public/images/ui/party_slot_overlay_lv.png and b/public/images/ui/party_slot_overlay_lv.png differ
diff --git a/public/images/ui/passive_bg.png b/public/images/ui/passive_bg.png
index 4a3fa1ec72b..8f89bfc29a2 100644
Binary files a/public/images/ui/passive_bg.png and b/public/images/ui/passive_bg.png differ
diff --git a/public/images/ui/pbinfo_enemy_type1.png b/public/images/ui/pbinfo_enemy_type1.png
index be28e1d2c65..bb0c37430ad 100644
Binary files a/public/images/ui/pbinfo_enemy_type1.png and b/public/images/ui/pbinfo_enemy_type1.png differ
diff --git a/public/images/ui/pbinfo_player_type2.png b/public/images/ui/pbinfo_player_type2.png
index be28e1d2c65..bb0c37430ad 100644
Binary files a/public/images/ui/pbinfo_player_type2.png and b/public/images/ui/pbinfo_player_type2.png differ
diff --git a/public/images/ui/prompt.png b/public/images/ui/prompt.png
index c045c5e91fe..06e1bce26e6 100644
Binary files a/public/images/ui/prompt.png and b/public/images/ui/prompt.png differ
diff --git a/public/images/ui/saving_icon.png b/public/images/ui/saving_icon.png
index 772fa91fb8c..02509d0e40c 100644
Binary files a/public/images/ui/saving_icon.png and b/public/images/ui/saving_icon.png differ
diff --git a/public/images/ui/select_gen_cursor.png b/public/images/ui/select_gen_cursor.png
index 7f1c86fbb4d..020708801e0 100644
Binary files a/public/images/ui/select_gen_cursor.png and b/public/images/ui/select_gen_cursor.png differ
diff --git a/public/images/ui/select_gen_cursor_highlight.png b/public/images/ui/select_gen_cursor_highlight.png
index cecc543ae56..76607a6cd62 100644
Binary files a/public/images/ui/select_gen_cursor_highlight.png and b/public/images/ui/select_gen_cursor_highlight.png differ
diff --git a/public/images/ui/shiny.png b/public/images/ui/shiny.png
index 362f8f48ff1..bc2a6c0d916 100644
Binary files a/public/images/ui/shiny.png and b/public/images/ui/shiny.png differ
diff --git a/public/images/ui/summary_profile_ability.png b/public/images/ui/summary_profile_ability.png
index a803323564b..f839a6249f8 100644
Binary files a/public/images/ui/summary_profile_ability.png and b/public/images/ui/summary_profile_ability.png differ
diff --git a/src/field/arena.ts b/src/field/arena.ts
index 2ce347b5337..1b6b165b8a3 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -912,7 +912,7 @@ export class Arena {
       case BiomeId.RUINS:
         return 0.0;
       case BiomeId.WASTELAND:
-        return 6.336;
+        return 6.024;
       case BiomeId.ABYSS:
         return 20.113;
       case BiomeId.SPACE:
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 3a5d435fb36..e12485a7272 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -5708,7 +5708,11 @@ export class PlayerPokemon extends Pokemon {
     }
 
     if (!dataSource) {
-      if (globalScene.gameMode.isDaily) {
+      if (
+        globalScene.gameMode.isDaily ||
+        // Keldeo is excluded due to crashes involving its signature move and the associated form change
+        (Overrides.STARTER_SPECIES_OVERRIDE && Overrides.STARTER_SPECIES_OVERRIDE !== SpeciesId.KELDEO)
+      ) {
         this.generateAndPopulateMoveset();
       } else {
         this.moveset = [];
diff --git a/src/overrides.ts b/src/overrides.ts
index 48d7428cad9..b8212ea8fd6 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -78,15 +78,19 @@ class DefaultOverrides {
   readonly ARENA_TINT_OVERRIDE: TimeOfDay | null = null;
   /** Multiplies XP gained by this value including 0. Set to null to ignore the override. */
   readonly XP_MULTIPLIER_OVERRIDE: number | null = null;
-  /** Sets the level cap to this number during experience gain calculations. Set to `0` to disable override & use normal wave-based level caps,
-  or any negative number to set it to 9 quadrillion (effectively disabling it). */
+  /**
+   * Sets the level cap to this number during experience gain calculations.
+   *
+   * Set to `0` to disable override & use normal wave-based level caps,
+   * or any negative number to disable level caps entirely.
+   */
   readonly LEVEL_CAP_OVERRIDE: number = 0;
   /**
    * If defined, overrides random critical hit rolls to always or never succeed.
    * Ignored if the move is guaranteed to always/never crit.
    */
   readonly CRITICAL_HIT_OVERRIDE: boolean | null = null;
-  /** default 1000 */
+  /** @defaultValue `1000` */
   readonly STARTING_MONEY_OVERRIDE: number = 0;
   /** Sets all shop item prices to 0 */
   readonly WAIVE_SHOP_FEES_OVERRIDE: boolean = false;
@@ -130,8 +134,8 @@ class DefaultOverrides {
   // PLAYER OVERRIDES
   // ----------------
   /**
-   * Set the form index of any starter in the party whose `speciesId` is inside this override
-   * @see {@link allSpecies} in `src/data/pokemon-species.ts` for form indexes
+   * Set the form index of any starter in the party whose {@linkcode SpeciesId} is inside this override
+   * @see `src/data/pokemon-species.ts` for form indexes
    * @example
    * ```
    * const STARTER_FORM_OVERRIDES = {
@@ -141,23 +145,14 @@ class DefaultOverrides {
    */
   readonly STARTER_FORM_OVERRIDES: Partial<Record<SpeciesId, number>> = {};
 
-  /** default 5 or 20 for Daily */
+  /** @defaultValue `20` for Daily and `5` for all other modes */
   readonly STARTING_LEVEL_OVERRIDE: number = 0;
-  /**
-   * SPECIES OVERRIDE
-   * will only apply to the first starter in your party or each enemy pokemon
-   * default is 0 to not override
-   * @example SPECIES_OVERRIDE = SpeciesId.Bulbasaur;
-   */
-  readonly STARTER_SPECIES_OVERRIDE: SpeciesId | number = 0;
-  /**
-   * This will force your starter to be a random fusion
-   */
+  /** Will override the species of your pokemon when starting a new run */
+  readonly STARTER_SPECIES_OVERRIDE: SpeciesId | 0 = 0;
+  /** This will force your starter to be a random fusion */
   readonly STARTER_FUSION_OVERRIDE: boolean = false;
-  /**
-   * This will override the species of the fusion
-   */
-  readonly STARTER_FUSION_SPECIES_OVERRIDE: SpeciesId | number = 0;
+  /** This will override the species of the fusion */
+  readonly STARTER_FUSION_SPECIES_OVERRIDE: SpeciesId | 0 = 0;
   readonly ABILITY_OVERRIDE: AbilityId = AbilityId.NONE;
   readonly PASSIVE_ABILITY_OVERRIDE: AbilityId = AbilityId.NONE;
   readonly HAS_PASSIVE_ABILITY_OVERRIDE: boolean | null = null;
@@ -180,13 +175,9 @@ class DefaultOverrides {
   // OPPONENT / ENEMY OVERRIDES
   // --------------------------
   readonly ENEMY_SPECIES_OVERRIDE: SpeciesId | number = 0;
-  /**
-   * This will make all opponents fused Pokemon
-   */
+  /** This will make all enemies fused Pokemon */
   readonly ENEMY_FUSION_OVERRIDE: boolean = false;
-  /**
-   * This will override the species of the fusion only when the opponent is already a fusion
-   */
+  /** This will override the species of the fusion only when the enemy is already a fusion */
   readonly ENEMY_FUSION_SPECIES_OVERRIDE: SpeciesId | number = 0;
   readonly ENEMY_LEVEL_OVERRIDE: number = 0;
   readonly ENEMY_ABILITY_OVERRIDE: AbilityId = AbilityId.NONE;
@@ -197,6 +188,7 @@ class DefaultOverrides {
   readonly ENEMY_MOVESET_OVERRIDE: MoveId | Array<MoveId> = [];
   readonly ENEMY_SHINY_OVERRIDE: boolean | null = null;
   readonly ENEMY_VARIANT_OVERRIDE: Variant | null = null;
+
   /**
    * Overrides the IVs of enemy pokemon. Values must never be outside the range `0` to `31`!
    * - If set to a number between `0` and `31`, set all IVs of all enemy pokemon to that number.
@@ -210,9 +202,9 @@ class DefaultOverrides {
   /**
    * Override to give the enemy Pokemon a given amount of health segments
    *
-   * 0 (default): the health segments will be handled normally based on wave, level and species
-   * 1: the Pokemon will have a single health segment and therefore will not be a boss
-   * 2+: the Pokemon will be a boss with the given number of health segments
+   * - `0` (default): the health segments will be handled normally based on wave, level and species
+   * - `1`: the Pokemon will have a single health segment and therefore will not be a boss
+   * - `2+`: the Pokemon will be a boss with the given number of health segments
    */
   readonly ENEMY_HEALTH_SEGMENTS_OVERRIDE: number = 0;
 
@@ -293,9 +285,7 @@ class DefaultOverrides {
    */
   readonly ITEM_REWARD_OVERRIDE: ModifierOverride[] = [];
 
-  /**
-   * If `true`, disable all non-scripted opponent trainer encounters.
-   */
+  /** If `true`, disable all non-scripted opponent trainer encounters. */
   readonly DISABLE_STANDARD_TRAINERS_OVERRIDE: boolean = false;
 
   /**
diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index ff9ee7cc197..87c33a4334b 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -474,20 +474,21 @@ export class CommandPhase extends FieldPhase {
     }
     if (trappedAbMessages.length > 0) {
       if (isSwitch) {
-        globalScene.ui.setMode(UiMode.MESSAGE);
+        globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+          globalScene.ui.showText(
+            trappedAbMessages[0],
+            null,
+            () => {
+              globalScene.ui.showText("", 0);
+              if (isSwitch) {
+                globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+              }
+            },
+            null,
+            true,
+          );
+        });
       }
-      globalScene.ui.showText(
-        trappedAbMessages[0],
-        null,
-        () => {
-          globalScene.ui.showText("", 0);
-          if (isSwitch) {
-            globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-          }
-        },
-        null,
-        true,
-      );
     } else {
       const trapTag = playerPokemon.getTag(TrappedTag);
       const fairyLockTag = globalScene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.PLAYER);