diff --git a/public/images/categories.png b/public/images/categories.png
index 0f6833994..94ba1d4c4 100644
Binary files a/public/images/categories.png and b/public/images/categories.png differ
diff --git a/public/images/categories_legacy.json b/public/images/categories_legacy.json
deleted file mode 100644
index e840e2d20..000000000
--- a/public/images/categories_legacy.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "categories_legacy.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 84,
-				"h": 11
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "physical",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 28,
-						"h": 11
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 11
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 11
-					}
-				},
-				{
-					"filename": "special",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 28,
-						"h": 11
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 11
-					},
-					"frame": {
-						"x": 28,
-						"y": 0,
-						"w": 28,
-						"h": 11
-					}
-				},
-				{
-					"filename": "status",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 28,
-						"h": 11
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 11
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 28,
-						"h": 11
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:624cc5ad31c0279b246b3f142bfd9c96:8422b1554e15389969070f2f708b78a0:70593749cf27aa2aea2f8132ad50259f$"
-	}
-}
diff --git a/public/images/categories_legacy.png b/public/images/categories_legacy.png
deleted file mode 100644
index 94ba1d4c4..000000000
Binary files a/public/images/categories_legacy.png and /dev/null differ
diff --git a/public/images/pb.json b/public/images/pb.json
index fe11336cf..d55dd5efa 100644
--- a/public/images/pb.json
+++ b/public/images/pb.json
@@ -393,6 +393,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2715eb0a025a0813db1a38a913af8e68:4c4ffcc420a57c7dbc4ff35c5fbc8716:8bcd206ed4f9371dcc2f2cbe354ed6ed$"
+		"smartupdate": "$TexturePacker:SmartUpdate:0efebcf5a0349e3198f05490d6ab3701:bd953ec0b847e86511a613c51d748a6b:8bcd206ed4f9371dcc2f2cbe354ed6ed$"
 	}
 }
