diff --git a/autogen/convert_structs.py b/autogen/convert_structs.py
index f92c8505f..21ff5d18e 100644
--- a/autogen/convert_structs.py
+++ b/autogen/convert_structs.py
@@ -87,6 +87,7 @@ override_field_invisible = {
 
 override_field_deprecated = {
     "ServerSettings": [ "enableCheats" ],
+    "NetworkPlayer": [ "paletteIndex", "overridePaletteIndex", "overridePaletteIndexLp" ]
 }
 
 override_field_immutable = {
diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua
index 76d51fea8..575885f72 100644
--- a/autogen/lua_definitions/constants.lua
+++ b/autogen/lua_definitions/constants.lua
@@ -2596,7 +2596,7 @@ RCO_ALL_EXCEPT_BOWSER = 1
 RCO_NONE = 2
 
 --- @type integer
-PALETTE_PRESET_MAX = 33
+PALETTE_PRESET_MAX = 45
 
 --- @class CharacterSound
 
@@ -2755,33 +2755,170 @@ CT_WARIO = 4
 --- @type CharacterType
 CT_MAX = 5
 
---- @class PlayerParts
+--- @class PalettePreset
 
---- @type PlayerParts
+--- @type PalettePreset
+PALETTE_MARIO = 0
+
+--- @type PalettePreset
+PALETTE_LUIGI = 1
+
+--- @type PalettePreset
+PALETTE_TOAD = 2
+
+--- @type PalettePreset
+PALETTE_WARIO = 3
+
+--- @type PalettePreset
+PALETTE_WALUIGI = 4
+
+--- @type PalettePreset
+PALETTE_YOSHI = 5
+
+--- @type PalettePreset
+PALETTE_TOADETTE = 6
+
+--- @type PalettePreset
+PALETTE_BUCKEN_BERRY = 7
+
+--- @type PalettePreset
+PALETTE_ALA_GOLD = 8
+
+--- @type PalettePreset
+PALETTE_FIRE_MARIO = 9
+
+--- @type PalettePreset
+PALETTE_FIRE_LUIGI = 10
+
+--- @type PalettePreset
+PALETTE_ICE_MARIO = 11
+
+--- @type PalettePreset
+PALETTE_ICE_LUIGI = 12
+
+--- @type PalettePreset
+PALETTE_TOADSWORTH = 13
+
+--- @type PalettePreset
+PALETTE_PEACH = 14
+
+--- @type PalettePreset
+PALETTE_DAISY = 15
+
+--- @type PalettePreset
+PALETTE_WARIO_WOODS = 16
+
+--- @type PalettePreset
+PALETTE_GB = 17
+
+--- @type PalettePreset
+PALETTE_SNES = 18
+
+--- @type PalettePreset
+PALETTE_SWITCH = 19
+
+--- @type PalettePreset
+PALETTE_CLOVER = 20
+
+--- @type PalettePreset
+PALETTE_COBALT = 21
+
+--- @type PalettePreset
+PALETTE_RUBY = 22
+
+--- @type PalettePreset
+PALETTE_FURY = 23
+
+--- @type PalettePreset
+PALETTE_HOT_PINK = 24
+
+--- @type PalettePreset
+PALETTE_NICE_PINK = 25
+
+--- @type PalettePreset
+PALETTE_SEAFOAM = 26
+
+--- @type PalettePreset
+PALETTE_LILAC = 27
+
+--- @type PalettePreset
+PALETTE_COPPER = 28
+
+--- @type PalettePreset
+PALETTE_AZURE = 29
+
+--- @type PalettePreset
+PALETTE_BURGUNDY = 30
+
+--- @type PalettePreset
+PALETTE_MINT = 31
+
+--- @type PalettePreset
+PALETTE_ORANGE = 32
+
+--- @type PalettePreset
+PALETTE_ARCTIC = 33
+
+--- @type PalettePreset
+PALETTE_BLACK = 34
+
+--- @type PalettePreset
+PALETTE_BUBBLEGUM = 35
+
+--- @type PalettePreset
+PALETTE_BUSY_BEE = 36
+
+--- @type PalettePreset
+PALETTE_FORTRESS = 37
+
+--- @type PalettePreset
+PALETTE_BLUEBERRY_PIE = 38
+
+--- @type PalettePreset
+PALETTE_RASPBERRY = 39
+
+--- @type PalettePreset
+PALETTE_COFFEE = 40
+
+--- @type PalettePreset
+PALETTE_MARGIN = 41
+
+--- @type PalettePreset
+PALETTE_PUMPKIN = 42
+
+--- @type PalettePreset
+PALETTE_SOIL = 43
+
+--- @type PalettePreset
+PALETTE_CREVASE = 44
+
+--- @class PlayerPart
+
+--- @type PlayerPart
 PANTS = 0
 
---- @type PlayerParts
+--- @type PlayerPart
 SHIRT = 1
 
---- @type PlayerParts
+--- @type PlayerPart
 GLOVES = 2
 
---- @type PlayerParts
+--- @type PlayerPart
 SHOES = 3
 
---- @type PlayerParts
+--- @type PlayerPart
 HAIR = 4
 
---- @type PlayerParts
+--- @type PlayerPart
 SKIN = 5
 
---- @type PlayerParts
+--- @type PlayerPart
 CAP = 6
 
---- @type PlayerParts
+--- @type PlayerPart
 PLAYER_PART_MAX = 7
 
---- @type PlayerParts
+--- @type PlayerPart
 METAL = CAP
 
 --- @class DialogId
diff --git a/autogen/lua_definitions/functions.lua b/autogen/lua_definitions/functions.lua
index c397c95e5..45e48c1a1 100644
--- a/autogen/lua_definitions/functions.lua
+++ b/autogen/lua_definitions/functions.lua
@@ -5843,7 +5843,7 @@ function get_network_player_smallest_global()
 end
 
 --- @param np NetworkPlayer
---- @param part PlayerParts
+--- @param part PlayerPart
 --- @param color Color
 --- @return nil
 function network_player_color_to_palette(np, part, color)
@@ -5862,7 +5862,7 @@ function network_player_from_global_index(globalIndex)
 end
 
 --- @param np NetworkPlayer
---- @param part PlayerParts
+--- @param part PlayerPart
 --- @param out Color
 --- @return nil
 function network_player_palette_to_color(np, part, out)
diff --git a/docs/lua/constants.md b/docs/lua/constants.md
index 66a36c59b..9bc69ceb4 100644
--- a/docs/lua/constants.md
+++ b/docs/lua/constants.md
@@ -9,7 +9,8 @@
 - [characters.h](#charactersh)
     - [enum CharacterSound](#enum-CharacterSound)
     - [enum CharacterType](#enum-CharacterType)
-    - [enum PlayerParts](#enum-PlayerParts)
+    - [enum PalettePreset](#enum-PalettePreset)
+    - [enum PlayerPart](#enum-PlayerPart)
 - [dialog_ids.h](#dialog_idsh)
     - [enum DialogId](#enum-DialogId)
 - [djui_console.h](#djui_consoleh)
@@ -899,7 +900,56 @@
 | CT_WARIO | 4 |
 | CT_MAX | 5 |
 
-### [enum PlayerParts](#PlayerParts)
+### [enum PalettePreset](#PalettePreset)
+| Identifier | Value |
+| :--------- | :---- |
+| PALETTE_MARIO | 0 |
+| PALETTE_LUIGI | 1 |
+| PALETTE_TOAD | 2 |
+| PALETTE_WARIO | 3 |
+| PALETTE_WALUIGI | 4 |
+| PALETTE_YOSHI | 5 |
+| PALETTE_TOADETTE | 6 |
+| PALETTE_BUCKEN_BERRY | 7 |
+| PALETTE_ALA_GOLD | 8 |
+| PALETTE_FIRE_MARIO | 9 |
+| PALETTE_FIRE_LUIGI | 10 |
+| PALETTE_ICE_MARIO | 11 |
+| PALETTE_ICE_LUIGI | 12 |
+| PALETTE_TOADSWORTH | 13 |
+| PALETTE_PEACH | 14 |
+| PALETTE_DAISY | 15 |
+| PALETTE_WARIO_WOODS | 16 |
+| PALETTE_GB | 17 |
+| PALETTE_SNES | 18 |
+| PALETTE_SWITCH | 19 |
+| PALETTE_CLOVER | 20 |
+| PALETTE_COBALT | 21 |
+| PALETTE_RUBY | 22 |
+| PALETTE_FURY | 23 |
+| PALETTE_HOT_PINK | 24 |
+| PALETTE_NICE_PINK | 25 |
+| PALETTE_SEAFOAM | 26 |
+| PALETTE_LILAC | 27 |
+| PALETTE_COPPER | 28 |
+| PALETTE_AZURE | 29 |
+| PALETTE_BURGUNDY | 30 |
+| PALETTE_MINT | 31 |
+| PALETTE_ORANGE | 32 |
+| PALETTE_ARCTIC | 33 |
+| PALETTE_BLACK | 34 |
+| PALETTE_BUBBLEGUM | 35 |
+| PALETTE_BUSY_BEE | 36 |
+| PALETTE_FORTRESS | 37 |
+| PALETTE_BLUEBERRY_PIE | 38 |
+| PALETTE_RASPBERRY | 39 |
+| PALETTE_COFFEE | 40 |
+| PALETTE_MARGIN | 41 |
+| PALETTE_PUMPKIN | 42 |
+| PALETTE_SOIL | 43 |
+| PALETTE_CREVASE | 44 |
+
+### [enum PlayerPart](#PlayerPart)
 | Identifier | Value |
 | :--------- | :---- |
 | PANTS | 0 |
diff --git a/docs/lua/functions-4.md b/docs/lua/functions-4.md
index 277e72e5f..a00739a80 100644
--- a/docs/lua/functions-4.md
+++ b/docs/lua/functions-4.md
@@ -83,14 +83,14 @@
 | Field | Type |
 | ----- | ---- |
 | np | [NetworkPlayer](structs.md#NetworkPlayer) |
-| part | [enum PlayerParts](constants.md#enum-PlayerParts) |
+| part | [enum PlayerPart](constants.md#enum-PlayerPart) |
 | color | `Color` |
 
 ### Returns
 - None
 
 ### C Prototype
-`void network_player_color_to_palette(struct NetworkPlayer *np, enum PlayerParts part, Color color);`
+`void network_player_color_to_palette(struct NetworkPlayer *np, enum PlayerPart part, Color color);`
 
 [:arrow_up_small:](#)
 
@@ -143,14 +143,14 @@
 | Field | Type |
 | ----- | ---- |
 | np | [NetworkPlayer](structs.md#NetworkPlayer) |
-| part | [enum PlayerParts](constants.md#enum-PlayerParts) |
+| part | [enum PlayerPart](constants.md#enum-PlayerPart) |
 | out | `Color` |
 
 ### Returns
 - None
 
 ### C Prototype
-`void network_player_palette_to_color(struct NetworkPlayer *np, enum PlayerParts part, Color out);`
+`void network_player_palette_to_color(struct NetworkPlayer *np, enum PlayerPart part, Color out);`
 
 [:arrow_up_small:](#)
 
diff --git a/docs/lua/structs.md b/docs/lua/structs.md
index 536b9e02f..ebe2422ca 100644
--- a/docs/lua/structs.md
+++ b/docs/lua/structs.md
@@ -1505,10 +1505,7 @@
 | onRxSeqId | `integer` | read-only |
 | overrideModelIndex | `integer` |  |
 | overridePalette | [PlayerPalette](structs.md#PlayerPalette) |  |
-| overridePaletteIndex | `integer` |  |
-| overridePaletteIndexLp | `integer` | read-only |
 | palette | [PlayerPalette](structs.md#PlayerPalette) | read-only |
-| paletteIndex | `integer` | read-only |
 | ping | `integer` | read-only |
 | type | `integer` | read-only |
 
diff --git a/lang/Czech.ini b/lang/Czech.ini
index c9124d06f..e8b35e5e2 100644
--- a/lang/Czech.ini
+++ b/lang/Czech.ini
@@ -315,37 +315,49 @@ EDIT_PALETTE = "Upravit barvy"
 [PALETTE]
 MARIO = "Mario"
 LUIGI = "Luigi"
-WALUIGI = "Waluigi"
-WARIO = "Wario"
-CHUCKYA = "Chuckya"
-GOOMBA = "Goomba"
-CLOVER = "Jetel"
-COBALT = "Kobalt"
-FURY = "Zuřivost"
-HOT_PINK = "Teplá růžová"
-NICE_PINK = "Pěkná růžová"
-SEAFOAM = "Mořská pěna"
-LILAC = "Šeřík"
-COPPER = "Měď"
-AZURE = "Blankyt"
-BURGUNDY = "Burgundská"
-MINT = "Máta"
-EGGPLANT = "Lilek"
-ORANGE = "Pomeranč"
-ARCTIC = "Arktická"
-FIRE_MARIO = "Ohnivý Mario"
-FIRE_LUIGI = "Ohnivý Luigi"
-FIRE_WALUIGI = "Ohnivý Waluigi"
-FIRE_WARIO = "Ohnivý Wario"
-BUSY_BEE = "Zaneprázdněná včelka"
-FORTRESS = "Pevnost"
-BATTLEMENTS = "Cimbuří"
-BLUEBERRY_PIE = "Borůvkový koláč"
-RASPBERRY = "Ostružina"
-BUBBLEGUM = "Žvýkačka"
-ICE_MARIO = "Ledový Mario"
-ICE_LUIGI = "Ledový Luigi"
 TOAD = "Toad"
+WARIO = "Wario"
+WALUIGI = "Waluigi"
+YOSHI = "Yoshi"
+TOADETTE = "Toadette"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
+FIRE_MARIO = "Oheň Mario"
+FIRE_LUIGI = "Oheň Luigi"
+ICE_MARIO = "Led Mario"
+ICE_LUIGI = "Led Luigi"
+TOADSWORTH = "Toadsworth"
+PEACH = "Peach"
+DAISY = "Daisy"
+WARIO_WOODS = "Woods' Menace"
+GB = "Game Boy"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
+CLOVER = "Clover"
+COBALT = "Kobalt"
+RUBY = "Rubín"
+FURY = "Fury"
+HOT_PINK = "Růžově horký"
+NICE_PINK = "Hezký růžový"
+SEAFOAM = "Mořská pěna"
+LILAC = "Lilac"
+COPPER = "Měď"
+AZURE = "Azurový"
+BURGUNDY = "Bordó"
+MINT = "Mentolový"
+ORANGE = "Oranžový"
+ARCTIC = "Arktický"
+BLACK = "Jet Black"
+BUBBLEGUM = "Bubblegum"
+BUSY_BEE = "Zaneprázdněná včela"
+FORTRESS = "Pevnost"
+BLUEBERRY_PIE = "Torta z borůvek"
+RASPBERRY = "Malinový"
+COFFEE = "Kávová smetana"
+MARGIN = "Margin of Night"
+PUMPKIN = "Dýňový"
+SOIL = "Galaktická půda"
+CREVASE = "Studená trhlina"
 CUSTOM = "Vlastní"
 
 [PLAYER_LIST]
diff --git a/lang/Dutch.ini b/lang/Dutch.ini
index 498fc84db..3784d9e70 100644
--- a/lang/Dutch.ini
+++ b/lang/Dutch.ini
@@ -315,37 +315,49 @@ EDIT_PALETTE = "Bewerk Palet"
 [PALETTE]
 MARIO = "Mario"
 LUIGI = "Luigi"
-WALUIGI = "Waluigi"
+TOAD = "Toad"
 WARIO = "Wario"
-CHUCKYA = "Chuckya"
-GOOMBA = "Goomba"
-CLOVER = "Klaver"
+WALUIGI = "Waluigi"
+YOSHI = "Yoshi"
+TOADETTE = "Toadette"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
+FIRE_MARIO = "Vuur Mario"
+FIRE_LUIGI = "Vuur Luigi"
+ICE_MARIO = "IJs Mario"
+ICE_LUIGI = "IJs Luigi"
+TOADSWORTH = "Toadsworth"
+PEACH = "Peach"
+DAISY = "Daisy"
+WARIO_WOODS = "Woods' Menace"
+GB = "Game Boy"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
+CLOVER = "Clover"
 COBALT = "Kobalt"
-FURY = "Woede"
+RUBY = "Robijn"
+FURY = "Fury"
 HOT_PINK = "Heet Roze"
-NICE_PINK = "Leuk Roze"
-SEAFOAM = "Zeeschuim"
+NICE_PINK = "Mooi Roze"
+SEAFOAM = "Zeegroen"
 LILAC = "Lila"
 COPPER = "Koper"
 AZURE = "Azuur"
 BURGUNDY = "Bourgondië"
 MINT = "Munt"
-EGGPLANT = "Aubergine"
 ORANGE = "Oranje"
 ARCTIC = "Arctisch"
-FIRE_MARIO = "Vuur Mario"
-FIRE_LUIGI = "Vuur Luigi"
-FIRE_WALUIGI = "Vuur Waluigi"
-FIRE_WARIO = "Vuur Wario"
-BUSY_BEE = "Bezige Bij"
-FORTRESS = "Vesting"
-BATTLEMENTS = "Kantelen"
-BLUEBERRY_PIE = "Bosbessen taart"
+BLACK = "Diep Zwart"
+BUBBLEGUM = "Bubbelgum"
+BUSY_BEE = "Drukke Bij"
+FORTRESS = "Fort"
+BLUEBERRY_PIE = "Bosbessentaart"
 RASPBERRY = "Framboos"
-BUBBLEGUM = "Kauwgom"
-ICE_MARIO = "Ijs Mario"
-ICE_LUIGI = "Ijs Luigi"
-TOAD = "Toad"
+COFFEE = "Koffie Room"
+MARGIN = "Marge van de Nacht"
+PUMPKIN = "Pompoen"
+SOIL = "Galactische Grond"
+CREVASE = "Koude Kloof"
 CUSTOM = "Aangepast"
 
 [PLAYER_LIST]
diff --git a/lang/English.ini b/lang/English.ini
index 463a4a167..150cc5cc5 100644
--- a/lang/English.ini
+++ b/lang/English.ini
@@ -315,10 +315,27 @@ EDIT_PALETTE = "Edit Palette"
 [PALETTE]
 MARIO = "Mario"
 LUIGI = "Luigi"
-WALUIGI = "Waluigi"
+TOAD = "Toad"
 WARIO = "Wario"
+WALUIGI = "Waluigi"
+YOSHI = "Yoshi"
+TOADETTE = "Toadette"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
+FIRE_MARIO = "Fire Mario"
+FIRE_LUIGI = "Fire Luigi"
+ICE_MARIO = "Ice Mario"
+ICE_LUIGI = "Ice Luigi"
+TOADSWORTH = "Toadsworth"
+PEACH = "Peach"
+DAISY = "Daisy"
+WARIO_WOODS = "Woods' Menace"
+GB = "Game Boy"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
 CLOVER = "Clover"
 COBALT = "Cobalt"
+RUBY = "Ruby"
 FURY = "Fury"
 HOT_PINK = "Hot Pink"
 NICE_PINK = "Nice Pink"
@@ -328,43 +345,19 @@ COPPER = "Copper"
 AZURE = "Azure"
 BURGUNDY = "Burgundy"
 MINT = "Mint"
-EGGPLANT = "Eggplant"
 ORANGE = "Orange"
 ARCTIC = "Arctic"
+BLACK = "Jet Black"
+BUBBLEGUM = "Bubblegum"
 BUSY_BEE = "Busy Bee"
 FORTRESS = "Fortress"
-BATTLEMENTS = "Battlements"
 BLUEBERRY_PIE = "Blueberry Pie"
 RASPBERRY = "Raspberry"
-BUBBLEGUM = "Bubblegum"
-TOAD = "Toad"
-BUCKEN_BERRY = "Bucken Berry"
-ALA_GOLD = "Ala Gold"
-TOADETTE = "Toadette"
-TOADSWORTH = "Toadsworth"
-YOSHI = "Yoshi"
-WARIO_WOODS = "Woods' Menace"
-CLASSIC_1 = "Classic Mario"
-CLASSIC_2 = "Classic Luigi"
-CLAUDI = "Claudi"
-JONNY = "Jonny"
-SUNNY = "Sunny"
-NETTY = "Netty"
-TOMMY = "Tommy"
-PEACH = "Peach"
-DAISY = "Daisy"
-SPIKE = "Spike"
-GB = "Game Boy"
-N64 = "64 Memories"
-SNES = "Super Lilac"
-SWITCH = "Switch Neon"
-BLACK = "Jet Black"
 COFFEE = "Coffee Cream"
 MARGIN = "Margin of Night"
 PUMPKIN = "Pumpkin"
 SOIL = "Galactic Soil"
 CREVASE = "Cold Crevase"
-ICE_LUIGI = "Ice Luigi"
 CUSTOM = "Custom"
 
 [PLAYER_LIST]
diff --git a/lang/French.ini b/lang/French.ini
index 4b0704d27..ac3fe39ab 100644
--- a/lang/French.ini
+++ b/lang/French.ini
@@ -315,38 +315,50 @@ EDIT_PALETTE = "Modifier la palette"
 [PALETTE]
 MARIO = "Mario"
 LUIGI = "Luigi"
-WALUIGI = "Waluigi"
+TOAD = "Toad"
 WARIO = "Wario"
-CHUCKYA = "Chuckya"
-GOOMBA = "Goomba"
+WALUIGI = "Waluigi"
+YOSHI = "Yoshi"
+TOADETTE = "Toadette"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
+FIRE_MARIO = "Mario de feu"
+FIRE_LUIGI = "Luigi de feu"
+ICE_MARIO = "Mario de glace"
+ICE_LUIGI = "Luigi de glace"
+TOADSWORTH = "Toadsworth"
+PEACH = "Peach"
+DAISY = "Daisy"
+WARIO_WOODS = "Menace des bois de Wario"
+GB = "Game Boy"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
 CLOVER = "Trèfle"
 COBALT = "Cobalt"
-FURY = "Fureur"
-HOT_PINK = "Rose Chaud"
-NICE_PINK = "Rose Bonbon"
-SEAFOAM = "Écume"
+RUBY = "Rubis"
+FURY = "Fury"
+HOT_PINK = "Rose vif"
+NICE_PINK = "Joli rose"
+SEAFOAM = "Écume de mer"
 LILAC = "Lilas"
 COPPER = "Cuivre"
 AZURE = "Azur"
-BURGUNDY = "Bordeaux"
+BURGUNDY = "Bourgogne"
 MINT = "Menthe"
-EGGPLANT = "Aubergine"
 ORANGE = "Orange"
 ARCTIC = "Arctique"
-FIRE_MARIO = "Mario de feu"
-FIRE_LUIGI = "Luigi de feu"
-FIRE_WALUIGI = "Waluigi de feu"
-FIRE_WARIO = "Wario de feu"
-BUSY_BEE = "Abeille"
+BLACK = "Noir profond"
+BUBBLEGUM = "Chewing-gum"
+BUSY_BEE = "Abeille occupée"
 FORTRESS = "Forteresse"
-BATTLEMENTS = "Remparts"
-BLUEBERRY_PIE = "Tarte Myrtilles"
+BLUEBERRY_PIE = "Tarte aux myrtilles"
 RASPBERRY = "Framboise"
-BUBBLEGUM = "Bubblegum"
-ICE_MARIO = "Mario de glace"
-ICE_LUIGI = "Luigi de glace"
-TOAD = "Toad"
-CUSTOM = "Personnalisée"
+COFFEE = "Crème de café"
+MARGIN = "Marge de la nuit"
+PUMPKIN = "Citrouille"
+SOIL = "Sol galactique"
+CREVASE = "Fissure froide"
+CUSTOM = "Personnalisé"
 
 [PLAYER_LIST]
 PLAYERS = "JOUEURS"
diff --git a/lang/German.ini b/lang/German.ini
index 3edc51099..621ad02ac 100644
--- a/lang/German.ini
+++ b/lang/German.ini
@@ -315,37 +315,49 @@ EDIT_PALETTE = "Palette bearbeiten"
 [PALETTE]
 MARIO = "Mario"
 LUIGI = "Luigi"
-WALUIGI = "Waluigi"
+TOAD = "Toad"
 WARIO = "Wario"
-CHUCKYA = "Wurfmufti"
-GOOMBA = "Gumba"
+WALUIGI = "Waluigi"
+YOSHI = "Yoshi"
+TOADETTE = "Toadette"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
+FIRE_MARIO = "Feuer Mario"
+FIRE_LUIGI = "Feuer Luigi"
+ICE_MARIO = "Eis Mario"
+ICE_LUIGI = "Eis Luigi"
+TOADSWORTH = "Toadsworth"
+PEACH = "Peach"
+DAISY = "Daisy"
+WARIO_WOODS = "Bedrohung des Waldes"
+GB = "Game Boy"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
 CLOVER = "Klee"
 COBALT = "Kobalt"
-FURY = "Zorn"
-HOT_PINK = "Neonpink"
+RUBY = "Rubin"
+FURY = "Fury"
+HOT_PINK = "Heißes Pink"
 NICE_PINK = "Schönes Pink"
 SEAFOAM = "Meeresschaum"
 LILAC = "Flieder"
 COPPER = "Kupfer"
 AZURE = "Azur"
-BURGUNDY = "Burgunder"
+BURGUNDY = "Burgund"
 MINT = "Minze"
-EGGPLANT = "Aubergine"
 ORANGE = "Orange"
-ARCTIC = "Arktis"
-FIRE_MARIO = "Feuer-Mario"
-FIRE_LUIGI = "Feuer-Luigi"
-FIRE_WALUIGI = "Feuer-Waluigi"
-FIRE_WARIO = "Feuer-Wario"
+ARCTIC = "Arktisch"
+BLACK = "Tiefschwarz"
+BUBBLEGUM = "Kaugummi"
 BUSY_BEE = "Fleißige Biene"
 FORTRESS = "Festung"
-BATTLEMENTS = "Wehrmauer"
-BLUEBERRY_PIE = "Blaubeerkuchen"
+BLUEBERRY_PIE = "Heidelbeerkuchen"
 RASPBERRY = "Himbeere"
-BUBBLEGUM = "Kaugummi"
-ICE_MARIO = "Eis-Mario"
-ICE_LUIGI = "Eis-Luigi"
-TOAD = "Toad"
+COFFEE = "Kaffee-Creme"
+MARGIN = "Rand der Nacht"
+PUMPKIN = "Kürbis"
+SOIL = "Galaktischer Boden"
+CREVASE = "Kalte Spalte"
 CUSTOM = "Benutzerdefiniert"
 
 [PLAYER_LIST]
diff --git a/lang/Italian.ini b/lang/Italian.ini
index b2ccc608f..4359018fb 100644
--- a/lang/Italian.ini
+++ b/lang/Italian.ini
@@ -313,37 +313,49 @@ EDIT_PALETTE = "Modifica Palette"
 [PALETTE]
 MARIO = "Mario"
 LUIGI = "Luigi"
-WALUIGI = "Waluigi"
+TOAD = "Toad"
 WARIO = "Wario"
-CHUCKYA = "Chuckya"
-GOOMBA = "Goomba"
+WALUIGI = "Waluigi"
+YOSHI = "Yoshi"
+TOADETTE = "Toadette"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
+FIRE_MARIO = "Mario di fuoco"
+FIRE_LUIGI = "Luigi di fuoco"
+ICE_MARIO = "Mario di ghiaccio"
+ICE_LUIGI = "Luigi di ghiaccio"
+TOADSWORTH = "Toadsworth"
+PEACH = "Peach"
+DAISY = "Daisy"
+WARIO_WOODS = "Minaccia del Bosco di Wario"
+GB = "Game Boy"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
 CLOVER = "Trifoglio"
 COBALT = "Cobalto"
-FURY = "Furia"
-HOT_PINK = "Rosa Caldo"
-NICE_PINK = "Rosa Fresco"
-SEAFOAM = "Schiuma Marina"
+RUBY = "Rubino"
+FURY = "Fury"
+HOT_PINK = "Rosa caldo"
+NICE_PINK = "Bel rosa"
+SEAFOAM = "Sgargiante"
 LILAC = "Lilla"
 COPPER = "Rame"
-AZURE = "Azurro"
+AZURE = "Azzurro"
 BURGUNDY = "Borgogna"
 MINT = "Menta"
-EGGPLANT = "Melanzana"
-ORANGE = "Arancia"
-ARCTIC = "Arctico"
-FIRE_MARIO = "Mario Fuoco"
-FIRE_LUIGI = "Luigi Fuoco"
-FIRE_WALUIGI = "Waluigi Fuoco"
-FIRE_WARIO = "Wario Fuoco"
-BUSY_BEE = "Ape Operaia"
+ORANGE = "Arancione"
+ARCTIC = "Artico"
+BLACK = "Nero profondo"
+BUBBLEGUM = "Bubblegum"
+BUSY_BEE = "Ape impegnata"
 FORTRESS = "Fortezza"
-BATTLEMENTS = "Muraglia"
-BLUEBERRY_PIE = "Torta ai Mirtilli"
-RASPBERRY = "Mora"
-BUBBLEGUM = "Gomma da Masticare"
-ICE_MARIO = "Mario Ghiaccio"
-ICE_LUIGI = "Luigi Ghiaccio"
-TOAD = "Toad"
+BLUEBERRY_PIE = "Torta ai mirtilli"
+RASPBERRY = "Lampone"
+COFFEE = "Crema di caffè"
+MARGIN = "Margine della notte"
+PUMPKIN = "Zucca"
+SOIL = "Suolo galattico"
+CREVASE = "Fessura fredda"
 CUSTOM = "Personalizzato"
 
 [PLAYER_LIST]
diff --git a/lang/Polish.ini b/lang/Polish.ini
index c52e631a9..ce9547d79 100644
--- a/lang/Polish.ini
+++ b/lang/Polish.ini
@@ -315,38 +315,50 @@ EDIT_PALETTE = "Edytuj Palete"
 [PALETTE]
 MARIO = "Mario"
 LUIGI = "Luigi"
-WALUIGI = "Waluigi"
+TOAD = "Toad"
 WARIO = "Wario"
-CHUCKYA = "Chuckya"
-GOOMBA = "Goomba"
-CLOVER = "Koniczyna"
-COBALT = "Kobalt"
-FURY = "Furia"
-HOT_PINK = "Goracy Roz"
-NICE_PINK = "Delikatny Roz"
-SEAFOAM = "Piana Morska"
-LILAC = "Liliowy"
-COPPER = "Miedziany"
-AZURE = "Lazurowy"
-BURGUNDY = "Burgundowy"
-MINT = "Mietowy"
-EGGPLANT = "Baklazan"
-ORANGE = "Pomaranczowy"
-ARCTIC = "Arktyczny"
+WALUIGI = "Waluigi"
+YOSHI = "Yoshi"
+TOADETTE = "Toadette"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
 FIRE_MARIO = "Ognisty Mario"
 FIRE_LUIGI = "Ognisty Luigi"
-FIRE_WALUIGI = "Ognisty Waluigi"
-FIRE_WARIO = "Ognisty Wario"
-BUSY_BEE = "Pracowita Pszczolka"
-FORTRESS = "Forteca"
-BATTLEMENTS = "Blanki"
-BLUEBERRY_PIE = "Placek Jagodowy"
-RASPBERRY = "Malina"
-BUBBLEGUM = "Guma Balonowa"
 ICE_MARIO = "Lodowy Mario"
 ICE_LUIGI = "Lodowy Luigi"
-TOAD = "Toad"
-CUSTOM = "Wlasny"
+TOADSWORTH = "Toadsworth"
+PEACH = "Peach"
+DAISY = "Daisy"
+WARIO_WOODS = "Zagrożenie lasów"
+GB = "Game Boy"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
+CLOVER = "Koniczyna"
+COBALT = "Kobalt"
+RUBY = "Rubin"
+FURY = "Fury"
+HOT_PINK = "Gorąca różowa"
+NICE_PINK = "Ładna różowa"
+SEAFOAM = "Morska piana"
+LILAC = "Liliowy"
+COPPER = "Miedziany"
+AZURE = "Lazur"
+BURGUNDY = "Bordowy"
+MINT = "Mięta"
+ORANGE = "Pomarańczowy"
+ARCTIC = "Arktyczny"
+BLACK = "Czerniak"
+BUBBLEGUM = "Bubblegum"
+BUSY_BEE = "Ruchliwa Pszczółka"
+FORTRESS = "Forteca"
+BLUEBERRY_PIE = "Tarta Borówkowa"
+RASPBERRY = "Malinowy"
+COFFEE = "Kawowe Cream"
+MARGIN = "Margines nocy"
+PUMPKIN = "Dyniowy"
+SOIL = "Galaktyczna Ziemia"
+CREVASE = "Zimna Szczelina"
+CUSTOM = "Niestandardowy"
 
 [PLAYER_LIST]
 PLAYERS = "GRACZE"
diff --git a/lang/Portuguese.ini b/lang/Portuguese.ini
index aa8745c3b..7e3e5b53f 100644
--- a/lang/Portuguese.ini
+++ b/lang/Portuguese.ini
@@ -315,38 +315,50 @@ EDIT_PALETTE = "Editar Paleta"
 [PALETTE]
 MARIO = "Mario"
 LUIGI = "Luigi"
-WALUIGI = "Waluigi"
+TOAD = "Toad"
 WARIO = "Wario"
-CHUCKYA = "Chuckya"
-GOOMBA = "Goomba"
+WALUIGI = "Waluigi"
+YOSHI = "Yoshi"
+TOADETTE = "Toadette"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
+FIRE_MARIO = "Mario de Fogo"
+FIRE_LUIGI = "Luigi de Fogo"
+ICE_MARIO = "Mario de Gelo"
+ICE_LUIGI = "Luigi de Gelo"
+TOADSWORTH = "Toadsworth"
+PEACH = "Peach"
+DAISY = "Daisy"
+WARIO_WOODS = "Ameaça dos Bosques"
+GB = "Game Boy"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
 CLOVER = "Trevo"
 COBALT = "Cobalto"
-FURY = "Fúria"
+RUBY = "Rubi"
+FURY = "Fury"
 HOT_PINK = "Rosa Quente"
-NICE_PINK = "Rosa Linda"
+NICE_PINK = "Rosa Bonito"
 SEAFOAM = "Espuma do Mar"
 LILAC = "Lilás"
 COPPER = "Cobre"
-AZURE = "Azul-Celeste"
+AZURE = "Azul-petróleo"
 BURGUNDY = "Borgonha"
 MINT = "Menta"
-EGGPLANT = "Beringela"
 ORANGE = "Laranja"
-ARCTIC = "Árctico"
-FIRE_MARIO = "Mario de Fogo"
-FIRE_LUIGI = "Luigi de Fogo"
-FIRE_WALUIGI = "Waluigi de Fogo"
-FIRE_WARIO = "Wario de Fogo"
+ARCTIC = "Ártico"
+BLACK = "Preto Profundo"
+BUBBLEGUM = "Bola de Chiclete"
 BUSY_BEE = "Abelha Atarefada"
 FORTRESS = "Fortaleza"
-BATTLEMENTS = "Muralhas"
 BLUEBERRY_PIE = "Torta de Mirtilo"
 RASPBERRY = "Framboesa"
-BUBBLEGUM = "Chiclete"
-ICE_MARIO = "Mario de Gelo"
-ICE_LUIGI = "Luigi de Gelo"
-TOAD = "Toad"
-CUSTOM = "Customizado"
+COFFEE = "Creme de Café"
+MARGIN = "Margem da Noite"
+PUMPKIN = "Abóbora"
+SOIL = "Solo Galáctico"
+CREVASE = "Fenda Fria"
+CUSTOM = "Personalizado"
 
 [PLAYER_LIST]
 PLAYERS = "JOGADORES"
diff --git a/lang/Russian.ini b/lang/Russian.ini
index 6c0f61894..4ce388949 100644
--- a/lang/Russian.ini
+++ b/lang/Russian.ini
@@ -314,38 +314,50 @@ EDIT_PALETTE = "Редактировать палитру"
 [PALETTE]
 MARIO = "Марио"
 LUIGI = "Луиджи"
-WALUIGI = "Валуиджи"
+TOAD = "Тоад"
 WARIO = "Варио"
-CHUCKYA = "Чакья"
-GOOMBA = "Гумба"
+WALUIGI = "Валуиджи"
+YOSHI = "Йоши"
+TOADETTE = "Тоадетт"
+BUCKEN_BERRY = "Бакен Берри"
+ALA_GOLD = "Ала Голд"
+FIRE_MARIO = "Огненный Марио"
+FIRE_LUIGI = "Огненный Луиджи"
+ICE_MARIO = "Ледяной Марио"
+ICE_LUIGI = "Ледяной Луиджи"
+TOADSWORTH = "Тоадсворт"
+PEACH = "Пич"
+DAISY = "Дейзи"
+WARIO_WOODS = "Угроза лесов"
+GB = "Гейм Бой"
+SNES = "Супер Лилак"
+SWITCH = "Свитч Неон"
 CLOVER = "Клевер"
 COBALT = "Кобальт"
+RUBY = "Рубин"
 FURY = "Ярость"
-HOT_PINK = "Ярко-розовый"
-NICE_PINK = "Приятный розовый"
+HOT_PINK = "Горячий розовый"
+NICE_PINK = "Красивый розовый"
 SEAFOAM = "Морская пена"
 LILAC = "Сирень"
 COPPER = "Медь"
-AZURE = "Лазурный"
-BURGUNDY = "Бургундия"
+AZURE = "Лазурь"
+BURGUNDY = "Бургундский"
 MINT = "Мята"
-EGGPLANT = "Баклажан"
-ORANGE = "Апельсин"
-ARCTIC = "Арктический"
-FIRE_MARIO = "Огненный Марио"
-FIRE_LUIGI = "Огненный Луиджи"
-FIRE_WALUIGI = "Огненный Валуиджи"
-FIRE_WARIO = "Огненный Варио"
-BUSY_BEE = "Жужжащая пчелка"
-FORTRESS = "Крепость"
-BATTLEMENTS = "Крепкая стена"
-BLUEBERRY_PIE = "Черничный пирог"
-RASPBERRY = "Малина"
+ORANGE = "Оранжевый"
+ARCTIC = "Арктика"
+BLACK = "Черный"
 BUBBLEGUM = "Жвачка"
-ICE_MARIO = "Ледяной Марио"
-ICE_LUIGI = "Ледяной Луиджи"
-TOAD = "Тоад"s
-CUSTOM = "Свой"
+BUSY_BEE = "Занятая пчела"
+FORTRESS = "Крепость"
+BLUEBERRY_PIE = "Торт из черники"
+RASPBERRY = "Малина"
+COFFEE = "Кофейное мороженое"
+MARGIN = "Край ночи"
+PUMPKIN = "Тыква"
+SOIL = "Галактическая почва"
+CREVASE = "Холодная расщелина"
+CUSTOM = "Пользовательский"
 
 [PLAYER_LIST]
 PLAYERS = "PLAYERS"
diff --git a/lang/SpanishES.ini b/lang/SpanishES.ini
index e46d8c970..56dd67c54 100644
--- a/lang/SpanishES.ini
+++ b/lang/SpanishES.ini
@@ -315,65 +315,50 @@ EDIT_PALETTE = "Editar Paleta"
 [PALETTE]
 MARIO = "Mario"
 LUIGI = "Luigi"
-WALUIGI = "Waluigi"
-WARIO = "Wario"
-CHUCKYA = "Chuckya"
-GOOMBA = "Goomba"
-CLOVER = "Trébol"
-COBALT = "Cobalto"
-FURY = "Furia"
-HOT_PINK = "Rosa Intenso"
-NICE_PINK = "Rosa Agradable"
-SEAFOAM = "Espuma Marina"
-LILAC = "Lila"
-COPPER = "Cobre"
-AZURE = "Celeste"
-BURGUNDY = "Borgoña"
-MINT = "Menta"
-EGGPLANT = "Berenjena"
-ORANGE = "Naranja"
-ARCTIC = "Ártico"
-FIRE_MARIO = "Mario de Fuego"
-FIRE_LUIGI = "Luigi de Fuego"
-FIRE_WALUIGI = "Waluigi de Fuego"
-FIRE_WARIO = "Wario de Fuego"
-BUSY_BEE = "Abeja Ocupada"
-FORTRESS = "Fortaleza"
-BATTLEMENTS = "Acorazado"
-BLUEBERRY_PIE = "Tarta de Arándanos"
-RASPBERRY = "Frambuesa"
-BUBBLEGUM = "Chicle"
-ICE_MARIO = "Mario de Hielo"
-ICE_LUIGI = "Luigi de Hielo"
 TOAD = "Toad"
+WARIO = "Wario"
+WALUIGI = "Waluigi"
+YOSHI = "Yoshi"
+TOADETTE = "Toadette"
 BUCKEN_BERRY = "Bucken Berry"
 ALA_GOLD = "Ala Gold"
-TOADETTE = "Toadette"
-TOADSWORTH = "Maestro Kinopio"
-YOSHI = "Yoshi"
-WARIO_WOODS = "Peligro del Bosque"
-CLASSIC_1 = "Mario Clásico"
-CLASSIC_2 = "Luigi Clásico"
-CLAUDI = "Claudi"
-JONNY = "Jonny"
-SUNNY = "Sunny"
-NETTY = "Netty"
-TOMMY = "Tommy"
+FIRE_MARIO = "Mario de Fuego"
+FIRE_LUIGI = "Luigi de Fuego"
+ICE_MARIO = "Mario de Hielo"
+ICE_LUIGI = "Luigi de Hielo"
+TOADSWORTH = "Toadsworth"
 PEACH = "Peach"
 DAISY = "Daisy"
-SPIKE = "Spike"
+WARIO_WOODS = "Amenaza del Bosque de Wario"
 GB = "Game Boy"
-N64 = "64 Memorias"
-SNES = "Super Lila"
-SWITCH = "Neón Switch"
-BLACK = "Negro Azabache"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
+CLOVER = "Trébol"
+COBALT = "Cobalto"
+RUBY = "Rubí"
+FURY = "Fury"
+HOT_PINK = "Rosa Fuerte"
+NICE_PINK = "Rosa Bonito"
+SEAFOAM = "Espuma de Mar"
+LILAC = "Lila"
+COPPER = "Cobre"
+AZURE = "Azul Cielo"
+BURGUNDY = "Borgoña"
+MINT = "Menta"
+ORANGE = "Naranja"
+ARCTIC = "Ártico"
+BLACK = "Negro Profundo"
+BUBBLEGUM = "Chicle"
+BUSY_BEE = "Abeja Ocupada"
+FORTRESS = "Fortaleza"
+BLUEBERRY_PIE = "Tarta de Arándanos"
+RASPBERRY = "Frambuesa"
 COFFEE = "Crema de Café"
 MARGIN = "Margen de la Noche"
 PUMPKIN = "Calabaza"
-SOIL = "Tierra Galáctica"
+SOIL = "Suelo Galáctico"
 CREVASE = "Grieta Fría"
-ICE_LUIGI = "Luigi de Hielo"
-CUSTOM = "Personalizada"
+CUSTOM = "Personalizado"
 
 [PLAYER_LIST]
 PLAYERS = "JUGADORES"
diff --git a/lang/SpanishUS.ini b/lang/SpanishUS.ini
index fb1263991..cebfb3f03 100644
--- a/lang/SpanishUS.ini
+++ b/lang/SpanishUS.ini
@@ -315,65 +315,50 @@ EDIT_PALETTE = "Editar Paleta"
 [PALETTE]
 MARIO = "Mario"
 LUIGI = "Luigi"
-WALUIGI = "Waluigi"
-WARIO = "Wario"
-CHUCKYA = "Chuckya"
-GOOMBA = "Goomba"
-CLOVER = "Trébol"
-COBALT = "Cobalto"
-FURY = "Furia"
-HOT_PINK = "Rosa Intenso"
-NICE_PINK = "Rosa Agradable"
-SEAFOAM = "Espuma Marina"
-LILAC = "Lila"
-COPPER = "Cobre"
-AZURE = "Celeste"
-BURGUNDY = "Borgoña"
-MINT = "Menta"
-EGGPLANT = "Berenjena"
-ORANGE = "Naranja"
-ARCTIC = "Ártico"
-FIRE_MARIO = "Mario de Fuego"
-FIRE_LUIGI = "Luigi de Fuego"
-FIRE_WALUIGI = "Waluigi de Fuego"
-FIRE_WARIO = "Wario de Fuego"
-BUSY_BEE = "Abeja Ocupada"
-FORTRESS = "Fortaleza"
-BATTLEMENTS = "Acorazado"
-BLUEBERRY_PIE = "Tarta de Arándanos"
-RASPBERRY = "Frambuesa"
-BUBBLEGUM = "Chicle"
-ICE_MARIO = "Mario de Hielo"
-ICE_LUIGI = "Luigi de Hielo"
 TOAD = "Toad"
+WARIO = "Wario"
+WALUIGI = "Waluigi"
+YOSHI = "Yoshi"
+TOADETTE = "Toadette"
 BUCKEN_BERRY = "Bucken Berry"
 ALA_GOLD = "Ala Gold"
-TOADETTE = "Toadette"
-TOADSWORTH = "Maestro Kinopio"
-YOSHI = "Yoshi"
-WARIO_WOODS = "Peligro del Bosque"
-CLASSIC_1 = "Mario Clásico"
-CLASSIC_2 = "Luigi Clásico"
-CLAUDI = "Claudi"
-JONNY = "Jonny"
-SUNNY = "Sunny"
-NETTY = "Netty"
-TOMMY = "Tommy"
+FIRE_MARIO = "Mario de Fuego"
+FIRE_LUIGI = "Luigi de Fuego"
+ICE_MARIO = "Mario de Hielo"
+ICE_LUIGI = "Luigi de Hielo"
+TOADSWORTH = "Toadsworth"
 PEACH = "Peach"
 DAISY = "Daisy"
-SPIKE = "Spike"
+WARIO_WOODS = "Amenaza del Bosque de Wario"
 GB = "Game Boy"
-N64 = "64 Memorias"
-SNES = "Super Lila"
-SWITCH = "Neón Switch"
-BLACK = "Negro Azabache"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
+CLOVER = "Trébol"
+COBALT = "Cobalto"
+RUBY = "Rubí"
+FURY = "Fury"
+HOT_PINK = "Rosa Fuerte"
+NICE_PINK = "Rosa Bonito"
+SEAFOAM = "Espuma de Mar"
+LILAC = "Lila"
+COPPER = "Cobre"
+AZURE = "Azul Cielo"
+BURGUNDY = "Borgoña"
+MINT = "Menta"
+ORANGE = "Naranja"
+ARCTIC = "Ártico"
+BLACK = "Negro Profundo"
+BUBBLEGUM = "Chicle"
+BUSY_BEE = "Abeja Ocupada"
+FORTRESS = "Fortaleza"
+BLUEBERRY_PIE = "Tarta de Arándanos"
+RASPBERRY = "Frambuesa"
 COFFEE = "Crema de Café"
 MARGIN = "Margen de la Noche"
 PUMPKIN = "Calabaza"
-SOIL = "Tierra Galáctica"
+SOIL = "Suelo Galáctico"
 CREVASE = "Grieta Fría"
-ICE_LUIGI = "Luigi de Hielo"
-CUSTOM = "Personalizada"
+CUSTOM = "Personalizado"
 
 [PLAYER_LIST]
 PLAYERS = "JUGADORES"
diff --git a/mods/arena/arena-player.lua b/mods/arena/arena-player.lua
index 62275af16..0b578f52d 100644
--- a/mods/arena/arena-player.lua
+++ b/mods/arena/arena-player.lua
@@ -446,10 +446,10 @@ function mario_update(m)
     end
 
     -- update palette
-    if s.team == 2 then
-        np.overridePaletteIndex = 7
-    elseif s.team == 1 then
-        np.overridePaletteIndex = 15
+    if s.team == 1 then
+        np.overridePaletteIndex = PALETTE_RUBY
+    elseif s.team == 2 then
+        np.overridePaletteIndex = PALETTE_COBALT
     else
         np.overridePaletteIndex = np.paletteIndex
     end
diff --git a/src/game/characters.c b/src/game/characters.c
index 7dcabbbe9..e99e32090 100644
--- a/src/game/characters.c
+++ b/src/game/characters.c
@@ -1427,30 +1427,26 @@ const struct PlayerPalette gPalettePresets[PALETTE_PRESET_MAX] = {
 {{{ 0x00, 0x00, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x00, 0x00 }}}, // Mario
 {{{ 0x00, 0x00, 0xff }, { 0x00, 0x98, 0x00 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x00, 0x98, 0x00 }}}, // Luigi
 {{{ 0xff, 0xff, 0xff }, { 0x4c, 0x2c, 0xd3 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0x00, 0x00 }}}, // Toad
-{{{ 0xff, 0xff, 0xff }, { 0x00, 0x00, 0xff }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0x00, 0x00, 0xff }}}, // Bucken-Berry
-{{{ 0xff, 0xff, 0xff }, { 0xff, 0xa6, 0x00 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0xa6, 0x00 }}}, // Ala-Gold
-{{{ 0xff, 0xff, 0xff }, { 0xff, 0x46, 0xa1 }, { 0xff, 0x46, 0xa1 }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0xff, 0xff }}}, // Toadette
-{{{ 0x6c, 0x18, 0x99 }, { 0x72, 0x5e, 0xaa }, { 0xe3, 0xcc, 0x7d }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0x52, 0x35, 0x15 }}}, // Toadsworth
 {{{ 0x7f, 0x20, 0x7a }, { 0xe3, 0xa9, 0x01 }, { 0xff, 0xff, 0xff }, { 0x0e, 0x72, 0x1c }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe3, 0xa9, 0x01 }}}, // Wario
 {{{ 0x16, 0x16, 0x27 }, { 0x61, 0x26, 0xb0 }, { 0xff, 0xff, 0xff }, { 0xfe, 0x76, 0x00 }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x61, 0x26, 0xb0 }}}, // Waluigi
 {{{ 0xff, 0x00, 0x00 }, { 0x4a, 0xff, 0x20 }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Yoshi
-{{{ 0xff, 0xff, 0x29 }, { 0xff, 0x8b, 0xcd }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Claudi (Y)
-{{{ 0xbd, 0x00, 0xff }, { 0x00, 0xee, 0xff }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Jonny (Y)
-{{{ 0x29, 0xff, 0x31 }, { 0xff, 0xff, 0x00 }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Sunny (Y)
-{{{ 0x6a, 0x00, 0xff }, { 0xff, 0x29, 0x62 }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Netty (Y)
-{{{ 0xff, 0x00, 0xff }, { 0x39, 0x10, 0xe6 }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Tommy (Y)
+{{{ 0xff, 0xff, 0xff }, { 0xff, 0x46, 0xa1 }, { 0xff, 0x46, 0xa1 }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0xff, 0xff }}}, // Toadette
+{{{ 0xff, 0xff, 0xff }, { 0x00, 0x00, 0xff }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0x00, 0x00, 0xff }}}, // Bucken-Berry
+{{{ 0xff, 0xff, 0xff }, { 0xff, 0xa6, 0x00 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0xa6, 0x00 }}}, // Ala-Gold
+{{{ 0xb2, 0x28, 0x18 }, { 0xe6, 0xe6, 0xe6 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe6, 0xe6, 0xe6 }}}, // Fire Mario
+{{{ 0x00, 0x98, 0x00 }, { 0xe6, 0xe6, 0xe6 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe6, 0xe6, 0xe6 }}}, // Fire Luigi
+{{{ 0xb2, 0x28, 0x18 }, { 0x47, 0xc5, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x47, 0xc5, 0xff }}}, // Ice Mario
+{{{ 0x00, 0x98, 0x00 }, { 0x47, 0xc5, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x47, 0xc5, 0xff }}}, // Ice Luigi
+{{{ 0x6c, 0x18, 0x99 }, { 0x72, 0x5e, 0xaa }, { 0xe3, 0xcc, 0x7d }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0x52, 0x35, 0x15 }}}, // Toadsworth
 {{{ 0xd9, 0xa9, 0xbe }, { 0xff, 0xff, 0xff }, { 0xff, 0xff, 0xff }, { 0xff, 0x1c, 0x5f }, { 0xff, 0xbf, 0x18 }, { 0xfe, 0xc1, 0x79 }, { 0xb6, 0x00, 0x00 }}}, // Peach
 {{{ 0xff, 0xc2, 0x4e }, { 0xff, 0xff, 0xff }, { 0xff, 0xff, 0xff }, { 0xff, 0x1c, 0x5f }, { 0xff, 0x4d, 0x00 }, { 0xf7, 0x95, 0x29 }, { 0xb6, 0x00, 0x00 }}}, // Daisy
-{{{ 0x5b, 0x43, 0x00 }, { 0xff, 0xff, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x5b, 0x43, 0x00 }}}, // Spike
-{{{ 0x3b, 0x8f, 0xf7 }, { 0xd6, 0x35, 0x4d }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x3b, 0x8f, 0xf7 }}}, // Classic 1
-{{{ 0x3a, 0x4a, 0x14 }, { 0x31, 0x1c, 0x19 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x3a, 0x4a, 0x14 }}}, // Classic 2
 {{{ 0xa2, 0x19, 0xcb }, { 0xdc, 0xbe, 0x96 }, { 0xff, 0xff, 0xff }, { 0x15, 0x15, 0x15 }, { 0x73, 0x53, 0x00 }, { 0xfd, 0x96, 0x83 }, { 0xa2, 0x19, 0xcb }}}, // Wario's Woods
 {{{ 0x4f, 0xa2, 0x50 }, { 0x36, 0x77, 0x4b }, { 0x88, 0xc1, 0x76 }, { 0x22, 0x49, 0x3b }, { 0x22, 0x49, 0x3b }, { 0x88, 0xc1, 0x76 }, { 0x4f, 0xa2, 0x50 }}}, // Game Boy
-{{{ 0x32, 0x99, 0x00 }, { 0xc3, 0x14, 0x20 }, { 0xd5, 0x92, 0x12 }, { 0xd5, 0x92, 0x12 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x16, 0x16, 0x98 }}}, // 64 Memories
 {{{ 0x59, 0x2d, 0x76 }, { 0xad, 0xa8, 0xde }, { 0xdf, 0xdf, 0xd0 }, { 0x3d, 0x3d, 0x3f }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xad, 0xa8, 0xde }}}, // Super Lilac
 {{{ 0x28, 0x28, 0x28 }, { 0xdb, 0x3c, 0x2e }, { 0x00, 0x9d, 0xbd }, { 0x00, 0x9d, 0xbd }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x28, 0x28, 0x28 }}}, // Switch Neon
 {{{ 0x07, 0x09, 0x07 }, { 0x4c, 0x5f, 0x20 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x4c, 0x5f, 0x20 }}}, // Clover
-{{{ 0x3f, 0x3f, 0xff }, { 0x00, 0x00, 0x00 }, { 0xff, 0xff, 0xff }, { 0x39, 0x0e, 0x07 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x3f, 0x3f, 0xff }}}, // Cobalt
+{{{ 0x3f, 0x3f, 0xff }, { 0x0a, 0x0a, 0x28 }, { 0xff, 0xff, 0xff }, { 0x39, 0x0e, 0x07 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x3f, 0x3f, 0xff }}}, // Cobalt
+{{{ 0xe1, 0x05, 0x31 }, { 0x28, 0x0a, 0x0a }, { 0xff, 0xff, 0xff }, { 0x39, 0x0e, 0x07 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe1, 0x05, 0x31 }}}, // Ruby
 {{{ 0xf8, 0x3b, 0x05 }, { 0x11, 0x11, 0x11 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x11, 0x11, 0x11 }}}, // Fury
 {{{ 0x34, 0x16, 0x0d }, { 0xc1, 0x2c, 0x72 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xc1, 0x2c, 0x72 }}}, // Hot Pink
 {{{ 0xff, 0x00, 0x00 }, { 0xff, 0x96, 0xc8 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x96, 0xc8 }}}, // Nice Pink
@@ -1460,21 +1456,19 @@ const struct PlayerPalette gPalettePresets[PALETTE_PRESET_MAX] = {
 {{{ 0x4f, 0x31, 0x8b }, { 0x5a, 0x94, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x5a, 0x94, 0xff }}}, // Azure
 {{{ 0x23, 0x11, 0x03 }, { 0x68, 0x0a, 0x17 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x68, 0x0a, 0x17 }}}, // Burgundy
 {{{ 0x53, 0x39, 0x3d }, { 0x95, 0xd0, 0x8f }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x95, 0xd0, 0x8f }}}, // Mint
-{{{ 0xe6, 0xe3, 0xff }, { 0x37, 0x32, 0x42 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x37, 0x32, 0x42 }}}, // Eggplant
 {{{ 0x00, 0x51, 0x10 }, { 0xff, 0x8a, 0x00 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x8a, 0x00 }}}, // Orange
 {{{ 0x4c, 0x1e, 0x3f }, { 0x65, 0xfa, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x65, 0xfa, 0xff }}}, // Arctic
 {{{ 0x1a, 0x1a, 0x1a }, { 0x2c, 0x2c, 0x2c }, { 0x64, 0x64, 0x64 }, { 0x64, 0x64, 0x64 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x1a, 0x1a, 0x1a }}}, // Jet Black
 {{{ 0xd6, 0x35, 0x4d }, { 0xff, 0x8e, 0xb2 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x8e, 0xb2 }}}, // Bubblegum
 {{{ 0x17, 0x18, 0x15 }, { 0xe7, 0xe7, 0x21 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe7, 0xe7, 0x21 }}}, // Busy Bee
 {{{ 0xf7, 0x9a, 0x47 }, { 0xaa, 0x27, 0x31 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xaa, 0x27, 0x31 }}}, // Fortress
-{{{ 0xf7, 0xc2, 0x45 }, { 0x55, 0x92, 0xb2 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x55, 0x92, 0xb2 }}}, // Battlements
 {{{ 0xeb, 0x8a, 0x4b }, { 0x10, 0x1b, 0x2e }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x10, 0x1b, 0x2e }}}, // Blueberry Pie
+{{{ 0xd6, 0x35, 0x4d }, { 0x3b, 0x8f, 0xf7 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x3b, 0x8f, 0xf7 }}}, // Raspberry
 {{{ 0xb0, 0x9d, 0x6b }, { 0x5d, 0x30, 0x15 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xb0, 0x9d, 0x6b }}}, // Coffee Cream
 {{{ 0x6b, 0x18, 0x18 }, { 0x4c, 0x26, 0x90 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x31, 0x1a, 0x1d }}}, // Margin of Night
 {{{ 0x15, 0x15, 0x15 }, { 0xff, 0x6c, 0x00 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x6c, 0x00 }}}, // Pumpkin
 {{{ 0x50, 0x28, 0x18 }, { 0x43, 0xa7, 0x10 }, { 0xff, 0xff, 0xff }, { 0x6b, 0x41, 0x00 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x48, 0x18, 0x18 }}}, // Universal Soil
 {{{ 0xd4, 0xdf, 0xe7 }, { 0x51, 0xa9, 0x9c }, { 0xff, 0xff, 0xff }, { 0x6b, 0x41, 0x00 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xd4, 0xdf, 0xe7 }}}, // Cold Crevase
-{{{ 0x00, 0x98, 0x00 }, { 0x47, 0xc5, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x47, 0xc5, 0xff }}}, // Ice Luigi
 };
 
 enum AnimType {
diff --git a/src/game/characters.h b/src/game/characters.h
index 37967c87b..209c7787d 100644
--- a/src/game/characters.h
+++ b/src/game/characters.h
@@ -6,9 +6,57 @@
 #include "mario_animation_ids.h"
 // NOTE: do not include any additional headers
 
-#define PALETTE_PRESET_MAX 51
+#define PALETTE_PRESET_MAX 45
 
-enum PlayerParts {
+enum PalettePreset {
+    PALETTE_MARIO,
+    PALETTE_LUIGI,
+    PALETTE_TOAD,
+    PALETTE_WARIO,
+    PALETTE_WALUIGI,
+    PALETTE_YOSHI,
+    PALETTE_TOADETTE,
+    PALETTE_BUCKEN_BERRY,
+    PALETTE_ALA_GOLD,
+    PALETTE_FIRE_MARIO,
+    PALETTE_FIRE_LUIGI,
+    PALETTE_ICE_MARIO,
+    PALETTE_ICE_LUIGI,
+    PALETTE_TOADSWORTH,
+    PALETTE_PEACH,
+    PALETTE_DAISY,
+    PALETTE_WARIO_WOODS,
+    PALETTE_GB,
+    PALETTE_SNES,
+    PALETTE_SWITCH,
+    PALETTE_CLOVER,
+    PALETTE_COBALT,
+    PALETTE_RUBY,
+    PALETTE_FURY,
+    PALETTE_HOT_PINK,
+    PALETTE_NICE_PINK,
+    PALETTE_SEAFOAM,
+    PALETTE_LILAC,
+    PALETTE_COPPER,
+    PALETTE_AZURE,
+    PALETTE_BURGUNDY,
+    PALETTE_MINT,
+    PALETTE_ORANGE,
+    PALETTE_ARCTIC,
+    PALETTE_BLACK,
+    PALETTE_BUBBLEGUM,
+    PALETTE_BUSY_BEE,
+    PALETTE_FORTRESS,
+    PALETTE_BLUEBERRY_PIE,
+    PALETTE_RASPBERRY,
+    PALETTE_COFFEE,
+    PALETTE_MARGIN,
+    PALETTE_PUMPKIN,
+    PALETTE_SOIL,
+    PALETTE_CREVASE
+};
+
+enum PlayerPart {
     PANTS, SHIRT, GLOVES, SHOES, HAIR, SKIN, CAP, PLAYER_PART_MAX, METAL = CAP
 };
 
diff --git a/src/pc/djui/djui_panel_player.c b/src/pc/djui/djui_panel_player.c
index d5bd7b0c1..0aa36b69f 100644
--- a/src/pc/djui/djui_panel_player.c
+++ b/src/pc/djui/djui_panel_player.c
@@ -276,30 +276,26 @@ void djui_panel_player_create(struct DjuiBase* caller) {
             DLANG(PALETTE, MARIO),
             DLANG(PALETTE, LUIGI),
             DLANG(PALETTE, TOAD),
-            DLANG(PALETTE, BUCKEN_BERRY),
-            DLANG(PALETTE, ALA_GOLD),
-            DLANG(PALETTE, TOADETTE),
-			DLANG(PALETTE, TOADSWORTH),
-			DLANG(PALETTE, WARIO),
+            DLANG(PALETTE, WARIO),
             aprilFools ? "Lame Shitilizer" : DLANG(PALETTE, WALUIGI),
             DLANG(PALETTE, YOSHI),
-            DLANG(PALETTE, CLAUDI),
-            DLANG(PALETTE, JONNY),
-            DLANG(PALETTE, SUNNY),
-            DLANG(PALETTE, NETTY),
-            DLANG(PALETTE, TOMMY),
+            DLANG(PALETTE, TOADETTE),
+            DLANG(PALETTE, BUCKEN_BERRY),
+            DLANG(PALETTE, ALA_GOLD),
+            DLANG(PALETTE, FIRE_MARIO),
+            DLANG(PALETTE, FIRE_LUIGI),
+            DLANG(PALETTE, ICE_MARIO),
+            aprilFools ? "The Shitilizer" : DLANG(PALETTE, ICE_LUIGI),
+            DLANG(PALETTE, TOADSWORTH),
             DLANG(PALETTE, PEACH),
             DLANG(PALETTE, DAISY),
-            DLANG(PALETTE, SPIKE),
-            DLANG(PALETTE, CLASSIC_1),
-            DLANG(PALETTE, CLASSIC_2),
-			DLANG(PALETTE, WARIO_WOODS),
-			DLANG(PALETTE, GB),
-			DLANG(PALETTE, N64),
-			DLANG(PALETTE, SNES),
-			DLANG(PALETTE, SWITCH),
+            DLANG(PALETTE, WARIO_WOODS),
+            DLANG(PALETTE, GB),
+            DLANG(PALETTE, SNES),
+            DLANG(PALETTE, SWITCH),
             DLANG(PALETTE, CLOVER),
             DLANG(PALETTE, COBALT),
+            DLANG(PALETTE, RUBY),
             DLANG(PALETTE, FURY),
             DLANG(PALETTE, HOT_PINK),
             DLANG(PALETTE, NICE_PINK),
@@ -309,21 +305,19 @@ void djui_panel_player_create(struct DjuiBase* caller) {
             DLANG(PALETTE, AZURE),
             DLANG(PALETTE, BURGUNDY),
             DLANG(PALETTE, MINT),
-            DLANG(PALETTE, EGGPLANT),
             DLANG(PALETTE, ORANGE),
             DLANG(PALETTE, ARCTIC),
-			DLANG(PALETTE, BLACK),
-			DLANG(PALETTE, BUBBLEGUM),
+            DLANG(PALETTE, BLACK),
+            DLANG(PALETTE, BUBBLEGUM),
             DLANG(PALETTE, BUSY_BEE),
             DLANG(PALETTE, FORTRESS),
-            DLANG(PALETTE, BATTLEMENTS),
             DLANG(PALETTE, BLUEBERRY_PIE),
-			DLANG(PALETTE, COFFEE),
-			DLANG(PALETTE, MARGIN),
-			DLANG(PALETTE, PUMPKIN),
-			DLANG(PALETTE, SOIL),
-			DLANG(PALETTE, CREVASE),
-            aprilFools ? "The Shitilizer" : DLANG(PALETTE, ICE_LUIGI),
+            DLANG(PALETTE, RASPBERRY),
+            DLANG(PALETTE, COFFEE),
+            DLANG(PALETTE, MARGIN),
+            DLANG(PALETTE, PUMPKIN),
+            DLANG(PALETTE, SOIL),
+            DLANG(PALETTE, CREVASE),
             DLANG(PALETTE, CUSTOM),
         };
 
diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c
index 6e24563f5..ffe6702ce 100644
--- a/src/pc/lua/smlua_constants_autogen.c
+++ b/src/pc/lua/smlua_constants_autogen.c
@@ -1081,7 +1081,52 @@ char gSmluaConstants[] = ""
 "CAM_EVENT_START_ENDING = 11\n"
 "CAM_EVENT_START_END_WAVING = 12\n"
 "CAM_EVENT_START_CREDITS = 13\n"
-"PALETTE_PRESET_MAX = 33\n"
+"PALETTE_PRESET_MAX = 45\n"
+"PALETTE_MARIO = 0\n"
+"PALETTE_LUIGI = 1\n"
+"PALETTE_TOAD = 2\n"
+"PALETTE_WARIO = 3\n"
+"PALETTE_WALUIGI = 4\n"
+"PALETTE_YOSHI = 5\n"
+"PALETTE_TOADETTE = 6\n"
+"PALETTE_BUCKEN_BERRY = 7\n"
+"PALETTE_ALA_GOLD = 8\n"
+"PALETTE_FIRE_MARIO = 9\n"
+"PALETTE_FIRE_LUIGI = 10\n"
+"PALETTE_ICE_MARIO = 11\n"
+"PALETTE_ICE_LUIGI = 12\n"
+"PALETTE_TOADSWORTH = 13\n"
+"PALETTE_PEACH = 14\n"
+"PALETTE_DAISY = 15\n"
+"PALETTE_WARIO_WOODS = 16\n"
+"PALETTE_GB = 17\n"
+"PALETTE_SNES = 18\n"
+"PALETTE_SWITCH = 19\n"
+"PALETTE_CLOVER = 20\n"
+"PALETTE_COBALT = 21\n"
+"PALETTE_RUBY = 22\n"
+"PALETTE_FURY = 23\n"
+"PALETTE_HOT_PINK = 24\n"
+"PALETTE_NICE_PINK = 25\n"
+"PALETTE_SEAFOAM = 26\n"
+"PALETTE_LILAC = 27\n"
+"PALETTE_COPPER = 28\n"
+"PALETTE_AZURE = 29\n"
+"PALETTE_BURGUNDY = 30\n"
+"PALETTE_MINT = 31\n"
+"PALETTE_ORANGE = 32\n"
+"PALETTE_ARCTIC = 33\n"
+"PALETTE_BLACK = 34\n"
+"PALETTE_BUBBLEGUM = 35\n"
+"PALETTE_BUSY_BEE = 36\n"
+"PALETTE_FORTRESS = 37\n"
+"PALETTE_BLUEBERRY_PIE = 38\n"
+"PALETTE_RASPBERRY = 39\n"
+"PALETTE_COFFEE = 40\n"
+"PALETTE_MARGIN = 41\n"
+"PALETTE_PUMPKIN = 42\n"
+"PALETTE_SOIL = 43\n"
+"PALETTE_CREVASE = 44\n"
 "PANTS = 0\n"
 "SHIRT = 1\n"
 "GLOVES = 2\n"
diff --git a/src/pc/mods/mods.c b/src/pc/mods/mods.c
index 12463afac..ee881d0c0 100644
--- a/src/pc/mods/mods.c
+++ b/src/pc/mods/mods.c
@@ -27,7 +27,7 @@ void mods_get_main_mod_name(char* destination, u32 maxSize) {
 
     for (u16 i = 0; i < gLocalMods.entryCount; i++) {
         struct Mod* mod = gLocalMods.entries[i];
-        if (!mod->enabled) { continue; }
+        if (!mod->enabled || mod_get_is_autoexec(mod)) { continue; }
         size_t size = mod_get_lua_size(mod);
         if (size > pickedSize) {
             picked = mod;
diff --git a/src/pc/network/network_player.c b/src/pc/network/network_player.c
index e2e9d0726..250886bc6 100644
--- a/src/pc/network/network_player.c
+++ b/src/pc/network/network_player.c
@@ -127,7 +127,7 @@ struct NetworkPlayer *get_network_player_smallest_global(void) {
     return smallest;
 }
 
-void network_player_color_to_palette(struct NetworkPlayer *np, enum PlayerParts part, Color color) {
+void network_player_color_to_palette(struct NetworkPlayer *np, enum PlayerPart part, Color color) {
     if (np == NULL || !(part < PLAYER_PART_MAX && part >= 0)) { return; }
 
     np->palette.parts[part][0] = color[0];
@@ -136,7 +136,7 @@ void network_player_color_to_palette(struct NetworkPlayer *np, enum PlayerParts
     np->overridePalette = np->palette;
 }
 
-void network_player_palette_to_color(struct NetworkPlayer *np, enum PlayerParts part, Color out) {
+void network_player_palette_to_color(struct NetworkPlayer *np, enum PlayerPart part, Color out) {
     if (np == NULL || !(part < PLAYER_PART_MAX && part >= 0)) {
         if (np == NULL) { // output config palette instead if np is NULL
             out[0] = configPlayerPalette.parts[part][0];
diff --git a/src/pc/network/network_player.h b/src/pc/network/network_player.h
index ef3b1e754..2669c2c90 100644
--- a/src/pc/network/network_player.h
+++ b/src/pc/network/network_player.h
@@ -78,8 +78,8 @@ struct NetworkPlayer* get_network_player_from_level(s16 courseNum, s16 actNum, s
 struct NetworkPlayer* get_network_player_from_area(s16 courseNum, s16 actNum, s16 levelNum, s16 areaIndex);
 struct NetworkPlayer* get_network_player_smallest_global(void);
 
-void network_player_color_to_palette(struct NetworkPlayer *np, enum PlayerParts part, Color color);
-void network_player_palette_to_color(struct NetworkPlayer *np, enum PlayerParts part, Color out);
+void network_player_color_to_palette(struct NetworkPlayer *np, enum PlayerPart part, Color color);
+void network_player_palette_to_color(struct NetworkPlayer *np, enum PlayerPart part, Color out);
 
 void network_player_update(void);