diff --git a/public/images/pb.png b/public/images/pb.png
index acb3a96f0..af62128f0 100644
Binary files a/public/images/pb.png and b/public/images/pb.png differ
diff --git a/public/images/pokeball/gb.png b/public/images/pokeball/gb.png
index 94f278c8e..8cebe59cb 100644
Binary files a/public/images/pokeball/gb.png and b/public/images/pokeball/gb.png differ
diff --git a/public/images/pokeball/gb_open.png b/public/images/pokeball/gb_open.png
index 26d8956fd..06409c56c 100644
Binary files a/public/images/pokeball/gb_open.png and b/public/images/pokeball/gb_open.png differ
diff --git a/public/images/pokeball/gb_opening.png b/public/images/pokeball/gb_opening.png
index 9947f7ceb..2a44eb6d7 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/mb.png b/public/images/pokeball/mb.png
index de374e0fd..562e7b138 100644
Binary files a/public/images/pokeball/mb.png and b/public/images/pokeball/mb.png differ
diff --git a/public/images/pokeball/mb_open.png b/public/images/pokeball/mb_open.png
index f4e0145dc..fc3926fe9 100644
Binary files a/public/images/pokeball/mb_open.png and b/public/images/pokeball/mb_open.png differ
diff --git a/public/images/pokeball/mb_opening.png b/public/images/pokeball/mb_opening.png
index 9c483fbbb..a25b38aaa 100644
Binary files a/public/images/pokeball/mb_opening.png and b/public/images/pokeball/mb_opening.png differ
diff --git a/public/images/pokeball/pb.png b/public/images/pokeball/pb.png
index 684ed6b0a..fb6d5426e 100644
Binary files a/public/images/pokeball/pb.png and b/public/images/pokeball/pb.png differ
diff --git a/public/images/pokeball/pb_open.png b/public/images/pokeball/pb_open.png
index 62db56cdd..ba166d1fc 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 4f13a9b46..60f352770 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.png b/public/images/pokeball/rb.png
index e2e1f1b07..3d83ce0ec 100644
Binary files a/public/images/pokeball/rb.png and b/public/images/pokeball/rb.png differ
diff --git a/public/images/pokeball/rb_open.png b/public/images/pokeball/rb_open.png
index 94d480b58..ff72ae05f 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/rb_opening.png b/public/images/pokeball/rb_opening.png
index 76aae3c17..18f5ca4e9 100644
Binary files a/public/images/pokeball/rb_opening.png and b/public/images/pokeball/rb_opening.png differ
diff --git a/public/images/pokeball/ub.png b/public/images/pokeball/ub.png
index 306cb1684..45445a286 100644
Binary files a/public/images/pokeball/ub.png and b/public/images/pokeball/ub.png differ
diff --git a/public/images/pokeball/ub_open.png b/public/images/pokeball/ub_open.png
index 2ccf2ae36..40fdd0941 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 6c8e77112..eb92b5b77 100644
Binary files a/public/images/pokeball/ub_opening.png and b/public/images/pokeball/ub_opening.png differ
diff --git a/public/images/types_legacy.json b/public/images/types_legacy.json
deleted file mode 100644
index d253d54d7..000000000
--- a/public/images/types_legacy.json
+++ /dev/null
@@ -1,440 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "types_legacy.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 32,
-				"h": 280
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "unknown",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "bug",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 14,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "dark",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 28,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "dragon",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "electric",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 56,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "fairy",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "fighting",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "fire",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "flying",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 112,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "ghost",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 126,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "grass",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 140,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "ground",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 154,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "ice",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 168,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "normal",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 182,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "poison",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 196,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "psychic",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 210,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "rock",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 224,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "steel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 238,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "water",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 252,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "stellar",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 266,
-						"w": 32,
-						"h": 14
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a32f$"
-	}
-}
diff --git a/public/images/types_legacy.png b/public/images/types_legacy.png
deleted file mode 100644
index 619a370a7..000000000
Binary files a/public/images/types_legacy.png and /dev/null differ
diff --git a/public/images/ui/ability_bar.png b/public/images/ui/ability_bar.png
index 7b6147827..428aa3676 100644
Binary files a/public/images/ui/ability_bar.png and b/public/images/ui/ability_bar.png differ
diff --git a/public/images/ui/ability_bar_left.png b/public/images/ui/ability_bar_left.png
deleted file mode 100644
index 2f0c44da5..000000000
Binary files a/public/images/ui/ability_bar_left.png and /dev/null differ
diff --git a/public/images/ui/ability_bar_right.png b/public/images/ui/ability_bar_right.png
deleted file mode 100644
index c8f5024bc..000000000
Binary files a/public/images/ui/ability_bar_right.png and /dev/null differ
diff --git a/public/images/ui/achv_bar.png b/public/images/ui/achv_bar.png
index c2ab2c5c6..442b43343 100644
Binary files a/public/images/ui/achv_bar.png and b/public/images/ui/achv_bar.png differ
diff --git a/public/images/ui/achv_bar_2.png b/public/images/ui/achv_bar_2.png
index 8505760d6..23ffca0a7 100644
Binary files a/public/images/ui/achv_bar_2.png and b/public/images/ui/achv_bar_2.png differ
diff --git a/public/images/ui/achv_bar_3.png b/public/images/ui/achv_bar_3.png
index 723e533f7..e2697234e 100644
Binary files a/public/images/ui/achv_bar_3.png and b/public/images/ui/achv_bar_3.png differ
diff --git a/public/images/ui/achv_bar_4.png b/public/images/ui/achv_bar_4.png
index cc06af916..dae7a30de 100644
Binary files a/public/images/ui/achv_bar_4.png and b/public/images/ui/achv_bar_4.png differ
diff --git a/public/images/ui/bg.png b/public/images/ui/bg.png
index c1ce06afd..a02aa8dc6 100644
Binary files a/public/images/ui/bg.png and b/public/images/ui/bg.png differ
diff --git a/public/images/ui/bmenu_sel.png b/public/images/ui/bmenu_sel.png
index c2e28ba20..fe54fa918 100644
Binary files a/public/images/ui/bmenu_sel.png and b/public/images/ui/bmenu_sel.png differ
diff --git a/public/images/ui/boolean_sel.png b/public/images/ui/boolean_sel.png
index d5b212a30..bd832fa12 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/command_fight_labels.png b/public/images/ui/command_fight_labels.png
index c9d6d60c4..257d0e5d9 100644
Binary files a/public/images/ui/command_fight_labels.png and b/public/images/ui/command_fight_labels.png differ
diff --git a/public/images/ui/cursor.png b/public/images/ui/cursor.png
index 68283fcc2..39d7b7977 100644
Binary files a/public/images/ui/cursor.png and b/public/images/ui/cursor.png differ
diff --git a/public/images/ui/cursor_reverse.png b/public/images/ui/cursor_reverse.png
index 40c867e62..57fb29774 100644
Binary files a/public/images/ui/cursor_reverse.png and b/public/images/ui/cursor_reverse.png differ
diff --git a/public/images/ui/egg_list_bg.png b/public/images/ui/egg_list_bg.png
index 4ec094418..5600a3e6a 100644
Binary files a/public/images/ui/egg_list_bg.png and b/public/images/ui/egg_list_bg.png differ
diff --git a/public/images/ui/icon_owned.png b/public/images/ui/icon_owned.png
index 37e2dfd08..21e03afec 100644
Binary files a/public/images/ui/icon_owned.png and b/public/images/ui/icon_owned.png differ
diff --git a/public/images/ui/legacy/ability_bar.png b/public/images/ui/legacy/ability_bar.png
deleted file mode 100644
index 428aa3676..000000000
Binary files a/public/images/ui/legacy/ability_bar.png and /dev/null differ
diff --git a/public/images/ui/legacy/achv_bar.png b/public/images/ui/legacy/achv_bar.png
deleted file mode 100644
index 442b43343..000000000
Binary files a/public/images/ui/legacy/achv_bar.png and /dev/null differ
diff --git a/public/images/ui/legacy/achv_bar_2.png b/public/images/ui/legacy/achv_bar_2.png
deleted file mode 100644
index 23ffca0a7..000000000
Binary files a/public/images/ui/legacy/achv_bar_2.png and /dev/null differ
diff --git a/public/images/ui/legacy/achv_bar_3.png b/public/images/ui/legacy/achv_bar_3.png
deleted file mode 100644
index e2697234e..000000000
Binary files a/public/images/ui/legacy/achv_bar_3.png and /dev/null differ
diff --git a/public/images/ui/legacy/achv_bar_4.png b/public/images/ui/legacy/achv_bar_4.png
deleted file mode 100644
index dae7a30de..000000000
Binary files a/public/images/ui/legacy/achv_bar_4.png and /dev/null differ
diff --git a/public/images/ui/legacy/bg.png b/public/images/ui/legacy/bg.png
deleted file mode 100644
index a02aa8dc6..000000000
Binary files a/public/images/ui/legacy/bg.png and /dev/null differ
diff --git a/public/images/ui/legacy/bmenu_sel.png b/public/images/ui/legacy/bmenu_sel.png
deleted file mode 100644
index fe54fa918..000000000
Binary files a/public/images/ui/legacy/bmenu_sel.png and /dev/null differ
diff --git a/public/images/ui/legacy/boolean_sel.png b/public/images/ui/legacy/boolean_sel.png
deleted file mode 100644
index bd832fa12..000000000
Binary files a/public/images/ui/legacy/boolean_sel.png and /dev/null differ
diff --git a/public/images/ui/legacy/command_fight_labels.png b/public/images/ui/legacy/command_fight_labels.png
deleted file mode 100644
index 257d0e5d9..000000000
Binary files a/public/images/ui/legacy/command_fight_labels.png and /dev/null differ
diff --git a/public/images/ui/legacy/cursor.png b/public/images/ui/legacy/cursor.png
deleted file mode 100644
index 39d7b7977..000000000
Binary files a/public/images/ui/legacy/cursor.png and /dev/null differ
diff --git a/public/images/ui/legacy/cursor_reverse.png b/public/images/ui/legacy/cursor_reverse.png
deleted file mode 100644
index 57fb29774..000000000
Binary files a/public/images/ui/legacy/cursor_reverse.png and /dev/null differ
diff --git a/public/images/ui/legacy/egg_list_bg.png b/public/images/ui/legacy/egg_list_bg.png
deleted file mode 100644
index 932d01d33..000000000
Binary files a/public/images/ui/legacy/egg_list_bg.png and /dev/null differ
diff --git a/public/images/ui/legacy/icon_owned.png b/public/images/ui/legacy/icon_owned.png
deleted file mode 100644
index 21e03afec..000000000
Binary files a/public/images/ui/legacy/icon_owned.png and /dev/null differ
diff --git a/public/images/ui/legacy/icon_spliced.png b/public/images/ui/legacy/icon_spliced.png
deleted file mode 100644
index 1db0d1136..000000000
Binary files a/public/images/ui/legacy/icon_spliced.png and /dev/null differ
diff --git a/public/images/ui/legacy/icon_tera.png b/public/images/ui/legacy/icon_tera.png
deleted file mode 100644
index d178ca8fc..000000000
Binary files a/public/images/ui/legacy/icon_tera.png and /dev/null differ
diff --git a/public/images/ui/legacy/mmenu_sel.png b/public/images/ui/legacy/mmenu_sel.png
deleted file mode 100644
index 26952f7ec..000000000
Binary files a/public/images/ui/legacy/mmenu_sel.png and /dev/null differ
diff --git a/public/images/ui/legacy/namebox.png b/public/images/ui/legacy/namebox.png
deleted file mode 100644
index ed43bc4aa..000000000
Binary files a/public/images/ui/legacy/namebox.png and /dev/null differ
diff --git a/public/images/ui/legacy/numbers.json b/public/images/ui/legacy/numbers.json
deleted file mode 100644
index 33a3e60f6..000000000
--- a/public/images/ui/legacy/numbers.json
+++ /dev/null
@@ -1,251 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "numbers.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 88,
-				"h": 7
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "1",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 8,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 16,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 24,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "4",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "5",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 40,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "6",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "7",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "8",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "9",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 72,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "/",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3ed4555c7a85f0413e7039bcf9d9e18f:d744841445f249d21eff1bc3a2b50d78:1070938cc284949ced1e46ffd0a9abd0$"
-	}
-}
diff --git a/public/images/ui/legacy/numbers.png b/public/images/ui/legacy/numbers.png
deleted file mode 100644
index ba48453fa..000000000
Binary files a/public/images/ui/legacy/numbers.png and /dev/null differ
diff --git a/public/images/ui/legacy/numbers_alt.png b/public/images/ui/legacy/numbers_alt.png
deleted file mode 100644
index 1512ef435..000000000
Binary files a/public/images/ui/legacy/numbers_alt.png and /dev/null differ
diff --git a/public/images/ui/legacy/numbers_red.json b/public/images/ui/legacy/numbers_red.json
deleted file mode 100644
index 5248ac89d..000000000
--- a/public/images/ui/legacy/numbers_red.json
+++ /dev/null
@@ -1,251 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "numbers_red.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 88,
-				"h": 7
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "1",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 8,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 16,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 24,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "4",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "5",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 40,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "6",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "7",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "8",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "9",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 72,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				},
-				{
-					"filename": "/",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 8,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 8,
-						"h": 7
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3ed4555c7a85f0413e7039bcf9d9e18f:d744841445f249d21eff1bc3a2b50d78:1070938cc284949ced1e46ffd0a9abd0$"
-	}
-}
diff --git a/public/images/ui/legacy/numbers_red.png b/public/images/ui/legacy/numbers_red.png
deleted file mode 100644
index acafb20c9..000000000
Binary files a/public/images/ui/legacy/numbers_red.png and /dev/null differ
diff --git a/public/images/ui/legacy/numbers_red_alt.png b/public/images/ui/legacy/numbers_red_alt.png
deleted file mode 100644
index 90b6f1092..000000000
Binary files a/public/images/ui/legacy/numbers_red_alt.png and /dev/null differ
diff --git a/public/images/ui/legacy/overlay_exp.png b/public/images/ui/legacy/overlay_exp.png
deleted file mode 100644
index 51166cd9e..000000000
Binary files a/public/images/ui/legacy/overlay_exp.png and /dev/null differ
diff --git a/public/images/ui/legacy/overlay_hp.json b/public/images/ui/legacy/overlay_hp.json
deleted file mode 100644
index 4e3a69431..000000000
--- a/public/images/ui/legacy/overlay_hp.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "overlay_hp.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 48,
-				"h": 6
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "high",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 2
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 2
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 2
-					}
-				},
-				{
-					"filename": "medium",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 2
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 2
-					},
-					"frame": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 2
-					}
-				},
-				{
-					"filename": "low",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 2
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 2
-					},
-					"frame": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 2
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:38e540ccb5c63da1ebec1acbf71f691e:0086e8a13120324b29c37336ee1e53d1:9863437373166ab9545f5c99d88f5cd6$"
-	}
-}
diff --git a/public/images/ui/legacy/overlay_hp.png b/public/images/ui/legacy/overlay_hp.png
deleted file mode 100644
index 9855c6106..000000000
Binary files a/public/images/ui/legacy/overlay_hp.png and /dev/null differ
diff --git a/public/images/ui/legacy/overlay_hp_boss.json b/public/images/ui/legacy/overlay_hp_boss.json
deleted file mode 100644
index 06313756e..000000000
--- a/public/images/ui/legacy/overlay_hp_boss.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "overlay_hp_boss.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 96,
-				"h": 12
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "high",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 4
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 4
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 4
-					}
-				},
-				{
-					"filename": "medium",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 4
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 98,
-						"h": 4
-					},
-					"frame": {
-						"x": 0,
-						"y": 4,
-						"w": 86,
-						"h": 4
-					}
-				},
-				{
-					"filename": "low",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 4
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 4
-					},
-					"frame": {
-						"x": 0,
-						"y": 8,
-						"w": 86,
-						"h": 4
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0ab3d30defc8fe4d0802d006063b09c5:9cc1fb380aa2908ff6c9e92f310fde62:e6c4614fcfcf040f918551c90d4448f7$"
-	}
-}
diff --git a/public/images/ui/legacy/overlay_hp_boss.png b/public/images/ui/legacy/overlay_hp_boss.png
deleted file mode 100644
index d7dc3b74e..000000000
Binary files a/public/images/ui/legacy/overlay_hp_boss.png and /dev/null differ
diff --git a/public/images/ui/legacy/overlay_lv.png b/public/images/ui/legacy/overlay_lv.png
deleted file mode 100644
index d79614f41..000000000
Binary files a/public/images/ui/legacy/overlay_lv.png and /dev/null differ
diff --git a/public/images/ui/legacy/overlay_lv_alt.png b/public/images/ui/legacy/overlay_lv_alt.png
deleted file mode 100644
index 75b90a2ee..000000000
Binary files a/public/images/ui/legacy/overlay_lv_alt.png and /dev/null differ
diff --git a/public/images/ui/legacy/overlay_message.png b/public/images/ui/legacy/overlay_message.png
deleted file mode 100644
index 9e58d86fc..000000000
Binary files a/public/images/ui/legacy/overlay_message.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_bg.png b/public/images/ui/legacy/party_bg.png
deleted file mode 100644
index 323de1856..000000000
Binary files a/public/images/ui/legacy/party_bg.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_bg_double.png b/public/images/ui/legacy/party_bg_double.png
deleted file mode 100644
index 89beff1ed..000000000
Binary files a/public/images/ui/legacy/party_bg_double.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_cancel.json b/public/images/ui/legacy/party_cancel.json
deleted file mode 100644
index c0fa3bc28..000000000
--- a/public/images/ui/legacy/party_cancel.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "party_cancel.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 52,
-				"h": 32
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "party_cancel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 52,
-						"h": 16
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 52,
-						"h": 16
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 52,
-						"h": 16
-					}
-				},
-				{
-					"filename": "party_cancel_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 52,
-						"h": 16
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 52,
-						"h": 16
-					},
-					"frame": {
-						"x": 0,
-						"y": 16,
-						"w": 52,
-						"h": 16
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:90d007d5b18ff4693e19427683160d05:05f58f289d3501584131227313418600:829bbc2aca10a215777ee107bbadd91f$"
-	}
-}
diff --git a/public/images/ui/legacy/party_cancel.png b/public/images/ui/legacy/party_cancel.png
deleted file mode 100644
index 4219c8d33..000000000
Binary files a/public/images/ui/legacy/party_cancel.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_exp_bar.png b/public/images/ui/legacy/party_exp_bar.png
deleted file mode 100644
index 0a514b433..000000000
Binary files a/public/images/ui/legacy/party_exp_bar.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_pb.json b/public/images/ui/legacy/party_pb.json
deleted file mode 100644
index f7fa66da6..000000000
--- a/public/images/ui/legacy/party_pb.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "party_pb.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 20,
-				"h": 46
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "party_pb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 20,
-						"h": 24
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 20,
-						"h": 22
-					},
-					"frame": {
-						"x": 0,
-						"y": 24,
-						"w": 20,
-						"h": 22
-					}
-				},
-				{
-					"filename": "party_pb_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 20,
-						"h": 24
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 20,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 20,
-						"h": 24
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:13f7a00fc4a7a4cc80f3bb82316282f4:922760ce93e3ee2e335fda565facb79d:0a5761cf37c97cf64558a62d03bdb2ee$"
-	}
-}
diff --git a/public/images/ui/legacy/party_pb.png b/public/images/ui/legacy/party_pb.png
deleted file mode 100644
index a1e5f7a9b..000000000
Binary files a/public/images/ui/legacy/party_pb.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_slot.json b/public/images/ui/legacy/party_slot.json
deleted file mode 100644
index 945c5417b..000000000
--- a/public/images/ui/legacy/party_slot.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "party_slot.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 175,
-				"h": 144
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "party_slot",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 175,
-						"h": 24
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 175,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 175,
-						"h": 24
-					}
-				},
-				{
-					"filename": "party_slot_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 175,
-						"h": 24
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 175,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 24,
-						"w": 175,
-						"h": 24
-					}
-				},
-				{
-					"filename": "party_slot_fnt",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 175,
-						"h": 24
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 175,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 175,
-						"h": 24
-					}
-				},
-				{
-					"filename": "party_slot_fnt_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 175,
-						"h": 24
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 175,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 175,
-						"h": 24
-					}
-				},
-				{
-					"filename": "party_slot_swap",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 175,
-						"h": 24
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 175,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 175,
-						"h": 24
-					}
-				},
-				{
-					"filename": "party_slot_swap_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 175,
-						"h": 24
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 175,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 175,
-						"h": 24
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6b23605c0cb21d089e57415879563480:28fac7aadded5eab7cc934bd10910fbf:cca75f59f4a503072d7a2eb166e3fd7f$"
-	}
-}
diff --git a/public/images/ui/legacy/party_slot.png b/public/images/ui/legacy/party_slot.png
deleted file mode 100644
index c7a2eb5c0..000000000
Binary files a/public/images/ui/legacy/party_slot.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_slot_hp_bar.png b/public/images/ui/legacy/party_slot_hp_bar.png
deleted file mode 100644
index 13ac7436c..000000000
Binary files a/public/images/ui/legacy/party_slot_hp_bar.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_slot_hp_overlay.json b/public/images/ui/legacy/party_slot_hp_overlay.json
deleted file mode 100644
index 962a10875..000000000
--- a/public/images/ui/legacy/party_slot_hp_overlay.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "party_slot_hp_overlay.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 80,
-				"h": 9
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "high",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 3
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 3
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 3
-					}
-				},
-				{
-					"filename": "medium",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 3
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 3
-					},
-					"frame": {
-						"x": 0,
-						"y": 3,
-						"w": 80,
-						"h": 3
-					}
-				},
-				{
-					"filename": "low",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 3
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 3
-					},
-					"frame": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 3
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4d49eee01b28038007a76c418b5e9bb4:ed12035f6f008a87da5417ecec87a8f7:78b3a2fb9c1745e0d121b78bd5e0ea6a$"
-	}
-}
diff --git a/public/images/ui/legacy/party_slot_hp_overlay.png b/public/images/ui/legacy/party_slot_hp_overlay.png
deleted file mode 100644
index 360a3cd17..000000000
Binary files a/public/images/ui/legacy/party_slot_hp_overlay.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_slot_main.json b/public/images/ui/legacy/party_slot_main.json
deleted file mode 100644
index fd1adfb68..000000000
--- a/public/images/ui/legacy/party_slot_main.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "party_slot_main.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 110,
-				"h": 294
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "party_slot_main",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 49
-					}
-				},
-				{
-					"filename": "party_slot_main_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 110,
-						"h": 49
-					}
-				},
-				{
-					"filename": "party_slot_main_fnt",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 110,
-						"h": 49
-					}
-				},
-				{
-					"filename": "party_slot_main_fnt_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 147,
-						"w": 110,
-						"h": 49
-					}
-				},
-				{
-					"filename": "party_slot_main_swap",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 196,
-						"w": 110,
-						"h": 49
-					}
-				},
-				{
-					"filename": "party_slot_main_swap_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 245,
-						"w": 110,
-						"h": 49
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:29685f2f538901cf5bf7f0ed2ea867c3:a080ea6c8cccd1e03244214053e79796:565f7afc5ca419b6ba8dbce51ea30818$"
-	}
-}
diff --git a/public/images/ui/legacy/party_slot_main.png b/public/images/ui/legacy/party_slot_main.png
deleted file mode 100644
index 06eb9b03a..000000000
Binary files a/public/images/ui/legacy/party_slot_main.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_slot_overlay_hp.png b/public/images/ui/legacy/party_slot_overlay_hp.png
deleted file mode 100644
index 8c15c63f3..000000000
Binary files a/public/images/ui/legacy/party_slot_overlay_hp.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_slot_overlay_lv.png b/public/images/ui/legacy/party_slot_overlay_lv.png
deleted file mode 100644
index 57d901a7d..000000000
Binary files a/public/images/ui/legacy/party_slot_overlay_lv.png and /dev/null 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
deleted file mode 100644
index a52b9c2fa..000000000
Binary files a/public/images/ui/legacy/party_slot_overlay_lv_alt.png and /dev/null differ
diff --git a/public/images/ui/legacy/pb_tray_ball.json b/public/images/ui/legacy/pb_tray_ball.json
deleted file mode 100644
index 0fee95aef..000000000
--- a/public/images/ui/legacy/pb_tray_ball.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "pb_tray_ball.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 28,
-				"h": 7
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "ball",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 7,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 7,
-						"h": 7
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 7,
-						"h": 7
-					}
-				},
-				{
-					"filename": "empty",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 7,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 7,
-						"h": 7
-					},
-					"frame": {
-						"x": 7,
-						"y": 0,
-						"w": 7,
-						"h": 7
-					}
-				},
-				{
-					"filename": "faint",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 7,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 7,
-						"h": 7
-					},
-					"frame": {
-						"x": 14,
-						"y": 0,
-						"w": 7,
-						"h": 7
-					}
-				},
-				{
-					"filename": "status",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 7,
-						"h": 7
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 7,
-						"h": 7
-					},
-					"frame": {
-						"x": 21,
-						"y": 0,
-						"w": 7,
-						"h": 7
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f7a37dfea18d90e97d6fe0b1f2e1f69c:6823410fc296184fa84e87f6ca79158a:097b8eb81a77f8ed73a75d6d94f48dac$"
-	}
-}
diff --git a/public/images/ui/legacy/pb_tray_ball.png b/public/images/ui/legacy/pb_tray_ball.png
deleted file mode 100644
index 112184f85..000000000
Binary files a/public/images/ui/legacy/pb_tray_ball.png and /dev/null differ
diff --git a/public/images/ui/legacy/pb_tray_overlay_enemy.png b/public/images/ui/legacy/pb_tray_overlay_enemy.png
deleted file mode 100644
index c557ac736..000000000
Binary files a/public/images/ui/legacy/pb_tray_overlay_enemy.png and /dev/null differ
diff --git a/public/images/ui/legacy/pb_tray_overlay_player.png b/public/images/ui/legacy/pb_tray_overlay_player.png
deleted file mode 100644
index 4a065de5d..000000000
Binary files a/public/images/ui/legacy/pb_tray_overlay_player.png and /dev/null differ
diff --git a/public/images/ui/legacy/pbinfo_enemy_boss.png b/public/images/ui/legacy/pbinfo_enemy_boss.png
deleted file mode 100644
index cffefd323..000000000
Binary files a/public/images/ui/legacy/pbinfo_enemy_boss.png and /dev/null differ
diff --git a/public/images/ui/legacy/pbinfo_enemy_mini.png b/public/images/ui/legacy/pbinfo_enemy_mini.png
deleted file mode 100644
index 908ea1060..000000000
Binary files a/public/images/ui/legacy/pbinfo_enemy_mini.png and /dev/null differ
diff --git a/public/images/ui/legacy/pbinfo_player.png b/public/images/ui/legacy/pbinfo_player.png
deleted file mode 100644
index 825a9eafe..000000000
Binary files a/public/images/ui/legacy/pbinfo_player.png and /dev/null differ
diff --git a/public/images/ui/legacy/pbinfo_player_mini.png b/public/images/ui/legacy/pbinfo_player_mini.png
deleted file mode 100644
index 1ccaf4efd..000000000
Binary files a/public/images/ui/legacy/pbinfo_player_mini.png and /dev/null differ
diff --git a/public/images/ui/legacy/prompt.json b/public/images/ui/legacy/prompt.json
deleted file mode 100644
index 753dc8277..000000000
--- a/public/images/ui/legacy/prompt.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "prompt.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 7,
-				"h": 25
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "1",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 7,
-						"h": 9
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 7,
-						"h": 8
-					},
-					"frame": {
-						"x": 0,
-						"y": 9,
-						"w": 7,
-						"h": 8
-					}
-				},
-				{
-					"filename": "2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 7,
-						"h": 9
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 7,
-						"h": 9
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 7,
-						"h": 9
-					}
-				},
-				{
-					"filename": "3",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 7,
-						"h": 9
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 7,
-						"h": 8
-					},
-					"frame": {
-						"x": 0,
-						"y": 17,
-						"w": 7,
-						"h": 8
-					}
-				},
-				{
-					"filename": "4",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 7,
-						"h": 9
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 7,
-						"h": 9
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 7,
-						"h": 9
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5bcc63184b61d0dc629911d570bd41df:218cc0a560337ff14e1a820297e99878:2fb4d6746b04cafb843a7980571a009f$"
-	}
-}
diff --git a/public/images/ui/legacy/prompt.png b/public/images/ui/legacy/prompt.png
deleted file mode 100644
index ee74128ce..000000000
Binary files a/public/images/ui/legacy/prompt.png and /dev/null differ
diff --git a/public/images/ui/legacy/select_cursor.png b/public/images/ui/legacy/select_cursor.png
deleted file mode 100644
index f55e33fdb..000000000
Binary files a/public/images/ui/legacy/select_cursor.png and /dev/null differ
diff --git a/public/images/ui/legacy/select_cursor_highlight.png b/public/images/ui/legacy/select_cursor_highlight.png
deleted file mode 100644
index 6819454bf..000000000
Binary files a/public/images/ui/legacy/select_cursor_highlight.png and /dev/null differ
diff --git a/public/images/ui/legacy/select_cursor_highlight_thick.png b/public/images/ui/legacy/select_cursor_highlight_thick.png
deleted file mode 100644
index d9a153286..000000000
Binary files a/public/images/ui/legacy/select_cursor_highlight_thick.png and /dev/null differ
diff --git a/public/images/ui/legacy/select_cursor_pokerus.png b/public/images/ui/legacy/select_cursor_pokerus.png
deleted file mode 100644
index 123b0a0f1..000000000
Binary files a/public/images/ui/legacy/select_cursor_pokerus.png and /dev/null differ
diff --git a/public/images/ui/legacy/select_gen_cursor.png b/public/images/ui/legacy/select_gen_cursor.png
deleted file mode 100644
index e602d1531..000000000
Binary files a/public/images/ui/legacy/select_gen_cursor.png and /dev/null differ
diff --git a/public/images/ui/legacy/select_gen_cursor_highlight.png b/public/images/ui/legacy/select_gen_cursor_highlight.png
deleted file mode 100644
index ce2f2265f..000000000
Binary files a/public/images/ui/legacy/select_gen_cursor_highlight.png and /dev/null differ
diff --git a/public/images/ui/legacy/shiny.png b/public/images/ui/legacy/shiny.png
deleted file mode 100644
index 04dad2a27..000000000
Binary files a/public/images/ui/legacy/shiny.png and /dev/null differ
diff --git a/public/images/ui/legacy/starter_select_bg.png b/public/images/ui/legacy/starter_select_bg.png
deleted file mode 100644
index a94e470df..000000000
Binary files a/public/images/ui/legacy/starter_select_bg.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_bg.png b/public/images/ui/legacy/summary_bg.png
deleted file mode 100644
index e4da2dd5d..000000000
Binary files a/public/images/ui/legacy/summary_bg.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_moves.png b/public/images/ui/legacy/summary_moves.png
deleted file mode 100644
index 54ddf0fb2..000000000
Binary files a/public/images/ui/legacy/summary_moves.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_moves_cursor.json b/public/images/ui/legacy/summary_moves_cursor.json
deleted file mode 100644
index 0a313153c..000000000
--- a/public/images/ui/legacy/summary_moves_cursor.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "summary_moves_cursor.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 208,
-				"h": 32
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "highlight",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 208,
-						"h": 16
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 208,
-						"h": 16
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 208,
-						"h": 16
-					}
-				},
-				{
-					"filename": "select",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 208,
-						"h": 16
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 208,
-						"h": 16
-					},
-					"frame": {
-						"x": 0,
-						"y": 16,
-						"w": 208,
-						"h": 16
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d89e84be7d49aa7957445f38e744aabe:651a727fe05cc993624865e5b14fb859:3f559bc98797893ed427d02379120df2$"
-	}
-}
diff --git a/public/images/ui/legacy/summary_moves_cursor.png b/public/images/ui/legacy/summary_moves_cursor.png
deleted file mode 100644
index 6b8314b66..000000000
Binary files a/public/images/ui/legacy/summary_moves_cursor.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_moves_effect.png b/public/images/ui/legacy/summary_moves_effect.png
deleted file mode 100644
index ed422d1b4..000000000
Binary files a/public/images/ui/legacy/summary_moves_effect.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_moves_overlay_pp.png b/public/images/ui/legacy/summary_moves_overlay_pp.png
deleted file mode 100644
index a42c86f28..000000000
Binary files a/public/images/ui/legacy/summary_moves_overlay_pp.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_moves_overlay_row.png b/public/images/ui/legacy/summary_moves_overlay_row.png
deleted file mode 100644
index 5b3e3d3e9..000000000
Binary files a/public/images/ui/legacy/summary_moves_overlay_row.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_overlay_shiny.png b/public/images/ui/legacy/summary_overlay_shiny.png
deleted file mode 100644
index e4ab82073..000000000
Binary files a/public/images/ui/legacy/summary_overlay_shiny.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_profile.png b/public/images/ui/legacy/summary_profile.png
deleted file mode 100644
index 25fc3ca70..000000000
Binary files a/public/images/ui/legacy/summary_profile.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_stats.png b/public/images/ui/legacy/summary_stats.png
deleted file mode 100644
index e744f84be..000000000
Binary files a/public/images/ui/legacy/summary_stats.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_stats_overlay_exp.png b/public/images/ui/legacy/summary_stats_overlay_exp.png
deleted file mode 100644
index dedc228f8..000000000
Binary files a/public/images/ui/legacy/summary_stats_overlay_exp.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_status.png b/public/images/ui/legacy/summary_status.png
deleted file mode 100644
index 4a5b27e9e..000000000
Binary files a/public/images/ui/legacy/summary_status.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_tabs_1.png b/public/images/ui/legacy/summary_tabs_1.png
deleted file mode 100644
index ff38096fc..000000000
Binary files a/public/images/ui/legacy/summary_tabs_1.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_tabs_2.png b/public/images/ui/legacy/summary_tabs_2.png
deleted file mode 100644
index f147d1b83..000000000
Binary files a/public/images/ui/legacy/summary_tabs_2.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_tabs_3.png b/public/images/ui/legacy/summary_tabs_3.png
deleted file mode 100644
index cf8829886..000000000
Binary files a/public/images/ui/legacy/summary_tabs_3.png and /dev/null differ
diff --git a/public/images/ui/legacy/type_bgs.json b/public/images/ui/legacy/type_bgs.json
deleted file mode 100644
index 6b98a733d..000000000
--- a/public/images/ui/legacy/type_bgs.json
+++ /dev/null
@@ -1,419 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "type_bgs.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 14,
-				"h": 266
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "unknown",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "bug",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 14,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "dark",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 28,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "dragon",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "electric",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 56,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "fairy",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "fighting",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "fire",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "flying",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 112,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "ghost",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 126,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "grass",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 140,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "ground",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 154,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "ice",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 168,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "normal",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 182,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "poison",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 196,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "psychic",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 210,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "rock",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 224,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "steel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 238,
-						"w": 14,
-						"h": 14
-					}
-				},
-				{
-					"filename": "water",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 14,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 14,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 252,
-						"w": 14,
-						"h": 14
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a14f$"
-	}
-}
diff --git a/public/images/ui/legacy/type_bgs.png b/public/images/ui/legacy/type_bgs.png
deleted file mode 100644
index 6e682d9c3..000000000
Binary files a/public/images/ui/legacy/type_bgs.png and /dev/null differ
diff --git a/public/images/ui/legacy/type_tera.png b/public/images/ui/legacy/type_tera.png
deleted file mode 100644
index 5c35966a6..000000000
Binary files a/public/images/ui/legacy/type_tera.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/trim.ps1 b/public/images/ui/legacy/windows/trim.ps1
deleted file mode 100644
index 54356943e..000000000
--- a/public/images/ui/legacy/windows/trim.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-Get-ChildItem -Path "*.png" | ForEach-Object {
-	magick.exe convert -trim $_.FullName $_.FullName
-}
\ No newline at end of file
diff --git a/public/images/ui/legacy/windows/window_1.png b/public/images/ui/legacy/windows/window_1.png
deleted file mode 100644
index edfef03f9..000000000
Binary files a/public/images/ui/legacy/windows/window_1.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_1_thin.png b/public/images/ui/legacy/windows/window_1_thin.png
deleted file mode 100644
index 4648d812f..000000000
Binary files a/public/images/ui/legacy/windows/window_1_thin.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_1_xthin.png b/public/images/ui/legacy/windows/window_1_xthin.png
deleted file mode 100644
index 0ee6ffd00..000000000
Binary files a/public/images/ui/legacy/windows/window_1_xthin.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_2.png b/public/images/ui/legacy/windows/window_2.png
deleted file mode 100644
index 7da47310d..000000000
Binary files a/public/images/ui/legacy/windows/window_2.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_2_thin.png b/public/images/ui/legacy/windows/window_2_thin.png
deleted file mode 100644
index 281d538b9..000000000
Binary files a/public/images/ui/legacy/windows/window_2_thin.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_2_xthin.png b/public/images/ui/legacy/windows/window_2_xthin.png
deleted file mode 100644
index 01e951133..000000000
Binary files a/public/images/ui/legacy/windows/window_2_xthin.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_3.png b/public/images/ui/legacy/windows/window_3.png
deleted file mode 100644
index 0764ea2d6..000000000
Binary files a/public/images/ui/legacy/windows/window_3.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_3_thin.png b/public/images/ui/legacy/windows/window_3_thin.png
deleted file mode 100644
index 12cc6d607..000000000
Binary files a/public/images/ui/legacy/windows/window_3_thin.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_3_xthin.png b/public/images/ui/legacy/windows/window_3_xthin.png
deleted file mode 100644
index 57ac6427b..000000000
Binary files a/public/images/ui/legacy/windows/window_3_xthin.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_4.png b/public/images/ui/legacy/windows/window_4.png
deleted file mode 100644
index 69c5bce9d..000000000
Binary files a/public/images/ui/legacy/windows/window_4.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_4_thin.png b/public/images/ui/legacy/windows/window_4_thin.png
deleted file mode 100644
index b61e7d7b2..000000000
Binary files a/public/images/ui/legacy/windows/window_4_thin.png and /dev/null differ
diff --git a/public/images/ui/legacy/windows/window_4_xthin.png b/public/images/ui/legacy/windows/window_4_xthin.png
deleted file mode 100644
index 45fec09ad..000000000
Binary files a/public/images/ui/legacy/windows/window_4_xthin.png and /dev/null differ
diff --git a/public/images/ui/mmenu_sel.png b/public/images/ui/mmenu_sel.png
index 584403e5d..26952f7ec 100644
Binary files a/public/images/ui/mmenu_sel.png and b/public/images/ui/mmenu_sel.png differ
diff --git a/public/images/ui/namebox.png b/public/images/ui/namebox.png
index 034adbcc9..ed43bc4aa 100644
Binary files a/public/images/ui/namebox.png and b/public/images/ui/namebox.png differ
diff --git a/public/images/ui/numbers.json b/public/images/ui/numbers.json
index af9c36a8e..33a3e60f6 100644
--- a/public/images/ui/numbers.json
+++ b/public/images/ui/numbers.json
@@ -5,7 +5,7 @@
 			"format": "RGBA8888",
 			"size": {
 				"w": 88,
-				"h": 8
+				"h": 7
 			},
 			"scale": 1,
 			"frames": [
@@ -15,19 +15,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -36,19 +36,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 8,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -57,19 +57,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 16,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -78,19 +78,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 24,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -99,19 +99,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 32,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -120,19 +120,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 40,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -141,19 +141,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 48,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -162,19 +162,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 56,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -183,19 +183,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 64,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -204,19 +204,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 72,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -225,19 +225,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 80,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				}
 			]
diff --git a/public/images/ui/numbers.png b/public/images/ui/numbers.png
index bde4fe282..ba48453fa 100644
Binary files a/public/images/ui/numbers.png and b/public/images/ui/numbers.png differ
diff --git a/public/images/ui/numbers_alt.png b/public/images/ui/numbers_alt.png
deleted file mode 100644
index 1512ef435..000000000
Binary files a/public/images/ui/numbers_alt.png and /dev/null differ
diff --git a/public/images/ui/numbers_red.json b/public/images/ui/numbers_red.json
index 39fe9c617..5248ac89d 100644
--- a/public/images/ui/numbers_red.json
+++ b/public/images/ui/numbers_red.json
@@ -5,7 +5,7 @@
 			"format": "RGBA8888",
 			"size": {
 				"w": 88,
-				"h": 8
+				"h": 7
 			},
 			"scale": 1,
 			"frames": [
@@ -15,19 +15,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -36,19 +36,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 8,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -57,19 +57,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 16,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -78,19 +78,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 24,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -99,19 +99,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 32,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -120,19 +120,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 40,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -141,19 +141,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 48,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -162,19 +162,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 56,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -183,19 +183,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 64,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -204,19 +204,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 72,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				},
 				{
@@ -225,19 +225,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					},
 					"frame": {
 						"x": 80,
 						"y": 0,
 						"w": 8,
-						"h": 8
+						"h": 7
 					}
 				}
 			]
diff --git a/public/images/ui/numbers_red.png b/public/images/ui/numbers_red.png
index 37cae6b4d..acafb20c9 100644
Binary files a/public/images/ui/numbers_red.png and b/public/images/ui/numbers_red.png differ
diff --git a/public/images/ui/numbers_red_alt.png b/public/images/ui/numbers_red_alt.png
deleted file mode 100644
index 90b6f1092..000000000
Binary files a/public/images/ui/numbers_red_alt.png and /dev/null differ
diff --git a/public/images/ui/overlay_exp.png b/public/images/ui/overlay_exp.png
index 6b745bedc..51166cd9e 100644
Binary files a/public/images/ui/overlay_exp.png and b/public/images/ui/overlay_exp.png differ
diff --git a/public/images/ui/overlay_hp.png b/public/images/ui/overlay_hp.png
index 08674fdcd..9855c6106 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 5f7a02a48..d7dc3b74e 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 bbd406d95..d79614f41 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/overlay_lv_alt.png b/public/images/ui/overlay_lv_alt.png
deleted file mode 100644
index 75b90a2ee..000000000
Binary files a/public/images/ui/overlay_lv_alt.png and /dev/null differ
diff --git a/public/images/ui/overlay_message.png b/public/images/ui/overlay_message.png
index 37eb57740..9e58d86fc 100644
Binary files a/public/images/ui/overlay_message.png and b/public/images/ui/overlay_message.png differ
diff --git a/public/images/ui/party_bg.png b/public/images/ui/party_bg.png
index 378b1302c..323de1856 100644
Binary files a/public/images/ui/party_bg.png and b/public/images/ui/party_bg.png differ
diff --git a/public/images/ui/party_bg_double.png b/public/images/ui/party_bg_double.png
index e0411c119..89beff1ed 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_cancel.png b/public/images/ui/party_cancel.png
index 4ea4bc6d6..4219c8d33 100644
Binary files a/public/images/ui/party_cancel.png and b/public/images/ui/party_cancel.png differ
diff --git a/public/images/ui/party_exp_bar.png b/public/images/ui/party_exp_bar.png
index 7815c684b..0a514b433 100644
Binary files a/public/images/ui/party_exp_bar.png and b/public/images/ui/party_exp_bar.png differ
diff --git a/public/images/ui/party_pb.png b/public/images/ui/party_pb.png
index 4169e9c70..a1e5f7a9b 100644
Binary files a/public/images/ui/party_pb.png and b/public/images/ui/party_pb.png differ
diff --git a/public/images/ui/party_slot.png b/public/images/ui/party_slot.png
index ad137cead..c7a2eb5c0 100644
Binary files a/public/images/ui/party_slot.png and b/public/images/ui/party_slot.png differ
diff --git a/public/images/ui/party_slot_hp_bar.png b/public/images/ui/party_slot_hp_bar.png
index 1771123c1..13ac7436c 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_hp_overlay.png b/public/images/ui/party_slot_hp_overlay.png
index 09e8c974c..360a3cd17 100644
Binary files a/public/images/ui/party_slot_hp_overlay.png and b/public/images/ui/party_slot_hp_overlay.png differ
diff --git a/public/images/ui/party_slot_main.png b/public/images/ui/party_slot_main.png
index ab1f70d80..06eb9b03a 100644
Binary files a/public/images/ui/party_slot_main.png and b/public/images/ui/party_slot_main.png differ
diff --git a/public/images/ui/party_slot_overlay_hp.png b/public/images/ui/party_slot_overlay_hp.png
index 09e8c974c..8c15c63f3 100644
Binary files a/public/images/ui/party_slot_overlay_hp.png and b/public/images/ui/party_slot_overlay_hp.png differ
diff --git a/public/images/ui/party_slot_overlay_lv.png b/public/images/ui/party_slot_overlay_lv.png
index 7051b1d84..57d901a7d 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/pb_tray_ball.png b/public/images/ui/pb_tray_ball.png
index 554f90790..112184f85 100644
Binary files a/public/images/ui/pb_tray_ball.png and b/public/images/ui/pb_tray_ball.png differ
diff --git a/public/images/ui/pb_tray_overlay_enemy.png b/public/images/ui/pb_tray_overlay_enemy.png
index b6fdbcd17..c557ac736 100644
Binary files a/public/images/ui/pb_tray_overlay_enemy.png and b/public/images/ui/pb_tray_overlay_enemy.png differ
diff --git a/public/images/ui/pb_tray_overlay_player.png b/public/images/ui/pb_tray_overlay_player.png
index ddbacced3..4a065de5d 100644
Binary files a/public/images/ui/pb_tray_overlay_player.png and b/public/images/ui/pb_tray_overlay_player.png differ
diff --git a/public/images/ui/pbinfo_enemy_boss.png b/public/images/ui/pbinfo_enemy_boss.png
index 58edefa16..cffefd323 100644
Binary files a/public/images/ui/pbinfo_enemy_boss.png and b/public/images/ui/pbinfo_enemy_boss.png differ
diff --git a/public/images/ui/pbinfo_enemy_mini.png b/public/images/ui/pbinfo_enemy_mini.png
index 5250cb6f0..908ea1060 100644
Binary files a/public/images/ui/pbinfo_enemy_mini.png and b/public/images/ui/pbinfo_enemy_mini.png differ
diff --git a/public/images/ui/pbinfo_player.png b/public/images/ui/pbinfo_player.png
index 9d3e03bd6..825a9eafe 100644
Binary files a/public/images/ui/pbinfo_player.png and b/public/images/ui/pbinfo_player.png differ
diff --git a/public/images/ui/pbinfo_player_mini.png b/public/images/ui/pbinfo_player_mini.png
index db2762272..1ccaf4efd 100644
Binary files a/public/images/ui/pbinfo_player_mini.png and b/public/images/ui/pbinfo_player_mini.png differ
diff --git a/public/images/pokemon_icons_0.json b/public/images/ui/pokemon_icons_0.json
similarity index 100%
rename from public/images/pokemon_icons_0.json
rename to public/images/ui/pokemon_icons_0.json
diff --git a/public/images/pokemon_icons_0.png b/public/images/ui/pokemon_icons_0.png
similarity index 100%
rename from public/images/pokemon_icons_0.png
rename to public/images/ui/pokemon_icons_0.png
diff --git a/public/images/pokemon_icons_1.json b/public/images/ui/pokemon_icons_1.json
similarity index 100%
rename from public/images/pokemon_icons_1.json
rename to public/images/ui/pokemon_icons_1.json
diff --git a/public/images/pokemon_icons_1.png b/public/images/ui/pokemon_icons_1.png
similarity index 100%
rename from public/images/pokemon_icons_1.png
rename to public/images/ui/pokemon_icons_1.png
diff --git a/public/images/pokemon_icons_2.json b/public/images/ui/pokemon_icons_2.json
similarity index 100%
rename from public/images/pokemon_icons_2.json
rename to public/images/ui/pokemon_icons_2.json
diff --git a/public/images/pokemon_icons_2.png b/public/images/ui/pokemon_icons_2.png
similarity index 100%
rename from public/images/pokemon_icons_2.png
rename to public/images/ui/pokemon_icons_2.png
diff --git a/public/images/pokemon_icons_3.json b/public/images/ui/pokemon_icons_3.json
similarity index 100%
rename from public/images/pokemon_icons_3.json
rename to public/images/ui/pokemon_icons_3.json
diff --git a/public/images/pokemon_icons_3.png b/public/images/ui/pokemon_icons_3.png
similarity index 100%
rename from public/images/pokemon_icons_3.png
rename to public/images/ui/pokemon_icons_3.png
diff --git a/public/images/pokemon_icons_4.json b/public/images/ui/pokemon_icons_4.json
similarity index 100%
rename from public/images/pokemon_icons_4.json
rename to public/images/ui/pokemon_icons_4.json
diff --git a/public/images/pokemon_icons_4.png b/public/images/ui/pokemon_icons_4.png
similarity index 100%
rename from public/images/pokemon_icons_4.png
rename to public/images/ui/pokemon_icons_4.png
diff --git a/public/images/pokemon_icons_5.json b/public/images/ui/pokemon_icons_5.json
similarity index 100%
rename from public/images/pokemon_icons_5.json
rename to public/images/ui/pokemon_icons_5.json
diff --git a/public/images/pokemon_icons_5.png b/public/images/ui/pokemon_icons_5.png
similarity index 100%
rename from public/images/pokemon_icons_5.png
rename to public/images/ui/pokemon_icons_5.png
diff --git a/public/images/pokemon_icons_6.json b/public/images/ui/pokemon_icons_6.json
similarity index 100%
rename from public/images/pokemon_icons_6.json
rename to public/images/ui/pokemon_icons_6.json
diff --git a/public/images/pokemon_icons_6.png b/public/images/ui/pokemon_icons_6.png
similarity index 100%
rename from public/images/pokemon_icons_6.png
rename to public/images/ui/pokemon_icons_6.png
diff --git a/public/images/pokemon_icons_7.json b/public/images/ui/pokemon_icons_7.json
similarity index 100%
rename from public/images/pokemon_icons_7.json
rename to public/images/ui/pokemon_icons_7.json
diff --git a/public/images/pokemon_icons_7.png b/public/images/ui/pokemon_icons_7.png
similarity index 100%
rename from public/images/pokemon_icons_7.png
rename to public/images/ui/pokemon_icons_7.png
diff --git a/public/images/pokemon_icons_8.json b/public/images/ui/pokemon_icons_8.json
similarity index 100%
rename from public/images/pokemon_icons_8.json
rename to public/images/ui/pokemon_icons_8.json
diff --git a/public/images/pokemon_icons_8.png b/public/images/ui/pokemon_icons_8.png
similarity index 100%
rename from public/images/pokemon_icons_8.png
rename to public/images/ui/pokemon_icons_8.png
diff --git a/public/images/pokemon_icons_9.json b/public/images/ui/pokemon_icons_9.json
similarity index 100%
rename from public/images/pokemon_icons_9.json
rename to public/images/ui/pokemon_icons_9.json
diff --git a/public/images/pokemon_icons_9.png b/public/images/ui/pokemon_icons_9.png
similarity index 100%
rename from public/images/pokemon_icons_9.png
rename to public/images/ui/pokemon_icons_9.png
diff --git a/public/images/ui/select_cursor.png b/public/images/ui/select_cursor.png
index 41e52ac0d..f55e33fdb 100644
Binary files a/public/images/ui/select_cursor.png and b/public/images/ui/select_cursor.png differ
diff --git a/public/images/ui/select_cursor_highlight.png b/public/images/ui/select_cursor_highlight.png
index a02637405..6819454bf 100644
Binary files a/public/images/ui/select_cursor_highlight.png and b/public/images/ui/select_cursor_highlight.png differ
diff --git a/public/images/ui/select_cursor_highlight_thick.png b/public/images/ui/select_cursor_highlight_thick.png
index 4081361b2..d9a153286 100644
Binary files a/public/images/ui/select_cursor_highlight_thick.png and b/public/images/ui/select_cursor_highlight_thick.png differ
diff --git a/public/images/ui/select_cursor_pokerus.png b/public/images/ui/select_cursor_pokerus.png
index cccc4ada7..123b0a0f1 100644
Binary files a/public/images/ui/select_cursor_pokerus.png and b/public/images/ui/select_cursor_pokerus.png differ
diff --git a/public/images/ui/select_gen_cursor.png b/public/images/ui/select_gen_cursor.png
index e4ed90ecc..e602d1531 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 8019de6f3..ce2f2265f 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/starter_select_bg.png b/public/images/ui/starter_select_bg.png
index f02182fe1..04a85b59d 100644
Binary files a/public/images/ui/starter_select_bg.png and b/public/images/ui/starter_select_bg.png differ
diff --git a/public/images/ui/starter_select_overlay.png b/public/images/ui/starter_select_overlay.png
deleted file mode 100644
index b3a0850bc..000000000
Binary files a/public/images/ui/starter_select_overlay.png and /dev/null differ
diff --git a/public/images/ui/summary_bg.png b/public/images/ui/summary_bg.png
index 1fa1d95fc..e4da2dd5d 100644
Binary files a/public/images/ui/summary_bg.png and b/public/images/ui/summary_bg.png differ
diff --git a/public/images/ui/summary_moves.png b/public/images/ui/summary_moves.png
index 8f6b01137..54ddf0fb2 100644
Binary files a/public/images/ui/summary_moves.png and b/public/images/ui/summary_moves.png differ
diff --git a/public/images/ui/summary_moves_cursor.png b/public/images/ui/summary_moves_cursor.png
index 93ce1fc0d..6b8314b66 100644
Binary files a/public/images/ui/summary_moves_cursor.png and b/public/images/ui/summary_moves_cursor.png differ
diff --git a/public/images/ui/summary_moves_effect.png b/public/images/ui/summary_moves_effect.png
index e1b0e0667..ed422d1b4 100644
Binary files a/public/images/ui/summary_moves_effect.png and b/public/images/ui/summary_moves_effect.png differ
diff --git a/public/images/ui/summary_moves_overlay_pp.png b/public/images/ui/summary_moves_overlay_pp.png
index 9dd0a080e..a42c86f28 100644
Binary files a/public/images/ui/summary_moves_overlay_pp.png and b/public/images/ui/summary_moves_overlay_pp.png differ
diff --git a/public/images/ui/summary_moves_overlay_row.png b/public/images/ui/summary_moves_overlay_row.png
index 5c975b174..5b3e3d3e9 100644
Binary files a/public/images/ui/summary_moves_overlay_row.png and b/public/images/ui/summary_moves_overlay_row.png differ
diff --git a/public/images/ui/summary_overlay_shiny.png b/public/images/ui/summary_overlay_shiny.png
index 472728cc3..e4ab82073 100644
Binary files a/public/images/ui/summary_overlay_shiny.png and b/public/images/ui/summary_overlay_shiny.png differ
diff --git a/public/images/ui/summary_profile.png b/public/images/ui/summary_profile.png
index 5fff26d5a..25fc3ca70 100644
Binary files a/public/images/ui/summary_profile.png and b/public/images/ui/summary_profile.png differ
diff --git a/public/images/ui/summary_stats.png b/public/images/ui/summary_stats.png
index b87d67b86..e744f84be 100644
Binary files a/public/images/ui/summary_stats.png and b/public/images/ui/summary_stats.png differ
diff --git a/public/images/ui/summary_stats_overlay_exp.png b/public/images/ui/summary_stats_overlay_exp.png
index a5ef5093c..dedc228f8 100644
Binary files a/public/images/ui/summary_stats_overlay_exp.png and b/public/images/ui/summary_stats_overlay_exp.png differ
diff --git a/public/images/ui/summary_status.png b/public/images/ui/summary_status.png
index 981e4dafe..4a5b27e9e 100644
Binary files a/public/images/ui/summary_status.png and b/public/images/ui/summary_status.png differ
diff --git a/public/images/ui/summary_tabs_1.png b/public/images/ui/summary_tabs_1.png
index c4989a865..ff38096fc 100644
Binary files a/public/images/ui/summary_tabs_1.png and b/public/images/ui/summary_tabs_1.png differ
diff --git a/public/images/ui/summary_tabs_2.png b/public/images/ui/summary_tabs_2.png
index 16f7c35b2..f147d1b83 100644
Binary files a/public/images/ui/summary_tabs_2.png and b/public/images/ui/summary_tabs_2.png differ
diff --git a/public/images/ui/summary_tabs_3.png b/public/images/ui/summary_tabs_3.png
index b766307aa..cf8829886 100644
Binary files a/public/images/ui/summary_tabs_3.png and b/public/images/ui/summary_tabs_3.png differ
diff --git a/public/images/ui/windows/window_1.png b/public/images/ui/windows/window_1.png
index ffb1cfb17..edfef03f9 100644
Binary files a/public/images/ui/windows/window_1.png and b/public/images/ui/windows/window_1.png differ
diff --git a/public/images/ui/windows/window_1_thin.png b/public/images/ui/windows/window_1_thin.png
index 27385d58c..4648d812f 100644
Binary files a/public/images/ui/windows/window_1_thin.png and b/public/images/ui/windows/window_1_thin.png differ
diff --git a/public/images/ui/windows/window_1_xthin.png b/public/images/ui/windows/window_1_xthin.png
index ea8dfbcf3..0ee6ffd00 100644
Binary files a/public/images/ui/windows/window_1_xthin.png and b/public/images/ui/windows/window_1_xthin.png differ
diff --git a/public/images/ui/windows/window_2.png b/public/images/ui/windows/window_2.png
index 9982e1512..7da47310d 100644
Binary files a/public/images/ui/windows/window_2.png and b/public/images/ui/windows/window_2.png differ
diff --git a/public/images/ui/windows/window_2_thin.png b/public/images/ui/windows/window_2_thin.png
index 69db24316..281d538b9 100644
Binary files a/public/images/ui/windows/window_2_thin.png and b/public/images/ui/windows/window_2_thin.png differ
diff --git a/public/images/ui/windows/window_2_xthin.png b/public/images/ui/windows/window_2_xthin.png
index 07dc037f1..01e951133 100644
Binary files a/public/images/ui/windows/window_2_xthin.png and b/public/images/ui/windows/window_2_xthin.png differ
diff --git a/public/images/ui/windows/window_3.png b/public/images/ui/windows/window_3.png
index f46bd5b3e..0764ea2d6 100644
Binary files a/public/images/ui/windows/window_3.png and b/public/images/ui/windows/window_3.png differ
diff --git a/public/images/ui/windows/window_3_thin.png b/public/images/ui/windows/window_3_thin.png
index d2ebd434b..12cc6d607 100644
Binary files a/public/images/ui/windows/window_3_thin.png and b/public/images/ui/windows/window_3_thin.png differ
diff --git a/public/images/ui/windows/window_3_xthin.png b/public/images/ui/windows/window_3_xthin.png
index 10099112a..57ac6427b 100644
Binary files a/public/images/ui/windows/window_3_xthin.png and b/public/images/ui/windows/window_3_xthin.png differ
diff --git a/public/images/ui/windows/window_4.png b/public/images/ui/windows/window_4.png
index 5ab394580..69c5bce9d 100644
Binary files a/public/images/ui/windows/window_4.png and b/public/images/ui/windows/window_4.png differ
diff --git a/public/images/ui/windows/window_4_thin.png b/public/images/ui/windows/window_4_thin.png
index 377e321e2..b61e7d7b2 100644
Binary files a/public/images/ui/windows/window_4_thin.png and b/public/images/ui/windows/window_4_thin.png differ
diff --git a/public/images/ui/windows/window_4_xthin.png b/public/images/ui/windows/window_4_xthin.png
index 7f9df6f71..45fec09ad 100644
Binary files a/public/images/ui/windows/window_4_xthin.png and b/public/images/ui/windows/window_4_xthin.png differ
diff --git a/public/images/ui/windows/window_5.png b/public/images/ui/windows/window_5.png
deleted file mode 100644
index c57b5348e..000000000
Binary files a/public/images/ui/windows/window_5.png and /dev/null differ
diff --git a/public/images/ui/windows/window_5_thin.png b/public/images/ui/windows/window_5_thin.png
deleted file mode 100644
index c57b5348e..000000000
Binary files a/public/images/ui/windows/window_5_thin.png and /dev/null differ
diff --git a/public/images/ui/windows/window_5_xthin.png b/public/images/ui/windows/window_5_xthin.png
deleted file mode 100644
index c57b5348e..000000000
Binary files a/public/images/ui/windows/window_5_xthin.png and /dev/null differ
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 54c7188ab..03a557721 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -55,7 +55,6 @@ import DamageNumberHandler from './field/damage-number-handler';
 import PokemonInfoContainer from './ui/pokemon-info-container';
 import { biomeDepths } from './data/biomes';
 import { initTouchControls } from './touch-controls';
-import { UiTheme } from './enums/ui-theme';
 
 export const bypassLogin = false;
 
@@ -106,8 +105,7 @@ export default class BattleScene extends Phaser.Scene {
 	public damageNumbersMode: integer = 0;
 	public showLevelUpStats: boolean = true;
 	public enableTutorials: boolean = true;
-	public uiTheme: UiTheme = UiTheme.DEFAULT;
-	public windowType: integer = 9;
+	public windowType: integer = 1;
 	public experimentalSprites: boolean = false;
 	public fusionPaletteSwaps: boolean = true;
 	public enableTouchControls: boolean = false;
@@ -193,10 +191,6 @@ export default class BattleScene extends Phaser.Scene {
 		if (!filename)
 			filename = `${key}.png`;
 		this.load.image(key, `images/${folder}/${filename}`);
-		if (this.uiTheme && folder.startsWith('ui')) {
-			folder = folder.replace('ui', 'ui/legacy');
-			this.load.image(`${key}_legacy`, `images/${folder}/${filename}`);
-		}
 	}
 
 	loadAtlas(key: string, folder: string, filenameRoot?: string) {
@@ -205,10 +199,6 @@ export default class BattleScene extends Phaser.Scene {
 		if (folder)
 			folder += '/';
 		this.load.atlas(key, `images/${folder}${filenameRoot}.png`, `images/${folder}/${filenameRoot}.json`);
-		if (this.uiTheme && folder.startsWith('ui')) {
-			folder = folder.replace('ui', 'ui/legacy');
-			this.load.atlas(`${key}_legacy`, `images/${folder}${filenameRoot}.png`, `images/${folder}/${filenameRoot}.json`);
-		}
 	}
 
 	loadPokemonAtlas(key: string, atlasPath: string, experimental?: boolean) {
@@ -235,10 +225,6 @@ export default class BattleScene extends Phaser.Scene {
 		if (!filename)
 			filename = `${key}.png`;
 		this.load.spritesheet(key, `images/${folder}/${filename}`, { frameWidth: size, frameHeight: size });
-		if (this.uiTheme && folder.startsWith('ui')) {
-			folder = folder.replace('ui', 'ui/legacy');
-			this.load.spritesheet(`${key}_legacy`, `images/${folder}/${filename}`, { frameWidth: size, frameHeight: size });
-		}
 	}
 
 	loadSe(key: string, folder?: string, filenames?: string | string[]) {
@@ -415,7 +401,7 @@ export default class BattleScene extends Phaser.Scene {
 		this.loadImage('egg_list_bg', 'ui');
 
 		for (let i = 0; i < 10; i++)
-			this.loadAtlas(`pokemon_icons_${i}`, '');
+			this.loadAtlas(`pokemon_icons_${i}`, 'ui');
 
 		this.loadSe('select');
 		this.loadSe('menu_open');
diff --git a/src/data/nature.ts b/src/data/nature.ts
index 55c55f23d..1e4df6623 100644
--- a/src/data/nature.ts
+++ b/src/data/nature.ts
@@ -43,7 +43,7 @@ export function getNatureName(nature: Nature, includeStatEffects: boolean = fals
       else if (multiplier < 1)
         decreasedStat = stat;
     }
-    const textStyle = forStarterSelect ? TextStyle.SUMMARY_ALT : TextStyle.WINDOW;
+    const textStyle = forStarterSelect ? TextStyle.SUMMARY : TextStyle.WINDOW;
     if (increasedStat && decreasedStat)
       ret = `${getBBCodeFrag(`${ret}${!forStarterSelect ? '\n' : ' '}(`, textStyle)}${getBBCodeFrag(`+${getStatName(increasedStat, true)}`, TextStyle.SUMMARY_PINK)}${getBBCodeFrag('/', textStyle)}${getBBCodeFrag(`-${getStatName(decreasedStat, true)}`, TextStyle.SUMMARY_BLUE)}${getBBCodeFrag(')', textStyle)}`;
     else
diff --git a/src/enums/battle-spec.ts b/src/enums/battle-spec.ts
index 00bc7f92f..391451072 100644
--- a/src/enums/battle-spec.ts
+++ b/src/enums/battle-spec.ts
@@ -1,3 +1,4 @@
+
 export enum BattleSpec {
     DEFAULT,
     FINAL_BOSS
diff --git a/src/enums/ui-theme.ts b/src/enums/ui-theme.ts
deleted file mode 100644
index e0fd92a20..000000000
--- a/src/enums/ui-theme.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum UiTheme {
-  DEFAULT,
-  LEGACY
-}
\ No newline at end of file
diff --git a/src/system/settings.ts b/src/system/settings.ts
index d017a63ab..df5f84f5e 100644
--- a/src/system/settings.ts
+++ b/src/system/settings.ts
@@ -10,7 +10,6 @@ export enum Setting {
   SE_Volume = "SE_VOLUME",
   Damage_Numbers = "DAMAGE_NUMBERS",
   Show_Stats_on_Level_Up = "SHOW_LEVEL_UP_STATS",
-  UI_Theme = "UI_THEME",
   Window_Type = "WINDOW_TYPE",
   Tutorials = "TUTORIALS",
   Sprite_Set = "SPRITE_SET",
@@ -35,7 +34,6 @@ export const settingOptions: SettingOptions = {
   [Setting.SE_Volume]: new Array(11).fill(null).map((_, i) => i ? (i * 10).toString() : 'Mute'),
   [Setting.Damage_Numbers]: [ 'Off', 'Simple', 'Fancy' ],
   [Setting.Show_Stats_on_Level_Up]: [ 'Off', 'On' ],
-  [Setting.UI_Theme]: [ 'Default', 'Legacy' ],
   [Setting.Window_Type]: new Array(4).fill(null).map((_, i) => (i + 1).toString()),
   [Setting.Tutorials]: [ 'Off', 'On' ],
   [Setting.Sprite_Set]: [ 'Consistent', 'Prioritize Animation' ],
@@ -52,7 +50,6 @@ export const settingDefaults: SettingDefaults = {
   [Setting.SE_Volume]: 10,
   [Setting.Damage_Numbers]: 0,
   [Setting.Show_Stats_on_Level_Up]: 1,
-  [Setting.UI_Theme]: 0,
   [Setting.Window_Type]: 0,
   [Setting.Tutorials]: 1,
   [Setting.Sprite_Set]: 0,
@@ -85,9 +82,6 @@ export function setSetting(scene: BattleScene, setting: Setting, value: integer)
     case Setting.Show_Stats_on_Level_Up:
       scene.showLevelUpStats = settingOptions[setting][value] === 'On';
       break;
-    case Setting.UI_Theme:
-      scene.uiTheme = parseInt(settingOptions[setting][value]);
-      break;
     case Setting.Window_Type:
       updateWindowType(scene, parseInt(settingOptions[setting][value]));
       break;
diff --git a/src/ui/achv-bar.ts b/src/ui/achv-bar.ts
index 475982117..bd04d0465 100644
--- a/src/ui/achv-bar.ts
+++ b/src/ui/achv-bar.ts
@@ -36,7 +36,7 @@ export default class AchvBar extends Phaser.GameObjects.Container {
     this.scoreText.setOrigin(1, 0);
     this.add(this.scoreText);
 
-    this.descriptionText = addTextObject(this.scene, 43, 16, '', TextStyle.WINDOW_ALT, { fontSize: '72px' });
+    this.descriptionText = addTextObject(this.scene, 43, 16, '', TextStyle.WINDOW, { fontSize: '72px' });
     this.descriptionText.setOrigin(0, 0);
     this.add(this.descriptionText);
 
diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts
index 737d67d12..218d5d2ed 100644
--- a/src/ui/battle-info.ts
+++ b/src/ui/battle-info.ts
@@ -38,7 +38,6 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
   private levelNumbersContainer: Phaser.GameObjects.Container;
   private hpNumbersContainer: Phaser.GameObjects.Container;
   private expBar: Phaser.GameObjects.Image;
-  private expMaskRect: Phaser.GameObjects.Graphics;
 
   constructor(scene: Phaser.Scene, x: number, y: number, player: boolean) {
     super(scene, x, y);
@@ -120,7 +119,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
 
     this.hpBarSegmentDividers = [];
 
-    this.levelNumbersContainer = this.scene.add.container(9.5, (this.scene as BattleScene).uiTheme ? 0 : -0.5);
+    this.levelNumbersContainer = this.scene.add.container(9.5, 0);
     this.levelContainer.add(this.levelNumbersContainer);
 
     if (this.player) {
@@ -129,20 +128,10 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
 
       const expBar = this.scene.add.image(-98, 18, 'overlay_exp');
       expBar.setOrigin(0);
+      expBar.setScale(0, 1);
       this.add(expBar);
 
-      const expMaskRect = this.scene.make.graphics({});
-      expMaskRect.setScale(6);
-      expMaskRect.fillStyle(0xFFFFFF);
-      expMaskRect.beginPath();
-      expMaskRect.fillRect(127, 126, 85, 2);
-
-      const expMask = expMaskRect.createGeometryMask();
-
-      expBar.setMask(expMask);
-
       this.expBar = expBar;
-      this.expMaskRect = expMaskRect;
     }
   }
 
@@ -196,7 +185,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     this.shinyIcon.setVisible(pokemon.isShiny());
 
     if (this.player) {
-      this.expMaskRect.x = (pokemon.levelExp / getLevelTotalExp(pokemon.level, pokemon.species.growthRate)) * 510;
+      this.expBar.setScale(pokemon.levelExp / getLevelTotalExp(pokemon.level, pokemon.species.growthRate), 1);
       this.lastExp = pokemon.exp;
       this.lastLevelExp = pokemon.levelExp;
     }
@@ -413,9 +402,9 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
       if (duration)
         (this.scene as BattleScene).playSound('exp');
       this.scene.tweens.add({
-        targets: this.expMaskRect,
+        targets: this.expBar,
         ease: 'Sine.easeIn',
-        x: ratio * 510,
+        scaleX: ratio,
         duration: duration,
         onComplete: () => {
           if (!this.scene)
@@ -426,7 +415,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
             (this.scene as BattleScene).playSound('level_up');
             this.setLevel(this.lastLevel);
             this.scene.time.delayedCall(500 * levelDurationMultiplier, () => {
-              this.expMaskRect.x = 0;
+              this.expBar.setScale(0, 1);
               this.updateInfo(pokemon, instant).then(() => resolve());
             });
             return;
diff --git a/src/ui/egg-list-ui-handler.ts b/src/ui/egg-list-ui-handler.ts
index 875b17e44..e81677031 100644
--- a/src/ui/egg-list-ui-handler.ts
+++ b/src/ui/egg-list-ui-handler.ts
@@ -36,7 +36,7 @@ export default class EggListUiHandler extends MessageUiHandler {
     bgColor.setOrigin(0, 0);
     this.eggListContainer.add(bgColor);
 
-    const eggListBg = this.scene.add.image(0, 0, 'egg_list_bg');
+    const eggListBg = this.scene.add.image(1, 1, 'egg_list_bg');
     eggListBg.setOrigin(0, 0);
     this.eggListContainer.add(eggListBg);
 
@@ -48,7 +48,7 @@ export default class EggListUiHandler extends MessageUiHandler {
     this.iconAnimHandler = new PokemonIconAnimHandler();
     this.iconAnimHandler.setup(this.scene);
 
-    this.eggNameText = addTextObject(this.scene, 8, 66, '', TextStyle.SUMMARY);
+    this.eggNameText = addTextObject(this.scene, 6, 66, '', TextStyle.SUMMARY);
     this.eggNameText.setOrigin(0, 0);
     this.eggListContainer.add(this.eggNameText);
 
diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts
index adde18f4b..b0e9fe92c 100644
--- a/src/ui/form-modal-ui-handler.ts
+++ b/src/ui/form-modal-ui-handler.ts
@@ -66,8 +66,8 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
     });
 
     this.errorMessage = addTextObject(this.scene, 10, (hasTitle ? 31 : 5) + 20 * (fields.length - 1) + 16, '', TextStyle.TOOLTIP_CONTENT);
-    this.errorMessage.setColor(this.getTextColor(TextStyle.SUMMARY_PINK));
-    this.errorMessage.setShadowColor(this.getTextColor(TextStyle.SUMMARY_PINK, true));
+    this.errorMessage.setColor(getTextColor(TextStyle.SUMMARY_PINK));
+    this.errorMessage.setShadowColor(getTextColor(TextStyle.SUMMARY_PINK, true));
     this.errorMessage.setVisible(false);
     this.modalContainer.add(this.errorMessage);
   }
diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts
index 6c6ce221b..c231ca23f 100644
--- a/src/ui/modifier-select-ui-handler.ts
+++ b/src/ui/modifier-select-ui-handler.ts
@@ -316,8 +316,8 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
     const canReroll = this.scene.money >= this.rerollCost;
 
     this.rerollCostText.setText(`₽${this.rerollCost.toLocaleString('en-US')}`);
-    this.rerollCostText.setColor(this.getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED));
-    this.rerollCostText.setShadowColor(this.getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED, true));
+    this.rerollCostText.setColor(getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED));
+    this.rerollCostText.setShadowColor(getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED, true));
   }
 
   clear() {
@@ -556,11 +556,10 @@ class ModifierOption extends Phaser.GameObjects.Container {
   }
 
   updateCostText(): void {
-    const scene = this.scene as BattleScene;
-    const textStyle = this.modifierTypeOption.cost <= scene.money ? TextStyle.MONEY : TextStyle.PARTY_RED;
+    const textStyle = this.modifierTypeOption.cost <= (this.scene as BattleScene).money ? TextStyle.MONEY : TextStyle.PARTY_RED;
 
     this.itemCostText.setText(`₽${this.modifierTypeOption.cost.toLocaleString('en-US')}`);
-    this.itemCostText.setColor(getTextColor(textStyle, false, scene.uiTheme));
-    this.itemCostText.setShadowColor(getTextColor(textStyle, true, scene.uiTheme));
+    this.itemCostText.setColor(getTextColor(textStyle));
+    this.itemCostText.setShadowColor(getTextColor(textStyle, true));
   }
 }
\ No newline at end of file
diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/save-slot-select-ui-handler.ts
index 054ce8c4b..bc9064b2f 100644
--- a/src/ui/save-slot-select-ui-handler.ts
+++ b/src/ui/save-slot-select-ui-handler.ts
@@ -172,7 +172,7 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
     let changed = super.setCursor(cursor);
     
     if (!this.cursorObj) {
-      this.cursorObj = this.scene.add.nineslice(0, 0, 'select_cursor_highlight_thick', null, 296, 44, 6, 6, 6, 6);
+      this.cursorObj = this.scene.add.nineslice(0, 0, 'select_cursor_highlight_thick', null, 296, 44, 2, 2, 2, 2);
       this.cursorObj.setOrigin(0, 0);
       this.sessionSlotsContainer.add(this.cursorObj);
     }
diff --git a/src/ui/settings-ui-handler.ts b/src/ui/settings-ui-handler.ts
index 137270e8a..3319b2e91 100644
--- a/src/ui/settings-ui-handler.ts
+++ b/src/ui/settings-ui-handler.ts
@@ -1,7 +1,7 @@
 import BattleScene, { Button } from "../battle-scene";
 import { Setting, settingDefaults, settingOptions } from "../system/settings";
 import { hasTouchscreen, isMobile } from "../touch-controls";
-import { TextStyle, addTextObject } from "./text";
+import { TextStyle, addTextObject, getTextColor } from "./text";
 import { Mode } from "./ui";
 import UiHandler from "./ui-handler";
 import { addWindow } from "./window";
@@ -48,11 +48,7 @@ export default class SettingsUiHandler extends UiHandler {
     this.optionValueLabels = [];
 
     Object.keys(Setting).forEach((setting, s) => {
-      let settingName = setting.replace(/\_/g, ' ');
-      if (Setting[setting] === Setting.UI_Theme)
-        settingName += ' (Requires Reload)';
-
-      this.settingLabels[s] = addTextObject(this.scene, 8, 28 + s * 16, settingName, TextStyle.SETTINGS_LABEL);
+      this.settingLabels[s] = addTextObject(this.scene, 8, 28 + s * 16, setting.replace(/\_/g, ' '), TextStyle.SETTINGS_LABEL);
       this.settingLabels[s].setOrigin(0, 0);
 
       this.optionsContainer.add(this.settingLabels[s]);
@@ -161,7 +157,7 @@ export default class SettingsUiHandler extends UiHandler {
     const ret = super.setCursor(cursor);
 
     if (!this.cursorObj) {
-      this.cursorObj = this.scene.add.nineslice(0, 0, 'summary_moves_cursor', null, (this.scene.game.canvas.width / 6) - 10, 16, 1, 1, 1, 1);
+      this.cursorObj = this.scene.add.nineslice(0, 0, 'select_cursor_highlight', null, (this.scene.game.canvas.width / 6) - 10, 16, 1, 1, 1, 1);
       this.cursorObj.setOrigin(0, 0);
       this.optionsContainer.add(this.cursorObj);
     }
@@ -182,14 +178,14 @@ export default class SettingsUiHandler extends UiHandler {
     const lastCursor = this.optionCursors[settingIndex];
 
     const lastValueLabel = this.optionValueLabels[settingIndex][lastCursor];
-    lastValueLabel.setColor(this.getTextColor(TextStyle.WINDOW));
-    lastValueLabel.setShadowColor(this.getTextColor(TextStyle.WINDOW, true));
+    lastValueLabel.setColor(getTextColor(TextStyle.WINDOW));
+    lastValueLabel.setShadowColor(getTextColor(TextStyle.WINDOW, true));
 
     this.optionCursors[settingIndex] = cursor;
 
     const newValueLabel = this.optionValueLabels[settingIndex][cursor];
-    newValueLabel.setColor(this.getTextColor(TextStyle.SETTINGS_SELECTED));
-    newValueLabel.setShadowColor(this.getTextColor(TextStyle.SETTINGS_SELECTED, true));
+    newValueLabel.setColor(getTextColor(TextStyle.SETTINGS_SELECTED));
+    newValueLabel.setShadowColor(getTextColor(TextStyle.SETTINGS_SELECTED, true));
 
     if (save)
       this.scene.gameData.saveSetting(setting, cursor);
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 8296af3be..6636c967c 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -127,7 +127,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     bgColor.setOrigin(0, 0);
     this.starterSelectContainer.add(bgColor);
 
-    const starterSelectBg = this.scene.add.image(0, 0, 'starter_select_bg');
+    const starterSelectBg = this.scene.add.image(1, 1, 'starter_select_bg');
     starterSelectBg.setOrigin(0, 0);
     this.starterSelectContainer.add(starterSelectBg);
 
@@ -136,15 +136,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.shinyOverlay.setVisible(false);
     this.starterSelectContainer.add(this.shinyOverlay);
 
-    const starterContainerWindow = addWindow(this.scene, 141, 1, 178, 178);
-    
     this.starterSelectContainer.add(addWindow(this.scene, 107, 1, 34, 58));
     this.starterSelectContainer.add(addWindow(this.scene, 107, 59, 34, 91));
     this.starterSelectContainer.add(addWindow(this.scene, 107, 145, 34, 34, true));
-    this.starterSelectContainer.add(starterContainerWindow);
-
-    if (!this.scene.uiTheme)
-      starterContainerWindow.setVisible(false);
+    this.starterSelectContainer.add(addWindow(this.scene, 141, 1, 178, 178));
 
     this.iconAnimHandler = new PokemonIconAnimHandler();
     this.iconAnimHandler.setup(this.scene);
@@ -157,7 +152,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonNameText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonNameText);
 
-    this.pokemonGrowthRateLabelText = addTextObject(this.scene, 8, 106, 'Growth Rate:', TextStyle.SUMMARY_ALT, { fontSize: '36px' });
+    this.pokemonGrowthRateLabelText = addTextObject(this.scene, 8, 106, 'Growth Rate:', TextStyle.SUMMARY, { fontSize: '36px' });
     this.pokemonGrowthRateLabelText.setOrigin(0, 0);
     this.pokemonGrowthRateLabelText.setVisible(false);
     this.starterSelectContainer.add(this.pokemonGrowthRateLabelText);
@@ -166,38 +161,38 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonGrowthRateText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonGrowthRateText);
 
-    this.pokemonGenderText = addTextObject(this.scene, 96, 112, '', TextStyle.SUMMARY_ALT);
+    this.pokemonGenderText = addTextObject(this.scene, 96, 112, '', TextStyle.SUMMARY);
     this.pokemonGenderText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonGenderText);
 
-    this.pokemonUncaughtText = addTextObject(this.scene, 6, 126, 'Uncaught', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonUncaughtText = addTextObject(this.scene, 6, 126, 'Uncaught', TextStyle.SUMMARY, { fontSize: '56px' });
     this.pokemonUncaughtText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonUncaughtText);
 
-    this.pokemonAbilityLabelText = addTextObject(this.scene, 6, 126, 'Ability:', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonAbilityLabelText = addTextObject(this.scene, 6, 126, 'Ability:', TextStyle.SUMMARY, { fontSize: '56px' });
     this.pokemonAbilityLabelText.setOrigin(0, 0);
     this.pokemonAbilityLabelText.setVisible(false);
     this.starterSelectContainer.add(this.pokemonAbilityLabelText);
 
-    this.pokemonAbilityText = addTextObject(this.scene, 30, 126, '', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonAbilityText = addTextObject(this.scene, 30, 126, '', TextStyle.SUMMARY, { fontSize: '56px' });
     this.pokemonAbilityText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonAbilityText);
 
-    this.pokemonNatureLabelText = addTextObject(this.scene, 6, 135, 'Nature:', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonNatureLabelText = addTextObject(this.scene, 6, 135, 'Nature:', TextStyle.SUMMARY, { fontSize: '56px' });
     this.pokemonNatureLabelText.setOrigin(0, 0);
     this.pokemonNatureLabelText.setVisible(false);
     this.starterSelectContainer.add(this.pokemonNatureLabelText);
 
-    this.pokemonNatureText = addBBCodeTextObject(this.scene, 30, 135, '', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonNatureText = addBBCodeTextObject(this.scene, 30, 135, '', TextStyle.SUMMARY, { fontSize: '56px' });
     this.pokemonNatureText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonNatureText);
 
-    this.pokemonCaughtCountLabelText = addTextObject(this.scene, 6, 144, 'Caught/Hatched:', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonCaughtCountLabelText = addTextObject(this.scene, 6, 144, 'Caught/Hatched:', TextStyle.SUMMARY, { fontSize: '56px' });
     this.pokemonCaughtCountLabelText.setOrigin(0, 0);
     this.pokemonCaughtCountLabelText.setVisible(false);
     this.starterSelectContainer.add(this.pokemonCaughtCountLabelText);
 
-    this.pokemonCaughtCountText = addTextObject(this.scene, 58, 144, '0/0 (0)', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonCaughtCountText = addTextObject(this.scene, 58, 144, '0/0 (0)', TextStyle.SUMMARY, { fontSize: '56px' });
     this.pokemonCaughtCountText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonCaughtCountText);
 
@@ -261,7 +256,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     startLabel.setOrigin(0.5, 0);
     this.starterSelectContainer.add(startLabel);
 
-    this.startCursorObj = this.scene.add.nineslice(111, 160, 'select_cursor', null, 26, 15, 6, 6, 6, 6);
+    this.startCursorObj = this.scene.add.nineslice(111, 160, 'select_cursor', null, 26, 15, 1, 1, 1, 1);
     this.startCursorObj.setVisible(false);
     this.startCursorObj.setOrigin(0, 0);
     this.starterSelectContainer.add(this.startCursorObj);
@@ -360,7 +355,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonEggMovesContainer = this.scene.add.container(102, 85);
     this.pokemonEggMovesContainer.setScale(0.375);
 
-    const eggMovesLabel = addTextObject(this.scene, -46, 0, 'Egg Moves', TextStyle.SUMMARY_ALT);
+    const eggMovesLabel = addTextObject(this.scene, -46, 0, 'Egg Moves', TextStyle.SUMMARY);
     eggMovesLabel.setOrigin(0.5, 0);
     
     this.pokemonEggMovesContainer.add(eggMovesLabel);
@@ -867,8 +862,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               textStyle = TextStyle.SUMMARY_GOLD;
               break;
           }
-          this.starterValueLabels[s].setColor(this.getTextColor(textStyle));
-          this.starterValueLabels[s].setShadowColor(this.getTextColor(textStyle, true));
+          this.starterValueLabels[s].setColor(getTextColor(textStyle));
+          this.starterValueLabels[s].setShadowColor(getTextColor(textStyle, true));
         }
         this.starterValueLabels[s].setVisible(slotVisible);
         this.shinyIcons[s].setVisible(slotVisible && !!(this.scene.gameData.dexData[speciesId].caughtAttr & DexAttr.SHINY));
@@ -1061,8 +1056,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       }
 
       this.shinyOverlay.setVisible(shiny);
-      this.pokemonNumberText.setColor(this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, false));
-      this.pokemonNumberText.setShadowColor(this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, true));
+      this.pokemonNumberText.setColor(getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY));
+      this.pokemonNumberText.setShadowColor(getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, true));
 
       if (forSeen ? this.speciesStarterDexEntry?.seenAttr : this.speciesStarterDexEntry?.caughtAttr) {
         let starterIndex = -1;
@@ -1116,8 +1111,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         this.pokemonAbilityText.setText(allAbilities[ability].name);
 
         const isHidden = ability === this.lastSpecies.abilityHidden;
-        this.pokemonAbilityText.setColor(this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD));
-        this.pokemonAbilityText.setShadowColor(this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD, true));
+        this.pokemonAbilityText.setColor(getTextColor(!isHidden ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD));
+        this.pokemonAbilityText.setShadowColor(getTextColor(!isHidden ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true));
 
         this.pokemonNatureText.setText(getNatureName(natureIndex as unknown as Nature, true, true));
 
@@ -1151,8 +1146,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       }
     } else {
       this.shinyOverlay.setVisible(false);
-      this.pokemonNumberText.setColor(this.getTextColor(TextStyle.SUMMARY));
-      this.pokemonNumberText.setShadowColor(this.getTextColor(TextStyle.SUMMARY, true));
+      this.pokemonNumberText.setColor(getTextColor(TextStyle.SUMMARY));
+      this.pokemonNumberText.setShadowColor(getTextColor(TextStyle.SUMMARY, true));
       this.pokemonGenderText.setText('');
       this.pokemonAbilityText.setText('');
       this.pokemonNatureText.setText('');
@@ -1205,8 +1200,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     if (newValueStr.startsWith('0.'))
       newValueStr = newValueStr.slice(1);
     this.valueLimitLabel.setText(`${newValueStr}/10`);
-    this.valueLimitLabel.setColor(this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK));
-    this.valueLimitLabel.setShadowColor(this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK, true));
+    this.valueLimitLabel.setColor(getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK));
+    this.valueLimitLabel.setShadowColor(getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK, true));
     if (overLimit) {
       this.scene.time.delayedCall(Utils.fixedInt(500), () => this.tryUpdateValue());
       return false;
diff --git a/src/ui/stats-container.ts b/src/ui/stats-container.ts
index 014465805..ae3776636 100644
--- a/src/ui/stats-container.ts
+++ b/src/ui/stats-container.ts
@@ -70,7 +70,7 @@ export class StatsContainer extends Phaser.GameObjects.Container {
         let label = ivs[i].toString();
         if (this.showDiff && originalIvs) {
           if (originalIvs[i] < ivs[i])
-            label += ` ([color=${getTextColor(TextStyle.SUMMARY_BLUE, false, (this.scene as BattleScene).uiTheme)}][shadow=${getTextColor(TextStyle.SUMMARY_BLUE, true, (this.scene as BattleScene).uiTheme)}]+${ivs[i] - originalIvs[i]}[/shadow][/color])`;
+            label += ` ([color=${getTextColor(TextStyle.SUMMARY_BLUE)}][shadow=${getTextColor(TextStyle.SUMMARY_BLUE, true)}]+${ivs[i] - originalIvs[i]}[/shadow][/color])`;
           else
             label += ' (-)';
         }
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index 97aea72d4..71babf9f9 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -8,7 +8,7 @@ import { TextStyle, addBBCodeTextObject, addTextObject, getBBCodeFrag, getTextCo
 import Move, { MoveCategory } from "../data/move";
 import { getPokeballAtlasKey } from "../data/pokeball";
 import { getGenderColor, getGenderSymbol } from "../data/gender";
-import { getLevelRelExp, getLevelTotalExp } from "../data/exp";
+import { getLevelTotalExp } from "../data/exp";
 import { Stat, getStatName } from "../data/pokemon-stat";
 import { PokemonHeldItemModifier } from "../modifier/modifier";
 import { StatusEffect } from "../data/status-effect";
@@ -119,11 +119,11 @@ export default class SummaryUiHandler extends UiHandler {
     this.pokeball.setOrigin(0, 1);
     this.summaryContainer.add(this.pokeball);
 
-    this.levelText = addTextObject(this.scene, 36, -17, '', TextStyle.SUMMARY_ALT);
+    this.levelText = addTextObject(this.scene, 36, -18, '', TextStyle.SUMMARY);
     this.levelText.setOrigin(0, 1);
     this.summaryContainer.add(this.levelText);
 
-    this.genderText = addTextObject(this.scene, 96, -17, '', TextStyle.SUMMARY);
+    this.genderText = addTextObject(this.scene, 96, -18, '', TextStyle.SUMMARY);
     this.genderText.setOrigin(0, 1);
     this.summaryContainer.add(this.genderText);
 
@@ -160,11 +160,11 @@ export default class SummaryUiHandler extends UiHandler {
 
     this.moveEffectContainer.add(moveEffectLabels);
 
-    this.movePowerText = addTextObject(this.scene, 99, 27, '0', TextStyle.WINDOW_ALT);
+    this.movePowerText = addTextObject(this.scene, 99, 27, '0', TextStyle.WINDOW);
     this.movePowerText.setOrigin(1, 1);
     this.moveEffectContainer.add(this.movePowerText);
 
-    this.moveAccuracyText = addTextObject(this.scene, 99, 43, '0', TextStyle.WINDOW_ALT);
+    this.moveAccuracyText = addTextObject(this.scene, 99, 43, '0', TextStyle.WINDOW);
     this.moveAccuracyText.setOrigin(1, 1);
     this.moveEffectContainer.add(this.moveAccuracyText);
 
@@ -206,8 +206,8 @@ export default class SummaryUiHandler extends UiHandler {
     this.shinyOverlay.setVisible(this.pokemon.isShiny());
 
     this.numberText.setText(Utils.padInt(this.pokemon.species.speciesId, 4));
-    this.numberText.setColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD));
-    this.numberText.setShadowColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true));
+    this.numberText.setColor(getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD));
+    this.numberText.setShadowColor(getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true));
 
     this.pokemonSprite.play(this.pokemon.getSpriteKey(true));
     this.pokemonSprite.pipelineData['teraColor'] = getTypeRgb(this.pokemon.getTeraType());
@@ -502,7 +502,7 @@ export default class SummaryUiHandler extends UiHandler {
         const profileContainer = this.scene.add.container(0, -pageBg.height);
         pageContainer.add(profileContainer);
 
-        const trainerLabel = addTextObject(this.scene, 7, 12, 'OT/', TextStyle.SUMMARY_ALT);
+        const trainerLabel = addTextObject(this.scene, 7, 12, 'OT/', TextStyle.SUMMARY);
         trainerLabel.setOrigin(0, 0);
         profileContainer.add(trainerLabel);
 
@@ -511,11 +511,11 @@ export default class SummaryUiHandler extends UiHandler {
         trainerText.setOrigin(0, 0);
         profileContainer.add(trainerText);
 
-        const trainerIdText = addTextObject(this.scene, 174, 12, this.scene.gameData.trainerId.toString(), TextStyle.SUMMARY_ALT);
+        const trainerIdText = addTextObject(this.scene, 174, 12, this.scene.gameData.trainerId.toString(), TextStyle.SUMMARY);
         trainerIdText.setOrigin(0, 0);
         profileContainer.add(trainerIdText);
 
-        const typeLabel = addTextObject(this.scene, 7, 28, 'Type/', TextStyle.WINDOW_ALT);
+        const typeLabel = addTextObject(this.scene, 7, 28, 'Type/', TextStyle.WINDOW);
         typeLabel.setOrigin(0, 0);
         profileContainer.add(typeLabel);
 
@@ -542,11 +542,11 @@ export default class SummaryUiHandler extends UiHandler {
 
         const ability = this.pokemon.getAbility(true);
 
-        const abilityNameText = addTextObject(this.scene, 7, 66, ability.name, TextStyle.SUMMARY_ALT);
+        const abilityNameText = addTextObject(this.scene, 7, 66, ability.name, TextStyle.SUMMARY);
         abilityNameText.setOrigin(0, 1);
         profileContainer.add(abilityNameText);
 
-        const abilityDescriptionText = addTextObject(this.scene, 7, 69, ability.description, TextStyle.WINDOW_ALT, { wordWrap: { width: 1224 } });
+        const abilityDescriptionText = addTextObject(this.scene, 7, 69, ability.description, TextStyle.WINDOW, { wordWrap: { width: 1224 } });
         abilityDescriptionText.setOrigin(0, 0);
         profileContainer.add(abilityDescriptionText);
 
@@ -574,9 +574,9 @@ export default class SummaryUiHandler extends UiHandler {
           });
         }
 
-        let memoString = `${getBBCodeFrag(Utils.toReadableString(Nature[this.pokemon.nature]), TextStyle.SUMMARY_RED)}${getBBCodeFrag(' nature,', TextStyle.WINDOW_ALT)}\n${getBBCodeFrag(`${this.pokemon.metBiome === -1 ? 'apparently ' : ''}met at Lv`, TextStyle.WINDOW_ALT)}${getBBCodeFrag(this.pokemon.metLevel.toString(), TextStyle.SUMMARY_RED)}${getBBCodeFrag(',', TextStyle.WINDOW_ALT)}\n${getBBCodeFrag(getBiomeName(this.pokemon.metBiome), TextStyle.SUMMARY_RED)}${getBBCodeFrag('.', TextStyle.WINDOW_ALT)}`;
+        let memoString = `${getBBCodeFrag(Utils.toReadableString(Nature[this.pokemon.nature]), TextStyle.SUMMARY_RED)}${getBBCodeFrag(' nature,', TextStyle.WINDOW)}\n${getBBCodeFrag(`${this.pokemon.metBiome === -1 ? 'apparently ' : ''}met at Lv`, TextStyle.WINDOW)}${getBBCodeFrag(this.pokemon.metLevel.toString(), TextStyle.SUMMARY_RED)}${getBBCodeFrag(',', TextStyle.WINDOW)}\n${getBBCodeFrag(getBiomeName(this.pokemon.metBiome), TextStyle.SUMMARY_RED)}${getBBCodeFrag('.', TextStyle.WINDOW)}`;
        
-        const memoText = addBBCodeTextObject(this.scene, 7, 113, memoString, TextStyle.WINDOW_ALT);
+        const memoText = addBBCodeTextObject(this.scene, 7, 113, memoString, TextStyle.WINDOW);
         memoText.setOrigin(0, 0);
         profileContainer.add(memoText);
         break;
@@ -603,7 +603,7 @@ export default class SummaryUiHandler extends UiHandler {
             ? Utils.formatStat(this.pokemon.stats[s])
             : `${Utils.formatStat(this.pokemon.hp, true)}/${Utils.formatStat(this.pokemon.getMaxHp(), true)}`;
 
-          const statValue = addTextObject(this.scene, 120 + 88 * colIndex, 56 + 16 * rowIndex, statValueText, TextStyle.WINDOW_ALT);
+          const statValue = addTextObject(this.scene, 120 + 88 * colIndex, 56 + 16 * rowIndex, statValueText, TextStyle.WINDOW);
           statValue.setOrigin(1, 0);
           statsContainer.add(statValue);
         });
@@ -622,8 +622,8 @@ export default class SummaryUiHandler extends UiHandler {
           icon.on('pointerout', () => (this.scene as BattleScene).ui.hideTooltip());
         });
 
-        const relLvExp = getLevelRelExp(this.pokemon.level + 1, this.pokemon.species.growthRate);
-        const expRatio = this.pokemon.level < this.scene.getMaxExpLevel() ? this.pokemon.levelExp / relLvExp : 0;
+        const totalLvExp = getLevelTotalExp(this.pokemon.level, this.pokemon.species.growthRate);
+        const expRatio = this.pokemon.level < this.scene.getMaxExpLevel() ? this.pokemon.levelExp / totalLvExp : 0;
 
         const expLabel = addTextObject(this.scene, 6, 112, 'EXP. Points', TextStyle.SUMMARY);
         expLabel.setOrigin(0, 0);
@@ -633,14 +633,14 @@ export default class SummaryUiHandler extends UiHandler {
         nextLvExpLabel.setOrigin(0, 0);
         statsContainer.add(nextLvExpLabel);
 
-        const expText = addTextObject(this.scene, 208, 112, this.pokemon.exp.toString(), TextStyle.WINDOW_ALT);
+        const expText = addTextObject(this.scene, 208, 112, this.pokemon.exp.toString(), TextStyle.WINDOW);
         expText.setOrigin(1, 0);
         statsContainer.add(expText);
 
         const nextLvExp = this.pokemon.level < this.scene.getMaxExpLevel()
           ? getLevelTotalExp(this.pokemon.level + 1, this.pokemon.species.growthRate) - this.pokemon.exp
           : 0;
-        const nextLvExpText = addTextObject(this.scene, 208, 128, nextLvExp.toString(), TextStyle.WINDOW_ALT);
+        const nextLvExpText = addTextObject(this.scene, 208, 128, nextLvExp.toString(), TextStyle.WINDOW);
         nextLvExpText.setOrigin(1, 0);
         statsContainer.add(nextLvExpText);
 
@@ -724,7 +724,7 @@ export default class SummaryUiHandler extends UiHandler {
           moveRowContainer.add(ppText);
         }
 
-        this.moveDescriptionText = addTextObject(this.scene, 2, 84, '', TextStyle.WINDOW_ALT, { wordWrap: { width: 1212 } });
+        this.moveDescriptionText = addTextObject(this.scene, 2, 84, '', TextStyle.WINDOW, { wordWrap: { width: 1212 } });
         this.movesContainer.add(this.moveDescriptionText);
 
         const moveDescriptionTextMaskRect = this.scene.make.graphics({});
diff --git a/src/ui/text.ts b/src/ui/text.ts
index 21672847f..d715eff47 100644
--- a/src/ui/text.ts
+++ b/src/ui/text.ts
@@ -2,18 +2,14 @@ import BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodete
 import InputText from "phaser3-rex-plugins/plugins/inputtext";
 import { ModifierTier } from "../modifier/modifier-tier";
 import { EggTier } from "../data/enums/egg-type";
-import BattleScene from "../battle-scene";
-import { UiTheme } from "../enums/ui-theme";
 
 export enum TextStyle {
   MESSAGE,
   WINDOW,
-  WINDOW_ALT,
   BATTLE_INFO,
   PARTY,
   PARTY_RED,
   SUMMARY,
-  SUMMARY_ALT,
   SUMMARY_RED,
   SUMMARY_BLUE,
   SUMMARY_PINK,
@@ -26,7 +22,7 @@ export enum TextStyle {
 };
 
 export function addTextObject(scene: Phaser.Scene, x: number, y: number, content: string, style: TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle): Phaser.GameObjects.Text {
-  const [ styleOptions, shadowColor, shadowSize ] = getTextStyleOptions(style, (scene as BattleScene).uiTheme, extraStyleOptions);
+  const [ styleOptions, shadowColor, shadowSize ] = getTextStyleOptions(style, extraStyleOptions);
 
   const ret = scene.add.text(x, y, content, styleOptions);
   ret.setScale(0.1666666667);
@@ -38,7 +34,7 @@ export function addTextObject(scene: Phaser.Scene, x: number, y: number, content
 }
 
 export function addBBCodeTextObject(scene: Phaser.Scene, x: number, y: number, content: string, style: TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle): BBCodeText {
-  const [ styleOptions, shadowColor, shadowSize ] = getTextStyleOptions(style, (scene as BattleScene).uiTheme, extraStyleOptions);
+  const [ styleOptions, shadowColor, shadowSize ] = getTextStyleOptions(style, extraStyleOptions);
 
   const ret = new BBCodeText(scene, x, y, content, styleOptions as BBCodeText.TextStyle);
   scene.add.existing(ret);
@@ -51,7 +47,7 @@ export function addBBCodeTextObject(scene: Phaser.Scene, x: number, y: number, c
 }
 
 export function addTextInputObject(scene: Phaser.Scene, x: number, y: number, width: number, height: number, style: TextStyle, extraStyleOptions?: InputText.IConfig): InputText {
-  const [ styleOptions ] = getTextStyleOptions(style, (scene as BattleScene).uiTheme, extraStyleOptions);
+  const [ styleOptions ] = getTextStyleOptions(style, extraStyleOptions);
 
   const ret = new InputText(scene, x, y, width, height, styleOptions as InputText.IConfig);
   scene.add.existing(ret);
@@ -60,14 +56,14 @@ export function addTextInputObject(scene: Phaser.Scene, x: number, y: number, wi
   return ret;
 }
 
-function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle): [ Phaser.Types.GameObjects.Text.TextStyle | InputText.IConfig, string, integer ] {
+function getTextStyleOptions(style: TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle): [ Phaser.Types.GameObjects.Text.TextStyle | InputText.IConfig, string, integer ] {
   let shadowColor: string;
   let shadowSize = 6;
 
   let styleOptions: Phaser.Types.GameObjects.Text.TextStyle = {
     fontFamily: 'emerald',
     fontSize: '96px',
-    color: getTextColor(style, false, uiTheme),
+    color: getTextColor(style, false),
     padding: {
       bottom: 6
     }
@@ -101,7 +97,7 @@ function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraStyleOptio
       break;
   }
 
-  shadowColor = getTextColor(style, true, uiTheme);
+  shadowColor = getTextColor(style, true);
 
   if (extraStyleOptions) {
     if (extraStyleOptions.fontSize) {
@@ -118,31 +114,21 @@ export function getBBCodeFrag(content: string, textStyle: TextStyle): string {
   return `[color=${getTextColor(textStyle)}][shadow=${getTextColor(textStyle, true)}]${content}`;
 }
 
-export function getTextColor(textStyle: TextStyle, shadow?: boolean, uiTheme: UiTheme = UiTheme.DEFAULT): string {
+export function getTextColor(textStyle: TextStyle, shadow?: boolean): string {
   switch (textStyle) {
     case TextStyle.MESSAGE:
       return !shadow ? '#f8f8f8' : '#6b5a73';
     case TextStyle.WINDOW:
     case TextStyle.TOOLTIP_CONTENT:
-      if (uiTheme)
-        return !shadow ? '#484848' : '#d0d0c8';
-      return !shadow ? '#f8f8f8' : '#6b5a73';
-    case TextStyle.WINDOW_ALT:
       return !shadow ? '#484848' : '#d0d0c8';
     case TextStyle.BATTLE_INFO:
-      if (uiTheme)
-        return !shadow ? '#404040' : '#ded6b5';
-      return !shadow ? '#f8f8f8' : '#6b5a73';
+      return !shadow ? '#404040' : '#ded6b5';
     case TextStyle.PARTY:
       return !shadow ? '#f8f8f8' : '#707070';
     case TextStyle.PARTY_RED:
       return !shadow ? '#f89890' : '#984038';
     case TextStyle.SUMMARY:
       return !shadow ? '#ffffff' : '#636363';
-    case TextStyle.SUMMARY_ALT:
-      if (uiTheme)
-        return !shadow ? '#ffffff' : '#636363';
-      return !shadow ? '#484848' : '#d0d0c8';
     case TextStyle.SUMMARY_RED:
     case TextStyle.TOOLTIP_TITLE:
       return !shadow ? '#e70808' : '#ffbd73';
diff --git a/src/ui/ui-handler.ts b/src/ui/ui-handler.ts
index e3c94b764..16c7b3756 100644
--- a/src/ui/ui-handler.ts
+++ b/src/ui/ui-handler.ts
@@ -1,5 +1,4 @@
 import BattleScene, { Button } from "../battle-scene";
-import { TextStyle, getTextColor } from "./text";
 import UI, { Mode } from "./ui";
 
 export default abstract class UiHandler {
@@ -27,10 +26,6 @@ export default abstract class UiHandler {
     return this.scene.ui;
   }
 
-  getTextColor(style: TextStyle, shadow: boolean = false): string {
-    return getTextColor(style, shadow, this.scene.uiTheme);
-  }
-
   getCursor(): integer {
     return this.cursor;
   }