721 files changed, 265 insertions, 300 deletions

diff --git a/src/engine/home.asm b/src/engine/home.asm
index f33ec2f..90b0af1 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -6237,7 +6237,7 @@ DrawDuelBoxMessage: ; 2167 (0:2167)
 	jp FillRectangle
 
 ; load the tiles for the latin, katakana, and hiragana fonts into VRAM
-; from gfx/fonts/full_width/3.1bpp and gfx/fonts/full_width/4.t3.1bpp
+; from gfx/fonts/full_width/3.1bpp and gfx/fonts/full_width/4.1bpp
 LoadFullWidthFontTiles: ; 2189 (0:2189)
 	ld hl, FullWidthFonts + $3cc tiles_1bpp - $4000
 	ld a, BANK(Fonts); BANK(DuelGraphics)
diff --git a/src/gfx.asm b/src/gfx.asm
index d568802..e3b97cf 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -11,7 +11,7 @@ INCBIN "gfx/fonts/full_width/0_2_digits_kanji1.1bpp"
 INCBIN "gfx/fonts/full_width/1_kanji2.1bpp"
 INCBIN "gfx/fonts/full_width/2_kanji3.1bpp"
 INCBIN "gfx/fonts/full_width/3.1bpp"
-INCBIN "gfx/fonts/full_width/4.t3.1bpp"
+INCBIN "gfx/fonts/full_width/4.1bpp"
 
 HalfWidthFont:: ; 76668 (1d:6668)
 INCBIN "gfx/fonts/half_width.1bpp"
@@ -25,17 +25,17 @@ DuelCardHeaderGraphics:: ; 76ce8 (1d:6ce8)
 INCBIN "gfx/duel/card_headers.2bpp"
 
 DuelDmgSgbSymbolGraphics:: ; 76fe8 (1d:6fe8)
-INCBIN "gfx/duel/dmg_sgb_symbols.t7.2bpp"
+INCBIN "gfx/duel/dmg_sgb_symbols.2bpp"
 
 DuelCgbSymbolGraphics:: ; 777f8 (1d:77f8)
-INCBIN "gfx/duel/cgb_symbols.t7.2bpp", $0, $808
+INCBIN "gfx/duel/cgb_symbols.2bpp", $0, $808
 
 SECTION "Gfx 2", ROMX
 
-INCBIN "gfx/duel/cgb_symbols.t7.2bpp", $808, $8
+INCBIN "gfx/duel/cgb_symbols.2bpp", $808, $8
 
 DuelOtherGraphics:: ; 78008 (1e:4008)
-INCBIN "gfx/duel/other.t7.2bpp"
+INCBIN "gfx/duel/other.2bpp"
 
 DuelBoxMessages:: ; 78318 (1e:4318)
 INCBIN "gfx/duel/box_messages.2bpp"
@@ -50,7 +50,7 @@ SECTION "Gfx 3", ROMX
 
 IshiharaTilesetGfx: ; 87828 (21:7828)
 	dw $4d
-	INCBIN "gfx/tilesets/ishihara.t3.2bpp"
+	INCBIN "gfx/tilesets/ishihara.2bpp"
 
 SolidTiles1: ; 87cfa (21:7cfa)
 	dw $4
@@ -78,35 +78,35 @@ SECTION "Gfx 4", ROMX
 
 OverworldMapTiles: ; 88000 (22:4000)
 	dw $c1
-	INCBIN "gfx/overworld_map.t15.2bpp"
+	INCBIN "gfx/overworld_map.2bpp"
 
 MasonLaboratoryTilesetGfx: ; 88c12 (22:4c12)
 	dw $97
-	INCBIN "gfx/tilesets/masonlaboratory.t9.2bpp"
+	INCBIN "gfx/tilesets/masonlaboratory.2bpp"
 
 ClubEntranceTilesetGfx: ; 89584 (22:5584)
 	dw $81
-	INCBIN "gfx/tilesets/clubentrance.t15.2bpp"
+	INCBIN "gfx/tilesets/clubentrance.2bpp"
 
 ClubLobbyTilesetGfx: ; 89d96 (22:5d96)
 	dw $78
-	INCBIN "gfx/tilesets/clublobby.t8.2bpp"
+	INCBIN "gfx/tilesets/clublobby.2bpp"
 
 FightingClubTilesetGfx: ; 8a518 (22:6518)
 	dw $63
-	INCBIN "gfx/tilesets/fightingclub.t13.2bpp"
+	INCBIN "gfx/tilesets/fightingclub.2bpp"
 
 RockClubTilesetGfx: ; 8ab4a (22:6b4a)
 	dw $3c
-	INCBIN "gfx/tilesets/rockclub.t4.2bpp"
+	INCBIN "gfx/tilesets/rockclub.2bpp"
 
 WaterClubTilesetGfx: ; 8af0c (22:6f0c)
 	dw $a1
-	INCBIN "gfx/tilesets/waterclub.t15.2bpp"
+	INCBIN "gfx/tilesets/waterclub.2bpp"
 
 GrassClubTilesetGfx: ; 8b91e (22:791e)
 	dw $57
-	INCBIN "gfx/tilesets/grassclub.t9.2bpp"
+	INCBIN "gfx/tilesets/grassclub.2bpp"
 
 OWSpritePlayer: ; 8be90 (22:7e90)
 	dw $14
@@ -122,35 +122,35 @@ SECTION "Gfx 5", ROMX
 
 LightningClubTilesetGfx: ; 8c000 (23:4000)
 	dw $83
-	INCBIN "gfx/tilesets/lightningclub.t13.2bpp"
+	INCBIN "gfx/tilesets/lightningclub.2bpp"
 
 PsychicClubTilesetGfx: ; 8c832 (23:4832)
 	dw $3a
-	INCBIN "gfx/tilesets/psychicclub.t6.2bpp"
+	INCBIN "gfx/tilesets/psychicclub.2bpp"
 
 ScienceClubTilesetGfx: ; 8cbd4 (23:4bd4)
 	dw $52
-	INCBIN "gfx/tilesets/scienceclub.t14.2bpp"
+	INCBIN "gfx/tilesets/scienceclub.2bpp"
 
 FireClubTilesetGfx: ; 8d0f6 (23:50f6)
 	dw $57
-	INCBIN "gfx/tilesets/fireclub.t9.2bpp"
+	INCBIN "gfx/tilesets/fireclub.2bpp"
 
 ChallengeHallTilesetGfx: ; 8d668 (23:5668)
 	dw $9d
-	INCBIN "gfx/tilesets/challengehall.t3.2bpp"
+	INCBIN "gfx/tilesets/challengehall.2bpp"
 
 PokemonDomeEntranceTilesetGfx: ; 8e03a (23:603a)
 	dw $4e
-	INCBIN "gfx/tilesets/pokemondomeentrance.t2.2bpp"
+	INCBIN "gfx/tilesets/pokemondomeentrance.2bpp"
 
 PokemonDomeTilesetGfx: ; 8e51c (23:651c)
 	dw $cf
-	INCBIN "gfx/tilesets/pokemondome.t1.2bpp"
+	INCBIN "gfx/tilesets/pokemondome.2bpp"
 
 HallOfHonorTilesetGfx: ; 8f20e (23:720e)
 	dw $79
-	INCBIN "gfx/tilesets/hallofhonor.t7.2bpp"
+	INCBIN "gfx/tilesets/hallofhonor.2bpp"
 
 MedalGfx: ; 8f9a0 (23:79a0)
 	dw $48
@@ -187,15 +187,15 @@ SECTION "Gfx 6", ROMX
 
 CardPop1Gfx: ; 90000 (24:4000)
 	dw $bd
-	INCBIN "gfx/cardpop/cardpop1.t3.2bpp"
+	INCBIN "gfx/cardpop/cardpop1.2bpp"
 
 CardPop2Gfx: ; 90bd2 (24:4bd2)
 	dw $6d
-	INCBIN "gfx/cardpop/cardpop2.t3.2bpp"
+	INCBIN "gfx/cardpop/cardpop2.2bpp"
 
 CardPop3Gfx: ; 912a4 (24:52a4)
 	dw $5d
-	INCBIN "gfx/cardpop/cardpop3.t3.2bpp"
+	INCBIN "gfx/cardpop/cardpop3.2bpp"
 
 Colosseum1Gfx: ; 91876 (24:5876)
 	dw $60
@@ -203,7 +203,7 @@ Colosseum1Gfx: ; 91876 (24:5876)
 
 Colosseum2Gfx: ; 91e78 (24:5e78)
 	dw $56
-	INCBIN "gfx/booster_packs/colosseum2.t10.2bpp"
+	INCBIN "gfx/booster_packs/colosseum2.2bpp"
 
 Evolution1Gfx: ; 923da (24:63da)
 	dw $60
@@ -211,7 +211,7 @@ Evolution1Gfx: ; 923da (24:63da)
 
 Evolution2Gfx: ; 929dc (24:69dc)
 	dw $56
-	INCBIN "gfx/booster_packs/evolution2.t10.2bpp"
+	INCBIN "gfx/booster_packs/evolution2.2bpp"
 
 Mystery1Gfx: ; 92f3e (24:6f3e)
 	dw $60
@@ -219,7 +219,7 @@ Mystery1Gfx: ; 92f3e (24:6f3e)
 
 Mystery2Gfx: ; 93540 (24:7540)
 	dw $56
-	INCBIN "gfx/booster_packs/mystery2.t10.2bpp"
+	INCBIN "gfx/booster_packs/mystery2.2bpp"
 
 RonaldGfx: ; 93aa2 (24:7aa2)
 	dw $24
@@ -253,7 +253,7 @@ Laboratory1Gfx: ; 94000 (25:4000)
 
 Laboratory2Gfx: ; 94602 (25:4602)
 	dw $56
-	INCBIN "gfx/booster_packs/laboratory2.t10.2bpp"
+	INCBIN "gfx/booster_packs/laboratory2.2bpp"
 
 CharizardIntro1Gfx: ; 94b64 (25:4b64)
 	dw $60
@@ -281,11 +281,11 @@ AerodactylIntro2Gfx: ; 9696e (25:696e)
 
 Titlescreen1Gfx: ; 96f70 (25:6f70)
 	dw $61
-	INCBIN "gfx/titlescreen/titlescreen1.t15.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen1.2bpp"
 
 Titlescreen2Gfx: ; 97582 (25:7582)
 	dw $61
-	INCBIN "gfx/titlescreen/titlescreen2.t15.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen2.2bpp"
 
 CompaniesGfx: ; 97b94 (25:7b94)
 	dw $31
@@ -301,19 +301,19 @@ SECTION "Gfx 8", ROMX
 
 Titlescreen3Gfx: ; 98000 (26:4000)
 	dw $f4
-	INCBIN "gfx/titlescreen/titlescreen3.t12.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen3.2bpp"
 
 Titlescreen4Gfx: ; 98f42 (26:4f42)
 	dw $13b
-	INCBIN "gfx/titlescreen/titlescreen4.t5.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen4.2bpp"
 
 Titlescreen5Gfx: ; 9a2f4 (26:62f4)
 	dw $dc
-	INCBIN "gfx/titlescreen/titlescreen5.t4.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen5.2bpp"
 
 Titlescreen6Gfx: ; 9b0b6 (26:70b6)
 	dw $d4
-	INCBIN "gfx/titlescreen/titlescreen6.t12.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen6.2bpp"
 
 DoctorMasonOWGfx: ; 9bdf8 (26:7df8)
 	dw $14
@@ -857,7 +857,7 @@ Duel50Gfx: ; a81f8 (2a:41f8)
 
 Duel51Gfx: ; a836a (2a:436a)
 	dw $36
-	INCBIN "gfx/duel/anims/51.t10.2bpp"
+	INCBIN "gfx/duel/anims/51.2bpp"
 
 Duel52Gfx: ; a86cc (2a:46cc)
 	dw $0b
@@ -926,935 +926,935 @@ SECTION "Card Gfx 1", ROMX
 CardGraphics:: ; c4000 (31:4000)
 
 GrassEnergyCardGfx:: ; c4000 (31:4000)
-	INCBIN "gfx/cards/grassenergy.8x6.2bpp"
+	INCBIN "gfx/cards/grassenergy.2bpp"
 	INCBIN "gfx/cards/grassenergy.pal"
 
 FireEnergyCardGfx:: ; c4308 (31:4308)
-	INCBIN "gfx/cards/fireenergy.8x6.2bpp"
+	INCBIN "gfx/cards/fireenergy.2bpp"
 	INCBIN "gfx/cards/fireenergy.pal"
 
 WaterEnergyCardGfx:: ; c4610 (31:4610)
-	INCBIN "gfx/cards/waterenergy.8x6.2bpp"
+	INCBIN "gfx/cards/waterenergy.2bpp"
 	INCBIN "gfx/cards/waterenergy.pal"
 
 LightningEnergyCardGfx:: ; c4918 (31:4918)
-	INCBIN "gfx/cards/lightningenergy.8x6.2bpp"
+	INCBIN "gfx/cards/lightningenergy.2bpp"
 	INCBIN "gfx/cards/lightningenergy.pal"
 
 FightingEnergyCardGfx:: ; c4c20 (31:4c20)
-	INCBIN "gfx/cards/fightingenergy.8x6.2bpp"
+	INCBIN "gfx/cards/fightingenergy.2bpp"
 	INCBIN "gfx/cards/fightingenergy.pal"
 
 PsychicEnergyCardGfx:: ; c4f28 (31:4f28)
-	INCBIN "gfx/cards/psychicenergy.8x6.2bpp"
+	INCBIN "gfx/cards/psychicenergy.2bpp"
 	INCBIN "gfx/cards/psychicenergy.pal"
 
 DoubleColorlessEnergyCardGfx:: ; c5230 (31:5230)
-	INCBIN "gfx/cards/doublecolorlessenergy.8x6.2bpp"
+	INCBIN "gfx/cards/doublecolorlessenergy.2bpp"
 	INCBIN "gfx/cards/doublecolorlessenergy.pal"
 
 BulbasaurCardGfx:: ; c5538 (31:5538)
-	INCBIN "gfx/cards/bulbasaur.8x6.2bpp"
+	INCBIN "gfx/cards/bulbasaur.2bpp"
 	INCBIN "gfx/cards/bulbasaur.pal"
 
 IvysaurCardGfx:: ; c5840 (31:5840)
-	INCBIN "gfx/cards/ivysaur.8x6.2bpp"
+	INCBIN "gfx/cards/ivysaur.2bpp"
 	INCBIN "gfx/cards/ivysaur.pal"
 
 Venusaur1CardGfx:: ; c5b48 (31:5b48)
-	INCBIN "gfx/cards/venusaur1.8x6.2bpp"
+	INCBIN "gfx/cards/venusaur1.2bpp"
 	INCBIN "gfx/cards/venusaur1.pal"
 
 Venusaur2CardGfx:: ; c5e50 (31:5e50)
-	INCBIN "gfx/cards/venusaur2.8x6.2bpp"
+	INCBIN "gfx/cards/venusaur2.2bpp"
 	INCBIN "gfx/cards/venusaur2.pal"
 
 CaterpieCardGfx:: ; c6158 (31:6158)
-	INCBIN "gfx/cards/caterpie.8x6.2bpp"
+	INCBIN "gfx/cards/caterpie.2bpp"
 	INCBIN "gfx/cards/caterpie.pal"
 
 MetapodCardGfx:: ; c6460 (31:6460)
-	INCBIN "gfx/cards/metapod.8x6.2bpp"
+	INCBIN "gfx/cards/metapod.2bpp"
 	INCBIN "gfx/cards/metapod.pal"
 
 ButterfreeCardGfx:: ; c6768 (31:6768)
-	INCBIN "gfx/cards/butterfree.8x6.2bpp"
+	INCBIN "gfx/cards/butterfree.2bpp"
 	INCBIN "gfx/cards/butterfree.pal"
 
 WeedleCardGfx:: ; c6a70 (31:6a70)
-	INCBIN "gfx/cards/weedle.8x6.2bpp"
+	INCBIN "gfx/cards/weedle.2bpp"
 	INCBIN "gfx/cards/weedle.pal"
 
 KakunaCardGfx:: ; c6d78 (31:6d78)
-	INCBIN "gfx/cards/kakuna.8x6.2bpp"
+	INCBIN "gfx/cards/kakuna.2bpp"
 	INCBIN "gfx/cards/kakuna.pal"
 
 BeedrillCardGfx:: ; c7080 (31:7080)
-	INCBIN "gfx/cards/beedrill.8x6.2bpp"
+	INCBIN "gfx/cards/beedrill.2bpp"
 	INCBIN "gfx/cards/beedrill.pal"
 
 EkansCardGfx:: ; c7388 (31:7388)
-	INCBIN "gfx/cards/ekans.8x6.2bpp"
+	INCBIN "gfx/cards/ekans.2bpp"
 	INCBIN "gfx/cards/ekans.pal"
 
 ArbokCardGfx:: ; c7690 (31:7690)
-	INCBIN "gfx/cards/arbok.8x6.2bpp"
+	INCBIN "gfx/cards/arbok.2bpp"
 	INCBIN "gfx/cards/arbok.pal"
 
 NidoranFCardGfx:: ; c7998 (31:7998)
-	INCBIN "gfx/cards/nidoranf.8x6.2bpp"
+	INCBIN "gfx/cards/nidoranf.2bpp"
 	INCBIN "gfx/cards/nidoranf.pal"
 
 NidorinaCardGfx:: ; c7ca0 (31:7ca0)
-	INCBIN "gfx/cards/nidorina.8x6.2bpp"
+	INCBIN "gfx/cards/nidorina.2bpp"
 	INCBIN "gfx/cards/nidorina.pal"
 
 SECTION "Card Gfx 2", ROMX
 
 NidoqueenCardGfx:: ; c8000 (32:4000)
-	INCBIN "gfx/cards/nidoqueen.8x6.2bpp"
+	INCBIN "gfx/cards/nidoqueen.2bpp"
 	INCBIN "gfx/cards/nidoqueen.pal"
 
 NidoranMCardGfx:: ; c8308 (32:4308)
-	INCBIN "gfx/cards/nidoranm.8x6.2bpp"
+	INCBIN "gfx/cards/nidoranm.2bpp"
 	INCBIN "gfx/cards/nidoranm.pal"
 
 NidorinoCardGfx:: ; c8610 (32:4610)
-	INCBIN "gfx/cards/nidorino.8x6.2bpp"
+	INCBIN "gfx/cards/nidorino.2bpp"
 	INCBIN "gfx/cards/nidorino.pal"
 
 NidokingCardGfx:: ; c8918 (32:4918)
-	INCBIN "gfx/cards/nidoking.8x6.2bpp"
+	INCBIN "gfx/cards/nidoking.2bpp"
 	INCBIN "gfx/cards/nidoking.pal"
 
 ZubatCardGfx:: ; c8c20 (32:4c20)
-	INCBIN "gfx/cards/zubat.8x6.2bpp"
+	INCBIN "gfx/cards/zubat.2bpp"
 	INCBIN "gfx/cards/zubat.pal"
 
 GolbatCardGfx:: ; c8f28 (32:4f28)
-	INCBIN "gfx/cards/golbat.8x6.2bpp"
+	INCBIN "gfx/cards/golbat.2bpp"
 	INCBIN "gfx/cards/golbat.pal"
 
 OddishCardGfx:: ; c9230 (32:5230)
-	INCBIN "gfx/cards/oddish.8x6.2bpp"
+	INCBIN "gfx/cards/oddish.2bpp"
 	INCBIN "gfx/cards/oddish.pal"
 
 GloomCardGfx:: ; c9538 (32:5538)
-	INCBIN "gfx/cards/gloom.8x6.2bpp"
+	INCBIN "gfx/cards/gloom.2bpp"
 	INCBIN "gfx/cards/gloom.pal"
 
 VileplumeCardGfx:: ; c9840 (32:5840)
-	INCBIN "gfx/cards/vileplume.8x6.2bpp"
+	INCBIN "gfx/cards/vileplume.2bpp"
 	INCBIN "gfx/cards/vileplume.pal"
 
 ParasCardGfx:: ; c9b48 (32:5b48)
-	INCBIN "gfx/cards/paras.8x6.2bpp"
+	INCBIN "gfx/cards/paras.2bpp"
 	INCBIN "gfx/cards/paras.pal"
 
 ParasectCardGfx:: ; c9e50 (32:5e50)
-	INCBIN "gfx/cards/parasect.8x6.2bpp"
+	INCBIN "gfx/cards/parasect.2bpp"
 	INCBIN "gfx/cards/parasect.pal"
 
 VenonatCardGfx:: ; ca158 (32:6158)
-	INCBIN "gfx/cards/venonat.8x6.2bpp"
+	INCBIN "gfx/cards/venonat.2bpp"
 	INCBIN "gfx/cards/venonat.pal"
 
 VenomothCardGfx:: ; ca460 (32:6460)
-	INCBIN "gfx/cards/venomoth.8x6.2bpp"
+	INCBIN "gfx/cards/venomoth.2bpp"
 	INCBIN "gfx/cards/venomoth.pal"
 
 BellsproutCardGfx:: ; ca768 (32:6768)
-	INCBIN "gfx/cards/bellsprout.8x6.2bpp"
+	INCBIN "gfx/cards/bellsprout.2bpp"
 	INCBIN "gfx/cards/bellsprout.pal"
 
 WeepinbellCardGfx:: ; caa70 (32:6a70)
-	INCBIN "gfx/cards/weepinbell.8x6.2bpp"
+	INCBIN "gfx/cards/weepinbell.2bpp"
 	INCBIN "gfx/cards/weepinbell.pal"
 
 VictreebelCardGfx:: ; cad78 (32:6d78)
-	INCBIN "gfx/cards/victreebel.8x6.2bpp"
+	INCBIN "gfx/cards/victreebel.2bpp"
 	INCBIN "gfx/cards/victreebel.pal"
 
 GrimerCardGfx:: ; cb080 (32:7080)
-	INCBIN "gfx/cards/grimer.8x6.2bpp"
+	INCBIN "gfx/cards/grimer.2bpp"
 	INCBIN "gfx/cards/grimer.pal"
 
 MukCardGfx:: ; cb388 (32:7388)
-	INCBIN "gfx/cards/muk.8x6.2bpp"
+	INCBIN "gfx/cards/muk.2bpp"
 	INCBIN "gfx/cards/muk.pal"
 
 ExeggcuteCardGfx:: ; cb690 (32:7690)
-	INCBIN "gfx/cards/exeggcute.8x6.2bpp"
+	INCBIN "gfx/cards/exeggcute.2bpp"
 	INCBIN "gfx/cards/exeggcute.pal"
 
 ExeggutorCardGfx:: ; cb998 (32:7998)
-	INCBIN "gfx/cards/exeggutor.8x6.2bpp"
+	INCBIN "gfx/cards/exeggutor.2bpp"
 	INCBIN "gfx/cards/exeggutor.pal"
 
 KoffingCardGfx:: ; cbca0 (32:7ca0)
-	INCBIN "gfx/cards/koffing.8x6.2bpp"
+	INCBIN "gfx/cards/koffing.2bpp"
 	INCBIN "gfx/cards/koffing.pal"
 
 SECTION "Card Gfx 3", ROMX
 
 WeezingCardGfx:: ; cc000 (33:4000)
-	INCBIN "gfx/cards/weezing.8x6.2bpp"
+	INCBIN "gfx/cards/weezing.2bpp"
 	INCBIN "gfx/cards/weezing.pal"
 
 Tangela1CardGfx:: ; cc308 (33:4308)
-	INCBIN "gfx/cards/tangela1.8x6.2bpp"
+	INCBIN "gfx/cards/tangela1.2bpp"
 	INCBIN "gfx/cards/tangela1.pal"
 
 Tangela2CardGfx:: ; cc610 (33:4610)
-	INCBIN "gfx/cards/tangela2.8x6.2bpp"
+	INCBIN "gfx/cards/tangela2.2bpp"
 	INCBIN "gfx/cards/tangela2.pal"
 
 ScytherCardGfx:: ; cc918 (33:4918)
-	INCBIN "gfx/cards/scyther.8x6.2bpp"
+	INCBIN "gfx/cards/scyther.2bpp"
 	INCBIN "gfx/cards/scyther.pal"
 
 PinsirCardGfx:: ; ccc20 (33:4c20)
-	INCBIN "gfx/cards/pinsir.8x6.2bpp"
+	INCBIN "gfx/cards/pinsir.2bpp"
 	INCBIN "gfx/cards/pinsir.pal"
 
 CharmanderCardGfx:: ; ccf28 (33:4f28)
-	INCBIN "gfx/cards/charmander.8x6.2bpp"
+	INCBIN "gfx/cards/charmander.2bpp"
 	INCBIN "gfx/cards/charmander.pal"
 
 CharmeleonCardGfx:: ; cd230 (33:5230)
-	INCBIN "gfx/cards/charmeleon.8x6.2bpp"
+	INCBIN "gfx/cards/charmeleon.2bpp"
 	INCBIN "gfx/cards/charmeleon.pal"
 
 CharizardCardGfx:: ; cd538 (33:5538)
-	INCBIN "gfx/cards/charizard.8x6.2bpp"
+	INCBIN "gfx/cards/charizard.2bpp"
 	INCBIN "gfx/cards/charizard.pal"
 
 VulpixCardGfx:: ; cd840 (33:5840)
-	INCBIN "gfx/cards/vulpix.8x6.2bpp"
+	INCBIN "gfx/cards/vulpix.2bpp"
 	INCBIN "gfx/cards/vulpix.pal"
 
 Ninetails1CardGfx:: ; cdb48 (33:5b48)
-	INCBIN "gfx/cards/ninetails1.8x6.2bpp"
+	INCBIN "gfx/cards/ninetails1.2bpp"
 	INCBIN "gfx/cards/ninetails1.pal"
 
 Ninetails2CardGfx:: ; cde50 (33:5e50)
-	INCBIN "gfx/cards/ninetails2.8x6.2bpp"
+	INCBIN "gfx/cards/ninetails2.2bpp"
 	INCBIN "gfx/cards/ninetails2.pal"
 
 GrowlitheCardGfx:: ; ce158 (33:6158)
-	INCBIN "gfx/cards/growlithe.8x6.2bpp"
+	INCBIN "gfx/cards/growlithe.2bpp"
 	INCBIN "gfx/cards/growlithe.pal"
 
 Arcanine1CardGfx:: ; ce460 (33:6460)
-	INCBIN "gfx/cards/arcanine1.8x6.2bpp"
+	INCBIN "gfx/cards/arcanine1.2bpp"
 	INCBIN "gfx/cards/arcanine1.pal"
 
 Arcanine2CardGfx:: ; ce768 (33:6768)
-	INCBIN "gfx/cards/arcanine2.8x6.2bpp"
+	INCBIN "gfx/cards/arcanine2.2bpp"
 	INCBIN "gfx/cards/arcanine2.pal"
 
 PonytaCardGfx:: ; cea70 (33:6a70)
-	INCBIN "gfx/cards/ponyta.8x6.2bpp"
+	INCBIN "gfx/cards/ponyta.2bpp"
 	INCBIN "gfx/cards/ponyta.pal"
 
 RapidashCardGfx:: ; ced78 (33:6d78)
-	INCBIN "gfx/cards/rapidash.8x6.2bpp"
+	INCBIN "gfx/cards/rapidash.2bpp"
 	INCBIN "gfx/cards/rapidash.pal"
 
 Magmar1CardGfx:: ; cf080 (33:7080)
-	INCBIN "gfx/cards/magmar1.8x6.2bpp"
+	INCBIN "gfx/cards/magmar1.2bpp"
 	INCBIN "gfx/cards/magmar1.pal"
 
 Magmar2CardGfx:: ; cf388 (33:7388)
-	INCBIN "gfx/cards/magmar2.8x6.2bpp"
+	INCBIN "gfx/cards/magmar2.2bpp"
 	INCBIN "gfx/cards/magmar2.pal"
 
 Flareon1CardGfx:: ; cf690 (33:7690)
-	INCBIN "gfx/cards/flareon1.8x6.2bpp"
+	INCBIN "gfx/cards/flareon1.2bpp"
 	INCBIN "gfx/cards/flareon1.pal"
 
 Flareon2CardGfx:: ; cf998 (33:7998)
-	INCBIN "gfx/cards/flareon2.8x6.2bpp"
+	INCBIN "gfx/cards/flareon2.2bpp"
 	INCBIN "gfx/cards/flareon2.pal"
 
 Moltres1CardGfx:: ; cfca0 (33:7ca0)
-	INCBIN "gfx/cards/moltres1.8x6.2bpp"
+	INCBIN "gfx/cards/moltres1.2bpp"
 	INCBIN "gfx/cards/moltres1.pal"
 
 SECTION "Card Gfx 4", ROMX
 
 Moltres2CardGfx:: ; d0000 (34:4000)
-	INCBIN "gfx/cards/moltres2.8x6.2bpp"
+	INCBIN "gfx/cards/moltres2.2bpp"
 	INCBIN "gfx/cards/moltres2.pal"
 
 SquirtleCardGfx:: ; d0308 (34:4308)
-	INCBIN "gfx/cards/squirtle.8x6.2bpp"
+	INCBIN "gfx/cards/squirtle.2bpp"
 	INCBIN "gfx/cards/squirtle.pal"
 
 WartortleCardGfx:: ; d0610 (34:4610)
-	INCBIN "gfx/cards/wartortle.8x6.2bpp"
+	INCBIN "gfx/cards/wartortle.2bpp"
 	INCBIN "gfx/cards/wartortle.pal"
 
 BlastoiseCardGfx:: ; d0918 (34:4918)
-	INCBIN "gfx/cards/blastoise.8x6.2bpp"
+	INCBIN "gfx/cards/blastoise.2bpp"
 	INCBIN "gfx/cards/blastoise.pal"
 
 PsyduckCardGfx:: ; d0c20 (34:4c20)
-	INCBIN "gfx/cards/psyduck.8x6.2bpp"
+	INCBIN "gfx/cards/psyduck.2bpp"
 	INCBIN "gfx/cards/psyduck.pal"
 
 GolduckCardGfx:: ; d0f28 (34:4f28)
-	INCBIN "gfx/cards/golduck.8x6.2bpp"
+	INCBIN "gfx/cards/golduck.2bpp"
 	INCBIN "gfx/cards/golduck.pal"
 
 PoliwagCardGfx:: ; d1230 (34:5230)
-	INCBIN "gfx/cards/poliwag.8x6.2bpp"
+	INCBIN "gfx/cards/poliwag.2bpp"
 	INCBIN "gfx/cards/poliwag.pal"
 
 PoliwhirlCardGfx:: ; d1538 (34:5538)
-	INCBIN "gfx/cards/poliwhirl.8x6.2bpp"
+	INCBIN "gfx/cards/poliwhirl.2bpp"
 	INCBIN "gfx/cards/poliwhirl.pal"
 
 PoliwrathCardGfx:: ; d1840 (34:5840)
-	INCBIN "gfx/cards/poliwrath.8x6.2bpp"
+	INCBIN "gfx/cards/poliwrath.2bpp"
 	INCBIN "gfx/cards/poliwrath.pal"
 
 TentacoolCardGfx:: ; d1b48 (34:5b48)
-	INCBIN "gfx/cards/tentacool.8x6.2bpp"
+	INCBIN "gfx/cards/tentacool.2bpp"
 	INCBIN "gfx/cards/tentacool.pal"
 
 TentacruelCardGfx:: ; d1e50 (34:5e50)
-	INCBIN "gfx/cards/tentacruel.8x6.2bpp"
+	INCBIN "gfx/cards/tentacruel.2bpp"
 	INCBIN "gfx/cards/tentacruel.pal"
 
 SeelCardGfx:: ; d2158 (34:6158)
-	INCBIN "gfx/cards/seel.8x6.2bpp"
+	INCBIN "gfx/cards/seel.2bpp"
 	INCBIN "gfx/cards/seel.pal"
 
 DewgongCardGfx:: ; d2460 (34:6460)
-	INCBIN "gfx/cards/dewgong.8x6.2bpp"
+	INCBIN "gfx/cards/dewgong.2bpp"
 	INCBIN "gfx/cards/dewgong.pal"
 
 ShellderCardGfx:: ; d2768 (34:6768)
-	INCBIN "gfx/cards/shellder.8x6.2bpp"
+	INCBIN "gfx/cards/shellder.2bpp"
 	INCBIN "gfx/cards/shellder.pal"
 
 CloysterCardGfx:: ; d2a70 (34:6a70)
-	INCBIN "gfx/cards/cloyster.8x6.2bpp"
+	INCBIN "gfx/cards/cloyster.2bpp"
 	INCBIN "gfx/cards/cloyster.pal"
 
 KrabbyCardGfx:: ; d2d78 (34:6d78)
-	INCBIN "gfx/cards/krabby.8x6.2bpp"
+	INCBIN "gfx/cards/krabby.2bpp"
 	INCBIN "gfx/cards/krabby.pal"
 
 KinglerCardGfx:: ; d3080 (34:7080)
-	INCBIN "gfx/cards/kingler.8x6.2bpp"
+	INCBIN "gfx/cards/kingler.2bpp"
 	INCBIN "gfx/cards/kingler.pal"
 
 HorseaCardGfx:: ; d3388 (34:7388)
-	INCBIN "gfx/cards/horsea.8x6.2bpp"
+	INCBIN "gfx/cards/horsea.2bpp"
 	INCBIN "gfx/cards/horsea.pal"
 
 SeadraCardGfx:: ; d3690 (34:7690)
-	INCBIN "gfx/cards/seadra.8x6.2bpp"
+	INCBIN "gfx/cards/seadra.2bpp"
 	INCBIN "gfx/cards/seadra.pal"
 
 GoldeenCardGfx:: ; d3998 (34:7998)
-	INCBIN "gfx/cards/goldeen.8x6.2bpp"
+	INCBIN "gfx/cards/goldeen.2bpp"
 	INCBIN "gfx/cards/goldeen.pal"
 
 SeakingCardGfx:: ; d3ca0 (34:7ca0)
-	INCBIN "gfx/cards/seaking.8x6.2bpp"
+	INCBIN "gfx/cards/seaking.2bpp"
 	INCBIN "gfx/cards/seaking.pal"
 
 SECTION "Card Gfx 5", ROMX
 
 StaryuCardGfx:: ; d4000 (35:4000)
-	INCBIN "gfx/cards/staryu.8x6.2bpp"
+	INCBIN "gfx/cards/staryu.2bpp"
 	INCBIN "gfx/cards/staryu.pal"
 
 StarmieCardGfx:: ; d4308 (35:4308)
-	INCBIN "gfx/cards/starmie.8x6.2bpp"
+	INCBIN "gfx/cards/starmie.2bpp"
 	INCBIN "gfx/cards/starmie.pal"
 
 MagikarpCardGfx:: ; d4610 (35:4610)
-	INCBIN "gfx/cards/magikarp.8x6.2bpp"
+	INCBIN "gfx/cards/magikarp.2bpp"
 	INCBIN "gfx/cards/magikarp.pal"
 
 GyaradosCardGfx:: ; d4918 (35:4918)
-	INCBIN "gfx/cards/gyarados.8x6.2bpp"
+	INCBIN "gfx/cards/gyarados.2bpp"
 	INCBIN "gfx/cards/gyarados.pal"
 
 LaprasCardGfx:: ; d4c20 (35:4c20)
-	INCBIN "gfx/cards/lapras.8x6.2bpp"
+	INCBIN "gfx/cards/lapras.2bpp"
 	INCBIN "gfx/cards/lapras.pal"
 
 Vaporeon1CardGfx:: ; d4f28 (35:4f28)
-	INCBIN "gfx/cards/vaporeon1.8x6.2bpp"
+	INCBIN "gfx/cards/vaporeon1.2bpp"
 	INCBIN "gfx/cards/vaporeon1.pal"
 
 Vaporeon2CardGfx:: ; d5230 (35:5230)
-	INCBIN "gfx/cards/vaporeon2.8x6.2bpp"
+	INCBIN "gfx/cards/vaporeon2.2bpp"
 	INCBIN "gfx/cards/vaporeon2.pal"
 
 OmanyteCardGfx:: ; d5538 (35:5538)
-	INCBIN "gfx/cards/omanyte.8x6.2bpp"
+	INCBIN "gfx/cards/omanyte.2bpp"
 	INCBIN "gfx/cards/omanyte.pal"
 
 OmastarCardGfx:: ; d5840 (35:5840)
-	INCBIN "gfx/cards/omastar.8x6.2bpp"
+	INCBIN "gfx/cards/omastar.2bpp"
 	INCBIN "gfx/cards/omastar.pal"
 
 Articuno1CardGfx:: ; d5b48 (35:5b48)
-	INCBIN "gfx/cards/articuno1.8x6.2bpp"
+	INCBIN "gfx/cards/articuno1.2bpp"
 	INCBIN "gfx/cards/articuno1.pal"
 
 Articuno2CardGfx:: ; d5e50 (35:5e50)
-	INCBIN "gfx/cards/articuno2.8x6.2bpp"
+	INCBIN "gfx/cards/articuno2.2bpp"
 	INCBIN "gfx/cards/articuno2.pal"
 
 Pikachu1CardGfx:: ; d6158 (35:6158)
-	INCBIN "gfx/cards/pikachu1.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu1.2bpp"
 	INCBIN "gfx/cards/pikachu1.pal"
 
 Pikachu2CardGfx:: ; d6460 (35:6460)
-	INCBIN "gfx/cards/pikachu2.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu2.2bpp"
 	INCBIN "gfx/cards/pikachu2.pal"
 
 Pikachu3CardGfx:: ; d6768 (35:6768)
-	INCBIN "gfx/cards/pikachu3.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu3.2bpp"
 	INCBIN "gfx/cards/pikachu3.pal"
 
 Pikachu4CardGfx:: ; d6a70 (35:6a70)
-	INCBIN "gfx/cards/pikachu4.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu4.2bpp"
 	INCBIN "gfx/cards/pikachu4.pal"
 
 FlyingPikachuCardGfx:: ; d6d78 (35:6d78)
-	INCBIN "gfx/cards/flyingpikachu.8x6.2bpp"
+	INCBIN "gfx/cards/flyingpikachu.2bpp"
 	INCBIN "gfx/cards/flyingpikachu.pal"
 
 SurfingPikachu1CardGfx:: ; d7080 (35:7080)
-	INCBIN "gfx/cards/surfingpikachu1.8x6.2bpp"
+	INCBIN "gfx/cards/surfingpikachu1.2bpp"
 	INCBIN "gfx/cards/surfingpikachu1.pal"
 
 SurfingPikachu2CardGfx:: ; d7388 (35:7388)
-	INCBIN "gfx/cards/surfingpikachu2.8x6.2bpp"
+	INCBIN "gfx/cards/surfingpikachu2.2bpp"
 	INCBIN "gfx/cards/surfingpikachu2.pal"
 
 Raichu1CardGfx:: ; d7690 (35:7690)
-	INCBIN "gfx/cards/raichu1.8x6.2bpp"
+	INCBIN "gfx/cards/raichu1.2bpp"
 	INCBIN "gfx/cards/raichu1.pal"
 
 Raichu2CardGfx:: ; d7998 (35:7998)
-	INCBIN "gfx/cards/raichu2.8x6.2bpp"
+	INCBIN "gfx/cards/raichu2.2bpp"
 	INCBIN "gfx/cards/raichu2.pal"
 
 Magnemite1CardGfx:: ; d7ca0 (35:7ca0)
-	INCBIN "gfx/cards/magnemite1.8x6.2bpp"
+	INCBIN "gfx/cards/magnemite1.2bpp"
 	INCBIN "gfx/cards/magnemite1.pal"
 
 SECTION "Card Gfx 6", ROMX
 
 Magnemite2CardGfx:: ; d8000 (36:4000)
-	INCBIN "gfx/cards/magnemite2.8x6.2bpp"
+	INCBIN "gfx/cards/magnemite2.2bpp"
 	INCBIN "gfx/cards/magnemite2.pal"
 
 Magneton1CardGfx:: ; d8308 (36:4308)
-	INCBIN "gfx/cards/magneton1.8x6.2bpp"
+	INCBIN "gfx/cards/magneton1.2bpp"
 	INCBIN "gfx/cards/magneton1.pal"
 
 Magneton2CardGfx:: ; d8610 (36:4610)
-	INCBIN "gfx/cards/magneton2.8x6.2bpp"
+	INCBIN "gfx/cards/magneton2.2bpp"
 	INCBIN "gfx/cards/magneton2.pal"
 
 VoltorbCardGfx:: ; d8918 (36:4918)
-	INCBIN "gfx/cards/voltorb.8x6.2bpp"
+	INCBIN "gfx/cards/voltorb.2bpp"
 	INCBIN "gfx/cards/voltorb.pal"
 
 Electrode1CardGfx:: ; d8c20 (36:4c20)
-	INCBIN "gfx/cards/electrode1.8x6.2bpp"
+	INCBIN "gfx/cards/electrode1.2bpp"
 	INCBIN "gfx/cards/electrode1.pal"
 
 Electrode2CardGfx:: ; d8f28 (36:4f28)
-	INCBIN "gfx/cards/electrode2.8x6.2bpp"
+	INCBIN "gfx/cards/electrode2.2bpp"
 	INCBIN "gfx/cards/electrode2.pal"
 
 Electabuzz1CardGfx:: ; d9230 (36:5230)
-	INCBIN "gfx/cards/electabuzz1.8x6.2bpp"
+	INCBIN "gfx/cards/electabuzz1.2bpp"
 	INCBIN "gfx/cards/electabuzz1.pal"
 
 Electabuzz2CardGfx:: ; d9538 (36:5538)
-	INCBIN "gfx/cards/electabuzz2.8x6.2bpp"
+	INCBIN "gfx/cards/electabuzz2.2bpp"
 	INCBIN "gfx/cards/electabuzz2.pal"
 
 Jolteon1CardGfx:: ; d9840 (36:5840)
-	INCBIN "gfx/cards/jolteon1.8x6.2bpp"
+	INCBIN "gfx/cards/jolteon1.2bpp"
 	INCBIN "gfx/cards/jolteon1.pal"
 
 Jolteon2CardGfx:: ; d9b48 (36:5b48)
-	INCBIN "gfx/cards/jolteon2.8x6.2bpp"
+	INCBIN "gfx/cards/jolteon2.2bpp"
 	INCBIN "gfx/cards/jolteon2.pal"
 
 Zapdos1CardGfx:: ; d9e50 (36:5e50)
-	INCBIN "gfx/cards/zapdos1.8x6.2bpp"
+	INCBIN "gfx/cards/zapdos1.2bpp"
 	INCBIN "gfx/cards/zapdos1.pal"
 
 Zapdos2CardGfx:: ; da158 (36:6158)
-	INCBIN "gfx/cards/zapdos2.8x6.2bpp"
+	INCBIN "gfx/cards/zapdos2.2bpp"
 	INCBIN "gfx/cards/zapdos2.pal"
 
 Zapdos3CardGfx:: ; da460 (36:6460)
-	INCBIN "gfx/cards/zapdos3.8x6.2bpp"
+	INCBIN "gfx/cards/zapdos3.2bpp"
 	INCBIN "gfx/cards/zapdos3.pal"
 
 SandshrewCardGfx:: ; da768 (36:6768)
-	INCBIN "gfx/cards/sandshrew.8x6.2bpp"
+	INCBIN "gfx/cards/sandshrew.2bpp"
 	INCBIN "gfx/cards/sandshrew.pal"
 
 SandslashCardGfx:: ; daa70 (36:6a70)
-	INCBIN "gfx/cards/sandslash.8x6.2bpp"
+	INCBIN "gfx/cards/sandslash.2bpp"
 	INCBIN "gfx/cards/sandslash.pal"
 
 DiglettCardGfx:: ; dad78 (36:6d78)
-	INCBIN "gfx/cards/diglett.8x6.2bpp"
+	INCBIN "gfx/cards/diglett.2bpp"
 	INCBIN "gfx/cards/diglett.pal"
 
 DugtrioCardGfx:: ; db080 (36:7080)
-	INCBIN "gfx/cards/dugtrio.8x6.2bpp"
+	INCBIN "gfx/cards/dugtrio.2bpp"
 	INCBIN "gfx/cards/dugtrio.pal"
 
 MankeyCardGfx:: ; db388 (36:7388)
-	INCBIN "gfx/cards/mankey.8x6.2bpp"
+	INCBIN "gfx/cards/mankey.2bpp"
 	INCBIN "gfx/cards/mankey.pal"
 
 PrimeapeCardGfx:: ; db690 (36:7690)
-	INCBIN "gfx/cards/primeape.8x6.2bpp"
+	INCBIN "gfx/cards/primeape.2bpp"
 	INCBIN "gfx/cards/primeape.pal"
 
 MachopCardGfx:: ; db998 (36:7998)
-	INCBIN "gfx/cards/machop.8x6.2bpp"
+	INCBIN "gfx/cards/machop.2bpp"
 	INCBIN "gfx/cards/machop.pal"
 
 MachokeCardGfx:: ; dbca0 (36:7ca0)
-	INCBIN "gfx/cards/machoke.8x6.2bpp"
+	INCBIN "gfx/cards/machoke.2bpp"
 	INCBIN "gfx/cards/machoke.pal"
 
 SECTION "Card Gfx 7", ROMX
 
 MachampCardGfx:: ; dc000 (37:4000)
-	INCBIN "gfx/cards/machamp.8x6.2bpp"
+	INCBIN "gfx/cards/machamp.2bpp"
 	INCBIN "gfx/cards/machamp.pal"
 
 GeodudeCardGfx:: ; dc308 (37:4308)
-	INCBIN "gfx/cards/geodude.8x6.2bpp"
+	INCBIN "gfx/cards/geodude.2bpp"
 	INCBIN "gfx/cards/geodude.pal"
 
 GravelerCardGfx:: ; dc610 (37:4610)
-	INCBIN "gfx/cards/graveler.8x6.2bpp"
+	INCBIN "gfx/cards/graveler.2bpp"
 	INCBIN "gfx/cards/graveler.pal"
 
 GolemCardGfx:: ; dc918 (37:4918)
-	INCBIN "gfx/cards/golem.8x6.2bpp"
+	INCBIN "gfx/cards/golem.2bpp"
 	INCBIN "gfx/cards/golem.pal"
 
 OnixCardGfx:: ; dcc20 (37:4c20)
-	INCBIN "gfx/cards/onix.8x6.2bpp"
+	INCBIN "gfx/cards/onix.2bpp"
 	INCBIN "gfx/cards/onix.pal"
 
 CuboneCardGfx:: ; dcf28 (37:4f28)
-	INCBIN "gfx/cards/cubone.8x6.2bpp"
+	INCBIN "gfx/cards/cubone.2bpp"
 	INCBIN "gfx/cards/cubone.pal"
 
 Marowak1CardGfx:: ; dd230 (37:5230)
-	INCBIN "gfx/cards/marowak1.8x6.2bpp"
+	INCBIN "gfx/cards/marowak1.2bpp"
 	INCBIN "gfx/cards/marowak1.pal"
 
 Marowak2CardGfx:: ; dd538 (37:5538)
-	INCBIN "gfx/cards/marowak2.8x6.2bpp"
+	INCBIN "gfx/cards/marowak2.2bpp"
 	INCBIN "gfx/cards/marowak2.pal"
 
 HitmonleeCardGfx:: ; dd840 (37:5840)
-	INCBIN "gfx/cards/hitmonlee.8x6.2bpp"
+	INCBIN "gfx/cards/hitmonlee.2bpp"
 	INCBIN "gfx/cards/hitmonlee.pal"
 
 HitmonchanCardGfx:: ; ddb48 (37:5b48)
-	INCBIN "gfx/cards/hitmonchan.8x6.2bpp"
+	INCBIN "gfx/cards/hitmonchan.2bpp"
 	INCBIN "gfx/cards/hitmonchan.pal"
 
 RhyhornCardGfx:: ; dde50 (37:5e50)
-	INCBIN "gfx/cards/rhyhorn.8x6.2bpp"
+	INCBIN "gfx/cards/rhyhorn.2bpp"
 	INCBIN "gfx/cards/rhyhorn.pal"
 
 RhydonCardGfx:: ; de158 (37:6158)
-	INCBIN "gfx/cards/rhydon.8x6.2bpp"
+	INCBIN "gfx/cards/rhydon.2bpp"
 	INCBIN "gfx/cards/rhydon.pal"
 
 KabutoCardGfx:: ; de460 (37:6460)
-	INCBIN "gfx/cards/kabuto.8x6.2bpp"
+	INCBIN "gfx/cards/kabuto.2bpp"
 	INCBIN "gfx/cards/kabuto.pal"
 
 KabutopsCardGfx:: ; de768 (37:6768)
-	INCBIN "gfx/cards/kabutops.8x6.2bpp"
+	INCBIN "gfx/cards/kabutops.2bpp"
 	INCBIN "gfx/cards/kabutops.pal"
 
 AerodactylCardGfx:: ; dea70 (37:6a70)
-	INCBIN "gfx/cards/aerodactyl.8x6.2bpp"
+	INCBIN "gfx/cards/aerodactyl.2bpp"
 	INCBIN "gfx/cards/aerodactyl.pal"
 
 AbraCardGfx:: ; ded78 (37:6d78)
-	INCBIN "gfx/cards/abra.8x6.2bpp"
+	INCBIN "gfx/cards/abra.2bpp"
 	INCBIN "gfx/cards/abra.pal"
 
 KadabraCardGfx:: ; df080 (37:7080)
-	INCBIN "gfx/cards/kadabra.8x6.2bpp"
+	INCBIN "gfx/cards/kadabra.2bpp"
 	INCBIN "gfx/cards/kadabra.pal"
 
 AlakazamCardGfx:: ; df388 (37:7388)
-	INCBIN "gfx/cards/alakazam.8x6.2bpp"
+	INCBIN "gfx/cards/alakazam.2bpp"
 	INCBIN "gfx/cards/alakazam.pal"
 
 Slowpoke1CardGfx:: ; df690 (37:7690)
-	INCBIN "gfx/cards/slowpoke1.8x6.2bpp"
+	INCBIN "gfx/cards/slowpoke1.2bpp"
 	INCBIN "gfx/cards/slowpoke1.pal"
 
 Slowpoke2CardGfx:: ; df998 (37:7998)
-	INCBIN "gfx/cards/slowpoke2.8x6.2bpp"
+	INCBIN "gfx/cards/slowpoke2.2bpp"
 	INCBIN "gfx/cards/slowpoke2.pal"
 
 SlowbroCardGfx:: ; dfca0 (37:7ca0)
-	INCBIN "gfx/cards/slowbro.8x6.2bpp"
+	INCBIN "gfx/cards/slowbro.2bpp"
 	INCBIN "gfx/cards/slowbro.pal"
 
 SECTION "Card Gfx 8", ROMX
 
 Gastly1CardGfx:: ; e0000 (38:4000)
-	INCBIN "gfx/cards/gastly1.8x6.2bpp"
+	INCBIN "gfx/cards/gastly1.2bpp"
 	INCBIN "gfx/cards/gastly1.pal"
 
 Gastly2CardGfx:: ; e0308 (38:4308)
-	INCBIN "gfx/cards/gastly2.8x6.2bpp"
+	INCBIN "gfx/cards/gastly2.2bpp"
 	INCBIN "gfx/cards/gastly2.pal"
 
 Haunter1CardGfx:: ; e0610 (38:4610)
-	INCBIN "gfx/cards/haunter1.8x6.2bpp"
+	INCBIN "gfx/cards/haunter1.2bpp"
 	INCBIN "gfx/cards/haunter1.pal"
 
 Haunter2CardGfx:: ; e0918 (38:4918)
-	INCBIN "gfx/cards/haunter2.8x6.2bpp"
+	INCBIN "gfx/cards/haunter2.2bpp"
 	INCBIN "gfx/cards/haunter2.pal"
 
 GengarCardGfx:: ; e0c20 (38:4c20)
-	INCBIN "gfx/cards/gengar.8x6.2bpp"
+	INCBIN "gfx/cards/gengar.2bpp"
 	INCBIN "gfx/cards/gengar.pal"
 
 DrowzeeCardGfx:: ; e0f28 (38:4f28)
-	INCBIN "gfx/cards/drowzee.8x6.2bpp"
+	INCBIN "gfx/cards/drowzee.2bpp"
 	INCBIN "gfx/cards/drowzee.pal"
 
 HypnoCardGfx:: ; e1230 (38:5230)
-	INCBIN "gfx/cards/hypno.8x6.2bpp"
+	INCBIN "gfx/cards/hypno.2bpp"
 	INCBIN "gfx/cards/hypno.pal"
 
 MrMimeCardGfx:: ; e1538 (38:5538)
-	INCBIN "gfx/cards/mrmime.8x6.2bpp"
+	INCBIN "gfx/cards/mrmime.2bpp"
 	INCBIN "gfx/cards/mrmime.pal"
 
 JynxCardGfx:: ; e1840 (38:5840)
-	INCBIN "gfx/cards/jynx.8x6.2bpp"
+	INCBIN "gfx/cards/jynx.2bpp"
 	INCBIN "gfx/cards/jynx.pal"
 
 Mewtwo1CardGfx:: ; e1b48 (38:5b48)
-	INCBIN "gfx/cards/mewtwo1.8x6.2bpp"
+	INCBIN "gfx/cards/mewtwo1.2bpp"
 	INCBIN "gfx/cards/mewtwo1.pal"
 
 Mewtwo2CardGfx:: ; e1e50 (38:5e50)
-	INCBIN "gfx/cards/mewtwo2.8x6.2bpp"
+	INCBIN "gfx/cards/mewtwo2.2bpp"
 	INCBIN "gfx/cards/mewtwo2.pal"
 
 Mewtwo3CardGfx:: ; e2158 (38:6158)
-	INCBIN "gfx/cards/mewtwo3.8x6.2bpp"
+	INCBIN "gfx/cards/mewtwo3.2bpp"
 	INCBIN "gfx/cards/mewtwo3.pal"
 
 Mew1CardGfx:: ; e2460 (38:6460)
-	INCBIN "gfx/cards/mew1.8x6.2bpp"
+	INCBIN "gfx/cards/mew1.2bpp"
 	INCBIN "gfx/cards/mew1.pal"
 
 Mew2CardGfx:: ; e2768 (38:6768)
-	INCBIN "gfx/cards/mew2.8x6.2bpp"
+	INCBIN "gfx/cards/mew2.2bpp"
 	INCBIN "gfx/cards/mew2.pal"
 
 Mew3CardGfx:: ; e2a70 (38:6a70)
-	INCBIN "gfx/cards/mew3.8x6.2bpp"
+	INCBIN "gfx/cards/mew3.2bpp"
 	INCBIN "gfx/cards/mew3.pal"
 
 PidgeyCardGfx:: ; e2d78 (38:6d78)
-	INCBIN "gfx/cards/pidgey.8x6.2bpp"
+	INCBIN "gfx/cards/pidgey.2bpp"
 	INCBIN "gfx/cards/pidgey.pal"
 
 PidgeottoCardGfx:: ; e3080 (38:7080)
-	INCBIN "gfx/cards/pidgeotto.8x6.2bpp"
+	INCBIN "gfx/cards/pidgeotto.2bpp"
 	INCBIN "gfx/cards/pidgeotto.pal"
 
 Pidgeot1CardGfx:: ; e3388 (38:7388)
-	INCBIN "gfx/cards/pidgeot1.8x6.2bpp"
+	INCBIN "gfx/cards/pidgeot1.2bpp"
 	INCBIN "gfx/cards/pidgeot1.pal"
 
 Pidgeot2CardGfx:: ; e3690 (38:7690)
-	INCBIN "gfx/cards/pidgeot2.8x6.2bpp"
+	INCBIN "gfx/cards/pidgeot2.2bpp"
 	INCBIN "gfx/cards/pidgeot2.pal"
 
 RattataCardGfx:: ; e3998 (38:7998)
-	INCBIN "gfx/cards/rattata.8x6.2bpp"
+	INCBIN "gfx/cards/rattata.2bpp"
 	INCBIN "gfx/cards/rattata.pal"
 
 RaticateCardGfx:: ; e3ca0 (38:7ca0)
-	INCBIN "gfx/cards/raticate.8x6.2bpp"
+	INCBIN "gfx/cards/raticate.2bpp"
 	INCBIN "gfx/cards/raticate.pal"
 
 SECTION "Card Gfx 9", ROMX
 
 SpearowCardGfx:: ; e4000 (39:4000)
-	INCBIN "gfx/cards/spearow.8x6.2bpp"
+	INCBIN "gfx/cards/spearow.2bpp"
 	INCBIN "gfx/cards/spearow.pal"
 
 FearowCardGfx:: ; e4308 (39:4308)
-	INCBIN "gfx/cards/fearow.8x6.2bpp"
+	INCBIN "gfx/cards/fearow.2bpp"
 	INCBIN "gfx/cards/fearow.pal"
 
 ClefairyCardGfx:: ; e4610 (39:4610)
-	INCBIN "gfx/cards/clefairy.8x6.2bpp"
+	INCBIN "gfx/cards/clefairy.2bpp"
 	INCBIN "gfx/cards/clefairy.pal"
 
 ClefableCardGfx:: ; e4918 (39:4918)
-	INCBIN "gfx/cards/clefable.8x6.2bpp"
+	INCBIN "gfx/cards/clefable.2bpp"
 	INCBIN "gfx/cards/clefable.pal"
 
 Jigglypuff1CardGfx:: ; e4c20 (39:4c20)
-	INCBIN "gfx/cards/jigglypuff1.8x6.2bpp"
+	INCBIN "gfx/cards/jigglypuff1.2bpp"
 	INCBIN "gfx/cards/jigglypuff1.pal"
 
 Jigglypuff2CardGfx:: ; e4f28 (39:4f28)
-	INCBIN "gfx/cards/jigglypuff2.8x6.2bpp"
+	INCBIN "gfx/cards/jigglypuff2.2bpp"
 	INCBIN "gfx/cards/jigglypuff2.pal"
 
 Jigglypuff3CardGfx:: ; e5230 (39:5230)
-	INCBIN "gfx/cards/jigglypuff3.8x6.2bpp"
+	INCBIN "gfx/cards/jigglypuff3.2bpp"
 	INCBIN "gfx/cards/jigglypuff3.pal"
 
 WigglytuffCardGfx:: ; e5538 (39:5538)
-	INCBIN "gfx/cards/wigglytuff.8x6.2bpp"
+	INCBIN "gfx/cards/wigglytuff.2bpp"
 	INCBIN "gfx/cards/wigglytuff.pal"
 
 Meowth1CardGfx:: ; e5840 (39:5840)
-	INCBIN "gfx/cards/meowth1.8x6.2bpp"
+	INCBIN "gfx/cards/meowth1.2bpp"
 	INCBIN "gfx/cards/meowth1.pal"
 
 Meowth2CardGfx:: ; e5b48 (39:5b48)
-	INCBIN "gfx/cards/meowth2.8x6.2bpp"
+	INCBIN "gfx/cards/meowth2.2bpp"
 	INCBIN "gfx/cards/meowth2.pal"
 
 PersianCardGfx:: ; e5e50 (39:5e50)
-	INCBIN "gfx/cards/persian.8x6.2bpp"
+	INCBIN "gfx/cards/persian.2bpp"
 	INCBIN "gfx/cards/persian.pal"
 
 FarfetchdCardGfx:: ; e6158 (39:6158)
-	INCBIN "gfx/cards/farfetchd.8x6.2bpp"
+	INCBIN "gfx/cards/farfetchd.2bpp"
 	INCBIN "gfx/cards/farfetchd.pal"
 
 DoduoCardGfx:: ; e6460 (39:6460)
-	INCBIN "gfx/cards/doduo.8x6.2bpp"
+	INCBIN "gfx/cards/doduo.2bpp"
 	INCBIN "gfx/cards/doduo.pal"
 
 DodrioCardGfx:: ; e6768 (39:6768)
-	INCBIN "gfx/cards/dodrio.8x6.2bpp"
+	INCBIN "gfx/cards/dodrio.2bpp"
 	INCBIN "gfx/cards/dodrio.pal"
 
 LickitungCardGfx:: ; e6a70 (39:6a70)
-	INCBIN "gfx/cards/lickitung.8x6.2bpp"
+	INCBIN "gfx/cards/lickitung.2bpp"
 	INCBIN "gfx/cards/lickitung.pal"
 
 ChanseyCardGfx:: ; e6d78 (39:6d78)
-	INCBIN "gfx/cards/chansey.8x6.2bpp"
+	INCBIN "gfx/cards/chansey.2bpp"
 	INCBIN "gfx/cards/chansey.pal"
 
 KangaskhanCardGfx:: ; e7080 (39:7080)
-	INCBIN "gfx/cards/kangaskhan.8x6.2bpp"
+	INCBIN "gfx/cards/kangaskhan.2bpp"
 	INCBIN "gfx/cards/kangaskhan.pal"
 
 TaurosCardGfx:: ; e7388 (39:7388)
-	INCBIN "gfx/cards/tauros.8x6.2bpp"
+	INCBIN "gfx/cards/tauros.2bpp"
 	INCBIN "gfx/cards/tauros.pal"
 
 DittoCardGfx:: ; e7690 (39:7690)
-	INCBIN "gfx/cards/ditto.8x6.2bpp"
+	INCBIN "gfx/cards/ditto.2bpp"
 	INCBIN "gfx/cards/ditto.pal"
 
 EeveeCardGfx:: ; e7998 (39:7998)
-	INCBIN "gfx/cards/eevee.8x6.2bpp"
+	INCBIN "gfx/cards/eevee.2bpp"
 	INCBIN "gfx/cards/eevee.pal"
 
 PorygonCardGfx:: ; e7ca0 (39:7ca0)
-	INCBIN "gfx/cards/porygon.8x6.2bpp"
+	INCBIN "gfx/cards/porygon.2bpp"
 	INCBIN "gfx/cards/porygon.pal"
 
 SECTION "Card Gfx 10", ROMX
 
 SnorlaxCardGfx:: ; e8000 (3a:4000)
-	INCBIN "gfx/cards/snorlax.8x6.2bpp"
+	INCBIN "gfx/cards/snorlax.2bpp"
 	INCBIN "gfx/cards/snorlax.pal"
 
 DratiniCardGfx:: ; e8308 (3a:4308)
-	INCBIN "gfx/cards/dratini.8x6.2bpp"
+	INCBIN "gfx/cards/dratini.2bpp"
 	INCBIN "gfx/cards/dratini.pal"
 
 DragonairCardGfx:: ; e8610 (3a:4610)
-	INCBIN "gfx/cards/dragonair.8x6.2bpp"
+	INCBIN "gfx/cards/dragonair.2bpp"
 	INCBIN "gfx/cards/dragonair.pal"
 
 Dragonite1CardGfx:: ; e8918 (3a:4918)
-	INCBIN "gfx/cards/dragonite1.8x6.2bpp"
+	INCBIN "gfx/cards/dragonite1.2bpp"
 	INCBIN "gfx/cards/dragonite1.pal"
 
 Dragonite2CardGfx:: ; e8c20 (3a:4c20)
-	INCBIN "gfx/cards/dragonite2.8x6.2bpp"
+	INCBIN "gfx/cards/dragonite2.2bpp"
 	INCBIN "gfx/cards/dragonite2.pal"
 
 ProfessorOakCardGfx:: ; e8f28 (3a:4f28)
-	INCBIN "gfx/cards/professoroak.8x6.2bpp"
+	INCBIN "gfx/cards/professoroak.2bpp"
 	INCBIN "gfx/cards/professoroak.pal"
 
 ImposterProfessorOakCardGfx:: ; e9230 (3a:5230)
-	INCBIN "gfx/cards/imposterprofessoroak.8x6.2bpp"
+	INCBIN "gfx/cards/imposterprofessoroak.2bpp"
 	INCBIN "gfx/cards/imposterprofessoroak.pal"
 
 BillCardGfx:: ; e9538 (3a:5538)
-	INCBIN "gfx/cards/bill.8x6.2bpp"
+	INCBIN "gfx/cards/bill.2bpp"
 	INCBIN "gfx/cards/bill.pal"
 
 MrFujiCardGfx:: ; e9840 (3a:5840)
-	INCBIN "gfx/cards/mrfuji.8x6.2bpp"
+	INCBIN "gfx/cards/mrfuji.2bpp"
 	INCBIN "gfx/cards/mrfuji.pal"
 
 LassCardGfx:: ; e9b48 (3a:5b48)
-	INCBIN "gfx/cards/lass.8x6.2bpp"
+	INCBIN "gfx/cards/lass.2bpp"
 	INCBIN "gfx/cards/lass.pal"
 
 ImakuniCardGfx:: ; e9e50 (3a:5e50)
-	INCBIN "gfx/cards/imakuni.8x6.2bpp"
+	INCBIN "gfx/cards/imakuni.2bpp"
 	INCBIN "gfx/cards/imakuni.pal"
 
 PokemonTraderCardGfx:: ; ea158 (3a:6158)
-	INCBIN "gfx/cards/pokemontrader.8x6.2bpp"
+	INCBIN "gfx/cards/pokemontrader.2bpp"
 	INCBIN "gfx/cards/pokemontrader.pal"
 
 PokemonBreederCardGfx:: ; ea460 (3a:6460)
-	INCBIN "gfx/cards/pokemonbreeder.8x6.2bpp"
+	INCBIN "gfx/cards/pokemonbreeder.2bpp"
 	INCBIN "gfx/cards/pokemonbreeder.pal"
 
 ClefairyDollCardGfx:: ; ea768 (3a:6768)
-	INCBIN "gfx/cards/clefairydoll.8x6.2bpp"
+	INCBIN "gfx/cards/clefairydoll.2bpp"
 	INCBIN "gfx/cards/clefairydoll.pal"
 
 MysteriousFossilCardGfx:: ; eaa70 (3a:6a70)
-	INCBIN "gfx/cards/mysteriousfossil.8x6.2bpp"
+	INCBIN "gfx/cards/mysteriousfossil.2bpp"
 	INCBIN "gfx/cards/mysteriousfossil.pal"
 
 EnergyRetrievalCardGfx:: ; ead78 (3a:6d78)
-	INCBIN "gfx/cards/energyretrieval.8x6.2bpp"
+	INCBIN "gfx/cards/energyretrieval.2bpp"
 	INCBIN "gfx/cards/energyretrieval.pal"
 
 SuperEnergyRetrievalCardGfx:: ; eb080 (3a:7080)
-	INCBIN "gfx/cards/superenergyretrieval.8x6.2bpp"
+	INCBIN "gfx/cards/superenergyretrieval.2bpp"
 	INCBIN "gfx/cards/superenergyretrieval.pal"
 
 EnergySearchCardGfx:: ; eb388 (3a:7388)
-	INCBIN "gfx/cards/energysearch.8x6.2bpp"
+	INCBIN "gfx/cards/energysearch.2bpp"
 	INCBIN "gfx/cards/energysearch.pal"
 
 EnergyRemovalCardGfx:: ; eb690 (3a:7690)
-	INCBIN "gfx/cards/energyremoval.8x6.2bpp"
+	INCBIN "gfx/cards/energyremoval.2bpp"
 	INCBIN "gfx/cards/energyremoval.pal"
 
 SuperEnergyRemovalCardGfx:: ; eb998 (3a:7998)
-	INCBIN "gfx/cards/superenergyremoval.8x6.2bpp"
+	INCBIN "gfx/cards/superenergyremoval.2bpp"
 	INCBIN "gfx/cards/superenergyremoval.pal"
 
 SwitchCardGfx:: ; ebca0 (3a:7ca0)
-	INCBIN "gfx/cards/switch.8x6.2bpp"
+	INCBIN "gfx/cards/switch.2bpp"
 	INCBIN "gfx/cards/switch.pal"
 
 SECTION "Card Gfx 11", ROMX
 
 PokemonCenterCardGfx:: ; ec000 (3b:4000)
-	INCBIN "gfx/cards/pokemoncenter.8x6.2bpp"
+	INCBIN "gfx/cards/pokemoncenter.2bpp"
 	INCBIN "gfx/cards/pokemoncenter.pal"
 
 PokeBallCardGfx:: ; ec308 (3b:4308)
-	INCBIN "gfx/cards/pokeball.8x6.2bpp"
+	INCBIN "gfx/cards/pokeball.2bpp"
 	INCBIN "gfx/cards/pokeball.pal"
 
 ScoopUpCardGfx:: ; ec610 (3b:4610)
-	INCBIN "gfx/cards/scoopup.8x6.2bpp"
+	INCBIN "gfx/cards/scoopup.2bpp"
 	INCBIN "gfx/cards/scoopup.pal"
 
 ComputerSearchCardGfx:: ; ec918 (3b:4918)
-	INCBIN "gfx/cards/computersearch.8x6.2bpp"
+	INCBIN "gfx/cards/computersearch.2bpp"
 	INCBIN "gfx/cards/computersearch.pal"
 
 PokedexCardGfx:: ; ecc20 (3b:4c20)
-	INCBIN "gfx/cards/pokedex.8x6.2bpp"
+	INCBIN "gfx/cards/pokedex.2bpp"
 	INCBIN "gfx/cards/pokedex.pal"
 
 PlusPowerCardGfx:: ; ecf28 (3b:4f28)
-	INCBIN "gfx/cards/pluspower.8x6.2bpp"
+	INCBIN "gfx/cards/pluspower.2bpp"
 	INCBIN "gfx/cards/pluspower.pal"
 
 DefenderCardGfx:: ; ed230 (3b:5230)
-	INCBIN "gfx/cards/defender.8x6.2bpp"
+	INCBIN "gfx/cards/defender.2bpp"
 	INCBIN "gfx/cards/defender.pal"
 
 ItemFinderCardGfx:: ; ed538 (3b:5538)
-	INCBIN "gfx/cards/itemfinder.8x6.2bpp"
+	INCBIN "gfx/cards/itemfinder.2bpp"
 	INCBIN "gfx/cards/itemfinder.pal"
 
 GustOfWindCardGfx:: ; ed840 (3b:5840)
-	INCBIN "gfx/cards/gustofwind.8x6.2bpp"
+	INCBIN "gfx/cards/gustofwind.2bpp"
 	INCBIN "gfx/cards/gustofwind.pal"
 
 DevolutionSprayCardGfx:: ; edb48 (3b:5b48)
-	INCBIN "gfx/cards/devolutionspray.8x6.2bpp"
+	INCBIN "gfx/cards/devolutionspray.2bpp"
 	INCBIN "gfx/cards/devolutionspray.pal"
 
 PotionCardGfx:: ; ede50 (3b:5e50)
-	INCBIN "gfx/cards/potion.8x6.2bpp"
+	INCBIN "gfx/cards/potion.2bpp"
 	INCBIN "gfx/cards/potion.pal"
 
 SuperPotionCardGfx:: ; ee158 (3b:6158)
-	INCBIN "gfx/cards/superpotion.8x6.2bpp"
+	INCBIN "gfx/cards/superpotion.2bpp"
 	INCBIN "gfx/cards/superpotion.pal"
 
 FullHealCardGfx:: ; ee460 (3b:6460)
-	INCBIN "gfx/cards/fullheal.8x6.2bpp"
+	INCBIN "gfx/cards/fullheal.2bpp"
 	INCBIN "gfx/cards/fullheal.pal"
 
 ReviveCardGfx:: ; ee768 (3b:6768)
-	INCBIN "gfx/cards/revive.8x6.2bpp"
+	INCBIN "gfx/cards/revive.2bpp"
 	INCBIN "gfx/cards/revive.pal"
 
 MaintenanceCardGfx:: ; eea70 (3b:6a70)
-	INCBIN "gfx/cards/maintenance.8x6.2bpp"
+	INCBIN "gfx/cards/maintenance.2bpp"
 	INCBIN "gfx/cards/maintenance.pal"
 
 PokemonFluteCardGfx:: ; eed78 (3b:6d78)
-	INCBIN "gfx/cards/pokemonflute.8x6.2bpp"
+	INCBIN "gfx/cards/pokemonflute.2bpp"
 	INCBIN "gfx/cards/pokemonflute.pal"
 
 GamblerCardGfx:: ; ef080 (3b:7080)
-	INCBIN "gfx/cards/gambler.8x6.2bpp"
+	INCBIN "gfx/cards/gambler.2bpp"
 	INCBIN "gfx/cards/gambler.pal"
 
 RecycleCardGfx:: ; ef388 (3b:7388)
-	INCBIN "gfx/cards/recycle.8x6.2bpp"
+	INCBIN "gfx/cards/recycle.2bpp"
 	INCBIN "gfx/cards/recycle.pal"
 
 rept $970
diff --git a/src/gfx/booster_packs/colosseum2.t10.png b/src/gfx/booster_packs/colosseum2.png
index 1da1a52..1da1a52 100644
--- a/src/gfx/booster_packs/colosseum2.t10.png
+++ b/src/gfx/booster_packs/colosseum2.png
diff --git a/src/gfx/booster_packs/evolution2.t10.png b/src/gfx/booster_packs/evolution2.png
index 09affa5..09affa5 100644
--- a/src/gfx/booster_packs/evolution2.t10.png
+++ b/src/gfx/booster_packs/evolution2.png
diff --git a/src/gfx/booster_packs/laboratory2.t10.png b/src/gfx/booster_packs/laboratory2.png
index 4feb880..4feb880 100644
--- a/src/gfx/booster_packs/laboratory2.t10.png
+++ b/src/gfx/booster_packs/laboratory2.png
diff --git a/src/gfx/booster_packs/mystery2.t10.png b/src/gfx/booster_packs/mystery2.png
index fc04dbf..fc04dbf 100644
--- a/src/gfx/booster_packs/mystery2.t10.png
+++ b/src/gfx/booster_packs/mystery2.png
diff --git a/src/gfx/cardpop/cardpop1.t3.png b/src/gfx/cardpop/cardpop1.png
index c607d8d..c607d8d 100644
--- a/src/gfx/cardpop/cardpop1.t3.png
+++ b/src/gfx/cardpop/cardpop1.png
diff --git a/src/gfx/cardpop/cardpop2.t3.png b/src/gfx/cardpop/cardpop2.png
index 75e5149..75e5149 100644
--- a/src/gfx/cardpop/cardpop2.t3.png
+++ b/src/gfx/cardpop/cardpop2.png
diff --git a/src/gfx/cardpop/cardpop3.t3.png b/src/gfx/cardpop/cardpop3.png
index 48bd233..48bd233 100644
--- a/src/gfx/cardpop/cardpop3.t3.png
+++ b/src/gfx/cardpop/cardpop3.png
diff --git a/src/gfx/cards/abra.8x6.png b/src/gfx/cards/abra.8x6.png
deleted file mode 100644
index 336068c..0000000
--- a/src/gfx/cards/abra.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/abra.pal b/src/gfx/cards/abra.pal
deleted file mode 100644
index 8478895..0000000
--- a/src/gfx/cards/abra.pal
+++ /dev/null
diff --git a/src/gfx/cards/abra.png b/src/gfx/cards/abra.png
new file mode 100644
index 0000000..e3e8509
--- /dev/null
+++ b/src/gfx/cards/abra.png
diff --git a/src/gfx/cards/aerodactyl.8x6.png b/src/gfx/cards/aerodactyl.8x6.png
deleted file mode 100644
index f250570..0000000
--- a/src/gfx/cards/aerodactyl.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/aerodactyl.pal b/src/gfx/cards/aerodactyl.pal
deleted file mode 100644
index 40075fb..0000000
--- a/src/gfx/cards/aerodactyl.pal
+++ /dev/null
diff --git a/src/gfx/cards/aerodactyl.png b/src/gfx/cards/aerodactyl.png
new file mode 100644
index 0000000..c7bbc9e
--- /dev/null
+++ b/src/gfx/cards/aerodactyl.png
diff --git a/src/gfx/cards/alakazam.8x6.png b/src/gfx/cards/alakazam.8x6.png
deleted file mode 100644
index de51bc8..0000000
--- a/src/gfx/cards/alakazam.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/alakazam.pal b/src/gfx/cards/alakazam.pal
deleted file mode 100644
index 9905df9..0000000
--- a/src/gfx/cards/alakazam.pal
+++ /dev/null
diff --git a/src/gfx/cards/alakazam.png b/src/gfx/cards/alakazam.png
new file mode 100644
index 0000000..099fd66
--- /dev/null
+++ b/src/gfx/cards/alakazam.png
diff --git a/src/gfx/cards/arbok.8x6.png b/src/gfx/cards/arbok.8x6.png
deleted file mode 100644
index 4d0bccb..0000000
--- a/src/gfx/cards/arbok.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/arbok.pal b/src/gfx/cards/arbok.pal
deleted file mode 100644
index 7220a36..0000000
--- a/src/gfx/cards/arbok.pal
+++ /dev/null
diff --git a/src/gfx/cards/arbok.png b/src/gfx/cards/arbok.png
new file mode 100644
index 0000000..0393921
--- /dev/null
+++ b/src/gfx/cards/arbok.png
diff --git a/src/gfx/cards/arcanine1.8x6.png b/src/gfx/cards/arcanine1.8x6.png
deleted file mode 100644
index 31cb8b0..0000000
--- a/src/gfx/cards/arcanine1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/arcanine1.pal b/src/gfx/cards/arcanine1.pal
deleted file mode 100644
index 844f708..0000000
--- a/src/gfx/cards/arcanine1.pal
+++ /dev/null
diff --git a/src/gfx/cards/arcanine1.png b/src/gfx/cards/arcanine1.png
new file mode 100644
index 0000000..840865b
--- /dev/null
+++ b/src/gfx/cards/arcanine1.png
diff --git a/src/gfx/cards/arcanine2.8x6.png b/src/gfx/cards/arcanine2.8x6.png
deleted file mode 100644
index 64fc0bd..0000000
--- a/src/gfx/cards/arcanine2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/arcanine2.pal b/src/gfx/cards/arcanine2.pal
deleted file mode 100644
index f30b0c5..0000000
--- a/src/gfx/cards/arcanine2.pal
+++ /dev/null
diff --git a/src/gfx/cards/arcanine2.png b/src/gfx/cards/arcanine2.png
new file mode 100644
index 0000000..e943cc4
--- /dev/null
+++ b/src/gfx/cards/arcanine2.png
diff --git a/src/gfx/cards/articuno1.8x6.png b/src/gfx/cards/articuno1.8x6.png
deleted file mode 100644
index f9c54c4..0000000
--- a/src/gfx/cards/articuno1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/articuno1.pal b/src/gfx/cards/articuno1.pal
deleted file mode 100644
index a7ba53f..0000000
--- a/src/gfx/cards/articuno1.pal
+++ /dev/null
@@ -1 +0,0 @@
-��~�U�
\ No newline at end of file
diff --git a/src/gfx/cards/articuno1.png b/src/gfx/cards/articuno1.png
new file mode 100644
index 0000000..e03d821
--- /dev/null
+++ b/src/gfx/cards/articuno1.png
diff --git a/src/gfx/cards/articuno2.8x6.png b/src/gfx/cards/articuno2.8x6.png
deleted file mode 100644
index d7bdc49..0000000
--- a/src/gfx/cards/articuno2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/articuno2.pal b/src/gfx/cards/articuno2.pal
deleted file mode 100644
index 7d7d50e..0000000
--- a/src/gfx/cards/articuno2.pal
+++ /dev/null
diff --git a/src/gfx/cards/articuno2.png b/src/gfx/cards/articuno2.png
new file mode 100644
index 0000000..948c5a6
--- /dev/null
+++ b/src/gfx/cards/articuno2.png
diff --git a/src/gfx/cards/beedrill.8x6.png b/src/gfx/cards/beedrill.8x6.png
deleted file mode 100644
index ec6af50..0000000
--- a/src/gfx/cards/beedrill.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/beedrill.pal b/src/gfx/cards/beedrill.pal
deleted file mode 100644
index 23f06a5..0000000
--- a/src/gfx/cards/beedrill.pal
+++ /dev/null
diff --git a/src/gfx/cards/beedrill.png b/src/gfx/cards/beedrill.png
new file mode 100644
index 0000000..fabacc9
--- /dev/null
+++ b/src/gfx/cards/beedrill.png
diff --git a/src/gfx/cards/bellsprout.8x6.png b/src/gfx/cards/bellsprout.8x6.png
deleted file mode 100644
index 6dd6297..0000000
--- a/src/gfx/cards/bellsprout.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/bellsprout.pal b/src/gfx/cards/bellsprout.pal
deleted file mode 100644
index ede7e7b..0000000
--- a/src/gfx/cards/bellsprout.pal
+++ /dev/null
diff --git a/src/gfx/cards/bellsprout.png b/src/gfx/cards/bellsprout.png
new file mode 100644
index 0000000..044fd5b
--- /dev/null
+++ b/src/gfx/cards/bellsprout.png
diff --git a/src/gfx/cards/bill.8x6.png b/src/gfx/cards/bill.8x6.png
deleted file mode 100644
index f730116..0000000
--- a/src/gfx/cards/bill.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/bill.pal b/src/gfx/cards/bill.pal
deleted file mode 100644
index aab4025..0000000
--- a/src/gfx/cards/bill.pal
+++ /dev/null
diff --git a/src/gfx/cards/bill.png b/src/gfx/cards/bill.png
new file mode 100644
index 0000000..d915777
--- /dev/null
+++ b/src/gfx/cards/bill.png
diff --git a/src/gfx/cards/blastoise.8x6.png b/src/gfx/cards/blastoise.8x6.png
deleted file mode 100644
index 68c7ddb..0000000
--- a/src/gfx/cards/blastoise.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/blastoise.pal b/src/gfx/cards/blastoise.pal
deleted file mode 100644
index 0145e41..0000000
--- a/src/gfx/cards/blastoise.pal
+++ /dev/null
diff --git a/src/gfx/cards/blastoise.png b/src/gfx/cards/blastoise.png
new file mode 100644
index 0000000..d2bc5bb
--- /dev/null
+++ b/src/gfx/cards/blastoise.png
diff --git a/src/gfx/cards/bulbasaur.8x6.png b/src/gfx/cards/bulbasaur.8x6.png
deleted file mode 100644
index fdb0552..0000000
--- a/src/gfx/cards/bulbasaur.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/bulbasaur.pal b/src/gfx/cards/bulbasaur.pal
deleted file mode 100644
index 1d1a8a0..0000000
--- a/src/gfx/cards/bulbasaur.pal
+++ /dev/null
diff --git a/src/gfx/cards/bulbasaur.png b/src/gfx/cards/bulbasaur.png
new file mode 100644
index 0000000..5bda906
--- /dev/null
+++ b/src/gfx/cards/bulbasaur.png
diff --git a/src/gfx/cards/butterfree.8x6.png b/src/gfx/cards/butterfree.8x6.png
deleted file mode 100644
index 5c02eb1..0000000
--- a/src/gfx/cards/butterfree.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/butterfree.pal b/src/gfx/cards/butterfree.pal
deleted file mode 100644
index 66dd06d..0000000
--- a/src/gfx/cards/butterfree.pal
+++ /dev/null
diff --git a/src/gfx/cards/butterfree.png b/src/gfx/cards/butterfree.png
new file mode 100644
index 0000000..c1c8d4e
--- /dev/null
+++ b/src/gfx/cards/butterfree.png
diff --git a/src/gfx/cards/caterpie.8x6.png b/src/gfx/cards/caterpie.8x6.png
deleted file mode 100644
index c1784e0..0000000
--- a/src/gfx/cards/caterpie.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/caterpie.pal b/src/gfx/cards/caterpie.pal
deleted file mode 100644
index 13c1994..0000000
--- a/src/gfx/cards/caterpie.pal
+++ /dev/null
diff --git a/src/gfx/cards/caterpie.png b/src/gfx/cards/caterpie.png
new file mode 100644
index 0000000..06cef2a
--- /dev/null
+++ b/src/gfx/cards/caterpie.png
diff --git a/src/gfx/cards/chansey.8x6.png b/src/gfx/cards/chansey.8x6.png
deleted file mode 100644
index e63a246..0000000
--- a/src/gfx/cards/chansey.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/chansey.pal b/src/gfx/cards/chansey.pal
deleted file mode 100644
index 87ec980..0000000
--- a/src/gfx/cards/chansey.pal
+++ /dev/null
@@ -1 +0,0 @@
-_kB1�
\ No newline at end of file
diff --git a/src/gfx/cards/chansey.png b/src/gfx/cards/chansey.png
new file mode 100644
index 0000000..ae31291
--- /dev/null
+++ b/src/gfx/cards/chansey.png
diff --git a/src/gfx/cards/charizard.8x6.png b/src/gfx/cards/charizard.8x6.png
deleted file mode 100644
index d5d22ef..0000000
--- a/src/gfx/cards/charizard.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/charizard.pal b/src/gfx/cards/charizard.pal
deleted file mode 100644
index 13c5ead..0000000
--- a/src/gfx/cards/charizard.pal
+++ /dev/null
diff --git a/src/gfx/cards/charizard.png b/src/gfx/cards/charizard.png
new file mode 100644
index 0000000..6dc3968
--- /dev/null
+++ b/src/gfx/cards/charizard.png
diff --git a/src/gfx/cards/charmander.8x6.png b/src/gfx/cards/charmander.8x6.png
deleted file mode 100644
index 7fadeaf..0000000
--- a/src/gfx/cards/charmander.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/charmander.pal b/src/gfx/cards/charmander.pal
deleted file mode 100644
index 85d1934..0000000
--- a/src/gfx/cards/charmander.pal
+++ /dev/null
diff --git a/src/gfx/cards/charmander.png b/src/gfx/cards/charmander.png
new file mode 100644
index 0000000..8b2f4f0
--- /dev/null
+++ b/src/gfx/cards/charmander.png
diff --git a/src/gfx/cards/charmeleon.8x6.png b/src/gfx/cards/charmeleon.8x6.png
deleted file mode 100644
index c996d81..0000000
--- a/src/gfx/cards/charmeleon.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/charmeleon.pal b/src/gfx/cards/charmeleon.pal
deleted file mode 100644
index 6133a9e..0000000
--- a/src/gfx/cards/charmeleon.pal
+++ /dev/null
diff --git a/src/gfx/cards/charmeleon.png b/src/gfx/cards/charmeleon.png
new file mode 100644
index 0000000..b7ffb64
--- /dev/null
+++ b/src/gfx/cards/charmeleon.png
diff --git a/src/gfx/cards/clefable.8x6.png b/src/gfx/cards/clefable.8x6.png
deleted file mode 100644
index 014b1b9..0000000
--- a/src/gfx/cards/clefable.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/clefable.pal b/src/gfx/cards/clefable.pal
deleted file mode 100644
index 5f85ff1..0000000
--- a/src/gfx/cards/clefable.pal
+++ /dev/null
@@ -1 +0,0 @@
-�V�
\ No newline at end of file
diff --git a/src/gfx/cards/clefable.png b/src/gfx/cards/clefable.png
new file mode 100644
index 0000000..7c0cb86
--- /dev/null
+++ b/src/gfx/cards/clefable.png
diff --git a/src/gfx/cards/clefairy.8x6.png b/src/gfx/cards/clefairy.8x6.png
deleted file mode 100644
index cfc66ef..0000000
--- a/src/gfx/cards/clefairy.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/clefairy.pal b/src/gfx/cards/clefairy.pal
deleted file mode 100644
index 1b27709..0000000
--- a/src/gfx/cards/clefairy.pal
+++ /dev/null
diff --git a/src/gfx/cards/clefairy.png b/src/gfx/cards/clefairy.png
new file mode 100644
index 0000000..eda9e4d
--- /dev/null
+++ b/src/gfx/cards/clefairy.png
diff --git a/src/gfx/cards/clefairydoll.8x6.png b/src/gfx/cards/clefairydoll.8x6.png
deleted file mode 100644
index c12f8c4..0000000
--- a/src/gfx/cards/clefairydoll.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/clefairydoll.pal b/src/gfx/cards/clefairydoll.pal
deleted file mode 100644
index 2d980d8..0000000
--- a/src/gfx/cards/clefairydoll.pal
+++ /dev/null
diff --git a/src/gfx/cards/clefairydoll.png b/src/gfx/cards/clefairydoll.png
new file mode 100644
index 0000000..e607ea1
--- /dev/null
+++ b/src/gfx/cards/clefairydoll.png
diff --git a/src/gfx/cards/cloyster.8x6.png b/src/gfx/cards/cloyster.8x6.png
deleted file mode 100644
index 5f59e88..0000000
--- a/src/gfx/cards/cloyster.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/cloyster.pal b/src/gfx/cards/cloyster.pal
deleted file mode 100644
index 8243bd0..0000000
--- a/src/gfx/cards/cloyster.pal
+++ /dev/null
@@ -1 +0,0 @@
-_kU
\ No newline at end of file
diff --git a/src/gfx/cards/cloyster.png b/src/gfx/cards/cloyster.png
new file mode 100644
index 0000000..c24df71
--- /dev/null
+++ b/src/gfx/cards/cloyster.png
diff --git a/src/gfx/cards/computersearch.8x6.png b/src/gfx/cards/computersearch.8x6.png
deleted file mode 100644
index 79f1c78..0000000
--- a/src/gfx/cards/computersearch.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/computersearch.pal b/src/gfx/cards/computersearch.pal
deleted file mode 100644
index de3a143..0000000
--- a/src/gfx/cards/computersearch.pal
+++ /dev/null
diff --git a/src/gfx/cards/computersearch.png b/src/gfx/cards/computersearch.png
new file mode 100644
index 0000000..4786ab3
--- /dev/null
+++ b/src/gfx/cards/computersearch.png
diff --git a/src/gfx/cards/cubone.8x6.png b/src/gfx/cards/cubone.8x6.png
deleted file mode 100644
index 49d5b23..0000000
--- a/src/gfx/cards/cubone.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/cubone.pal b/src/gfx/cards/cubone.pal
deleted file mode 100644
index 3352c5b..0000000
--- a/src/gfx/cards/cubone.pal
+++ /dev/null
diff --git a/src/gfx/cards/cubone.png b/src/gfx/cards/cubone.png
new file mode 100644
index 0000000..d914d25
--- /dev/null
+++ b/src/gfx/cards/cubone.png
diff --git a/src/gfx/cards/defender.8x6.png b/src/gfx/cards/defender.8x6.png
deleted file mode 100644
index adde4fc..0000000
--- a/src/gfx/cards/defender.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/defender.pal b/src/gfx/cards/defender.pal
deleted file mode 100644
index 541b683..0000000
--- a/src/gfx/cards/defender.pal
+++ /dev/null
diff --git a/src/gfx/cards/defender.png b/src/gfx/cards/defender.png
new file mode 100644
index 0000000..bdeb050
--- /dev/null
+++ b/src/gfx/cards/defender.png
diff --git a/src/gfx/cards/devolutionspray.8x6.png b/src/gfx/cards/devolutionspray.8x6.png
deleted file mode 100644
index b3b69a4..0000000
--- a/src/gfx/cards/devolutionspray.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/devolutionspray.pal b/src/gfx/cards/devolutionspray.pal
deleted file mode 100644
index 5b1619f..0000000
--- a/src/gfx/cards/devolutionspray.pal
+++ /dev/null
diff --git a/src/gfx/cards/devolutionspray.png b/src/gfx/cards/devolutionspray.png
new file mode 100644
index 0000000..de65594
--- /dev/null
+++ b/src/gfx/cards/devolutionspray.png
diff --git a/src/gfx/cards/dewgong.8x6.png b/src/gfx/cards/dewgong.8x6.png
deleted file mode 100644
index c4be81b..0000000
--- a/src/gfx/cards/dewgong.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/dewgong.pal b/src/gfx/cards/dewgong.pal
deleted file mode 100644
index ae4ee37..0000000
--- a/src/gfx/cards/dewgong.pal
+++ /dev/null
diff --git a/src/gfx/cards/dewgong.png b/src/gfx/cards/dewgong.png
new file mode 100644
index 0000000..21d8f49
--- /dev/null
+++ b/src/gfx/cards/dewgong.png
diff --git a/src/gfx/cards/diglett.8x6.png b/src/gfx/cards/diglett.8x6.png
deleted file mode 100644
index cae6aef..0000000
--- a/src/gfx/cards/diglett.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/diglett.pal b/src/gfx/cards/diglett.pal
deleted file mode 100644
index 96817c1..0000000
--- a/src/gfx/cards/diglett.pal
+++ /dev/null
diff --git a/src/gfx/cards/diglett.png b/src/gfx/cards/diglett.png
new file mode 100644
index 0000000..06e3f98
--- /dev/null
+++ b/src/gfx/cards/diglett.png
diff --git a/src/gfx/cards/ditto.8x6.png b/src/gfx/cards/ditto.8x6.png
deleted file mode 100644
index 566dcf4..0000000
--- a/src/gfx/cards/ditto.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/ditto.pal b/src/gfx/cards/ditto.pal
deleted file mode 100644
index fcc03f2..0000000
--- a/src/gfx/cards/ditto.pal
+++ /dev/null
diff --git a/src/gfx/cards/ditto.png b/src/gfx/cards/ditto.png
new file mode 100644
index 0000000..14cf202
--- /dev/null
+++ b/src/gfx/cards/ditto.png
diff --git a/src/gfx/cards/dodrio.8x6.png b/src/gfx/cards/dodrio.8x6.png
deleted file mode 100644
index 222bb79..0000000
--- a/src/gfx/cards/dodrio.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/dodrio.pal b/src/gfx/cards/dodrio.pal
deleted file mode 100644
index 5209538..0000000
--- a/src/gfx/cards/dodrio.pal
+++ /dev/null
diff --git a/src/gfx/cards/dodrio.png b/src/gfx/cards/dodrio.png
new file mode 100644
index 0000000..4792c45
--- /dev/null
+++ b/src/gfx/cards/dodrio.png
diff --git a/src/gfx/cards/doduo.8x6.png b/src/gfx/cards/doduo.8x6.png
deleted file mode 100644
index fad2467..0000000
--- a/src/gfx/cards/doduo.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/doduo.pal b/src/gfx/cards/doduo.pal
deleted file mode 100644
index b3e7b20..0000000
--- a/src/gfx/cards/doduo.pal
+++ /dev/null
diff --git a/src/gfx/cards/doduo.png b/src/gfx/cards/doduo.png
new file mode 100644
index 0000000..31b44af
--- /dev/null
+++ b/src/gfx/cards/doduo.png
diff --git a/src/gfx/cards/doublecolorlessenergy.8x6.png b/src/gfx/cards/doublecolorlessenergy.8x6.png
deleted file mode 100644
index b3b367b..0000000
--- a/src/gfx/cards/doublecolorlessenergy.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/doublecolorlessenergy.pal b/src/gfx/cards/doublecolorlessenergy.pal
deleted file mode 100644
index 85c7d41..0000000
--- a/src/gfx/cards/doublecolorlessenergy.pal
+++ /dev/null
diff --git a/src/gfx/cards/doublecolorlessenergy.png b/src/gfx/cards/doublecolorlessenergy.png
new file mode 100644
index 0000000..767be48
--- /dev/null
+++ b/src/gfx/cards/doublecolorlessenergy.png
diff --git a/src/gfx/cards/dragonair.8x6.png b/src/gfx/cards/dragonair.8x6.png
deleted file mode 100644
index e0cf766..0000000
--- a/src/gfx/cards/dragonair.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/dragonair.pal b/src/gfx/cards/dragonair.pal
deleted file mode 100644
index 96b3358..0000000
--- a/src/gfx/cards/dragonair.pal
+++ /dev/null
diff --git a/src/gfx/cards/dragonair.png b/src/gfx/cards/dragonair.png
new file mode 100644
index 0000000..5c88db3
--- /dev/null
+++ b/src/gfx/cards/dragonair.png
diff --git a/src/gfx/cards/dragonite1.8x6.png b/src/gfx/cards/dragonite1.8x6.png
deleted file mode 100644
index 10c4ed9..0000000
--- a/src/gfx/cards/dragonite1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/dragonite1.pal b/src/gfx/cards/dragonite1.pal
deleted file mode 100644
index 9b3e049..0000000
--- a/src/gfx/cards/dragonite1.pal
+++ /dev/null
diff --git a/src/gfx/cards/dragonite1.png b/src/gfx/cards/dragonite1.png
new file mode 100644
index 0000000..205b109
--- /dev/null
+++ b/src/gfx/cards/dragonite1.png
diff --git a/src/gfx/cards/dragonite2.8x6.png b/src/gfx/cards/dragonite2.8x6.png
deleted file mode 100644
index 9d15c00..0000000
--- a/src/gfx/cards/dragonite2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/dragonite2.pal b/src/gfx/cards/dragonite2.pal
deleted file mode 100644
index 1313288..0000000
--- a/src/gfx/cards/dragonite2.pal
+++ /dev/null
diff --git a/src/gfx/cards/dragonite2.png b/src/gfx/cards/dragonite2.png
new file mode 100644
index 0000000..8ba22a7
--- /dev/null
+++ b/src/gfx/cards/dragonite2.png
diff --git a/src/gfx/cards/dratini.8x6.png b/src/gfx/cards/dratini.8x6.png
deleted file mode 100644
index 1c66ac3..0000000
--- a/src/gfx/cards/dratini.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/dratini.pal b/src/gfx/cards/dratini.pal
deleted file mode 100644
index 8cb1478..0000000
--- a/src/gfx/cards/dratini.pal
+++ /dev/null
diff --git a/src/gfx/cards/dratini.png b/src/gfx/cards/dratini.png
new file mode 100644
index 0000000..77aaa63
--- /dev/null
+++ b/src/gfx/cards/dratini.png
diff --git a/src/gfx/cards/drowzee.8x6.png b/src/gfx/cards/drowzee.8x6.png
deleted file mode 100644
index 3239903..0000000
--- a/src/gfx/cards/drowzee.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/drowzee.pal b/src/gfx/cards/drowzee.pal
deleted file mode 100644
index e1ac5f8..0000000
--- a/src/gfx/cards/drowzee.pal
+++ /dev/null
diff --git a/src/gfx/cards/drowzee.png b/src/gfx/cards/drowzee.png
new file mode 100644
index 0000000..ee65440
--- /dev/null
+++ b/src/gfx/cards/drowzee.png
diff --git a/src/gfx/cards/dugtrio.8x6.png b/src/gfx/cards/dugtrio.8x6.png
deleted file mode 100644
index bffe640..0000000
--- a/src/gfx/cards/dugtrio.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/dugtrio.pal b/src/gfx/cards/dugtrio.pal
deleted file mode 100644
index 6d8c3d2..0000000
--- a/src/gfx/cards/dugtrio.pal
+++ /dev/null
diff --git a/src/gfx/cards/dugtrio.png b/src/gfx/cards/dugtrio.png
new file mode 100644
index 0000000..41d93d6
--- /dev/null
+++ b/src/gfx/cards/dugtrio.png
diff --git a/src/gfx/cards/eevee.8x6.png b/src/gfx/cards/eevee.8x6.png
deleted file mode 100644
index 3114928..0000000
--- a/src/gfx/cards/eevee.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/eevee.pal b/src/gfx/cards/eevee.pal
deleted file mode 100644
index 0cf883c..0000000
--- a/src/gfx/cards/eevee.pal
+++ /dev/null
diff --git a/src/gfx/cards/eevee.png b/src/gfx/cards/eevee.png
new file mode 100644
index 0000000..534ed3d
--- /dev/null
+++ b/src/gfx/cards/eevee.png
diff --git a/src/gfx/cards/ekans.8x6.png b/src/gfx/cards/ekans.8x6.png
deleted file mode 100644
index 416e073..0000000
--- a/src/gfx/cards/ekans.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/ekans.pal b/src/gfx/cards/ekans.pal
deleted file mode 100644
index 73f6a7c..0000000
--- a/src/gfx/cards/ekans.pal
+++ /dev/null
diff --git a/src/gfx/cards/ekans.png b/src/gfx/cards/ekans.png
new file mode 100644
index 0000000..16b6be7
--- /dev/null
+++ b/src/gfx/cards/ekans.png
diff --git a/src/gfx/cards/electabuzz1.8x6.png b/src/gfx/cards/electabuzz1.8x6.png
deleted file mode 100644
index 75ed8f5..0000000
--- a/src/gfx/cards/electabuzz1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/electabuzz1.pal b/src/gfx/cards/electabuzz1.pal
deleted file mode 100644
index eab69c6..0000000
--- a/src/gfx/cards/electabuzz1.pal
+++ /dev/null
diff --git a/src/gfx/cards/electabuzz1.png b/src/gfx/cards/electabuzz1.png
new file mode 100644
index 0000000..c6b6711
--- /dev/null
+++ b/src/gfx/cards/electabuzz1.png
diff --git a/src/gfx/cards/electabuzz2.8x6.png b/src/gfx/cards/electabuzz2.8x6.png
deleted file mode 100644
index 8ca64a8..0000000
--- a/src/gfx/cards/electabuzz2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/electabuzz2.pal b/src/gfx/cards/electabuzz2.pal
deleted file mode 100644
index c4110cb..0000000
--- a/src/gfx/cards/electabuzz2.pal
+++ /dev/null
diff --git a/src/gfx/cards/electabuzz2.png b/src/gfx/cards/electabuzz2.png
new file mode 100644
index 0000000..84a0067
--- /dev/null
+++ b/src/gfx/cards/electabuzz2.png
diff --git a/src/gfx/cards/electrode1.8x6.png b/src/gfx/cards/electrode1.8x6.png
deleted file mode 100644
index cdc1fca..0000000
--- a/src/gfx/cards/electrode1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/electrode1.pal b/src/gfx/cards/electrode1.pal
deleted file mode 100644
index 09074fa..0000000
--- a/src/gfx/cards/electrode1.pal
+++ /dev/null
diff --git a/src/gfx/cards/electrode1.png b/src/gfx/cards/electrode1.png
new file mode 100644
index 0000000..2c3c67a
--- /dev/null
+++ b/src/gfx/cards/electrode1.png
diff --git a/src/gfx/cards/electrode2.8x6.png b/src/gfx/cards/electrode2.8x6.png
deleted file mode 100644
index 29ccc8b..0000000
--- a/src/gfx/cards/electrode2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/electrode2.pal b/src/gfx/cards/electrode2.pal
deleted file mode 100644
index 7cb4fe9..0000000
--- a/src/gfx/cards/electrode2.pal
+++ /dev/null
diff --git a/src/gfx/cards/electrode2.png b/src/gfx/cards/electrode2.png
new file mode 100644
index 0000000..10a6163
--- /dev/null
+++ b/src/gfx/cards/electrode2.png
diff --git a/src/gfx/cards/energyremoval.8x6.png b/src/gfx/cards/energyremoval.8x6.png
deleted file mode 100644
index 1958df7..0000000
--- a/src/gfx/cards/energyremoval.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/energyremoval.pal b/src/gfx/cards/energyremoval.pal
deleted file mode 100644
index ce72955..0000000
--- a/src/gfx/cards/energyremoval.pal
+++ /dev/null
diff --git a/src/gfx/cards/energyremoval.png b/src/gfx/cards/energyremoval.png
new file mode 100644
index 0000000..860d517
--- /dev/null
+++ b/src/gfx/cards/energyremoval.png
diff --git a/src/gfx/cards/energyretrieval.8x6.png b/src/gfx/cards/energyretrieval.8x6.png
deleted file mode 100644
index 270f967..0000000
--- a/src/gfx/cards/energyretrieval.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/energyretrieval.pal b/src/gfx/cards/energyretrieval.pal
deleted file mode 100644
index 770704b..0000000
--- a/src/gfx/cards/energyretrieval.pal
+++ /dev/null
diff --git a/src/gfx/cards/energyretrieval.png b/src/gfx/cards/energyretrieval.png
new file mode 100644
index 0000000..93154be
--- /dev/null
+++ b/src/gfx/cards/energyretrieval.png
diff --git a/src/gfx/cards/energysearch.8x6.png b/src/gfx/cards/energysearch.8x6.png
deleted file mode 100644
index d5d5328..0000000
--- a/src/gfx/cards/energysearch.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/energysearch.pal b/src/gfx/cards/energysearch.pal
deleted file mode 100644
index a638ba4..0000000
--- a/src/gfx/cards/energysearch.pal
+++ /dev/null
diff --git a/src/gfx/cards/energysearch.png b/src/gfx/cards/energysearch.png
new file mode 100644
index 0000000..0fe54fd
--- /dev/null
+++ b/src/gfx/cards/energysearch.png
diff --git a/src/gfx/cards/exeggcute.8x6.png b/src/gfx/cards/exeggcute.8x6.png
deleted file mode 100644
index 585aa5d..0000000
--- a/src/gfx/cards/exeggcute.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/exeggcute.pal b/src/gfx/cards/exeggcute.pal
deleted file mode 100644
index b9cf4ad..0000000
--- a/src/gfx/cards/exeggcute.pal
+++ /dev/null
@@ -1 +0,0 @@
-_�U  
\ No newline at end of file
diff --git a/src/gfx/cards/exeggcute.png b/src/gfx/cards/exeggcute.png
new file mode 100644
index 0000000..1ae396f
--- /dev/null
+++ b/src/gfx/cards/exeggcute.png
diff --git a/src/gfx/cards/exeggutor.8x6.png b/src/gfx/cards/exeggutor.8x6.png
deleted file mode 100644
index 6687638..0000000
--- a/src/gfx/cards/exeggutor.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/exeggutor.pal b/src/gfx/cards/exeggutor.pal
deleted file mode 100644
index 5296d43..0000000
--- a/src/gfx/cards/exeggutor.pal
+++ /dev/null
diff --git a/src/gfx/cards/exeggutor.png b/src/gfx/cards/exeggutor.png
new file mode 100644
index 0000000..1403e38
--- /dev/null
+++ b/src/gfx/cards/exeggutor.png
diff --git a/src/gfx/cards/farfetchd.8x6.png b/src/gfx/cards/farfetchd.8x6.png
deleted file mode 100644
index b156585..0000000
--- a/src/gfx/cards/farfetchd.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/farfetchd.pal b/src/gfx/cards/farfetchd.pal
deleted file mode 100644
index 2681635..0000000
--- a/src/gfx/cards/farfetchd.pal
+++ /dev/null
diff --git a/src/gfx/cards/farfetchd.png b/src/gfx/cards/farfetchd.png
new file mode 100644
index 0000000..fc5d678
--- /dev/null
+++ b/src/gfx/cards/farfetchd.png
diff --git a/src/gfx/cards/fearow.8x6.png b/src/gfx/cards/fearow.8x6.png
deleted file mode 100644
index 25f0d12..0000000
--- a/src/gfx/cards/fearow.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/fearow.pal b/src/gfx/cards/fearow.pal
deleted file mode 100644
index 5855ba7..0000000
--- a/src/gfx/cards/fearow.pal
+++ /dev/null
diff --git a/src/gfx/cards/fearow.png b/src/gfx/cards/fearow.png
new file mode 100644
index 0000000..dbc9197
--- /dev/null
+++ b/src/gfx/cards/fearow.png
diff --git a/src/gfx/cards/fightingenergy.8x6.png b/src/gfx/cards/fightingenergy.8x6.png
deleted file mode 100644
index 2c63c5b..0000000
--- a/src/gfx/cards/fightingenergy.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/fightingenergy.pal b/src/gfx/cards/fightingenergy.pal
deleted file mode 100644
index 8680b0c..0000000
--- a/src/gfx/cards/fightingenergy.pal
+++ /dev/null
diff --git a/src/gfx/cards/fightingenergy.png b/src/gfx/cards/fightingenergy.png
new file mode 100644
index 0000000..ef50467
--- /dev/null
+++ b/src/gfx/cards/fightingenergy.png
diff --git a/src/gfx/cards/fireenergy.8x6.png b/src/gfx/cards/fireenergy.8x6.png
deleted file mode 100644
index 2cb3419..0000000
--- a/src/gfx/cards/fireenergy.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/fireenergy.pal b/src/gfx/cards/fireenergy.pal
deleted file mode 100644
index 3cc39b1..0000000
--- a/src/gfx/cards/fireenergy.pal
+++ /dev/null
diff --git a/src/gfx/cards/fireenergy.png b/src/gfx/cards/fireenergy.png
new file mode 100644
index 0000000..451dd4f
--- /dev/null
+++ b/src/gfx/cards/fireenergy.png
diff --git a/src/gfx/cards/flareon1.8x6.png b/src/gfx/cards/flareon1.8x6.png
deleted file mode 100644
index eb5ebe3..0000000
--- a/src/gfx/cards/flareon1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/flareon1.pal b/src/gfx/cards/flareon1.pal
deleted file mode 100644
index 2c9594a..0000000
--- a/src/gfx/cards/flareon1.pal
+++ /dev/null
diff --git a/src/gfx/cards/flareon1.png b/src/gfx/cards/flareon1.png
new file mode 100644
index 0000000..0faa467
--- /dev/null
+++ b/src/gfx/cards/flareon1.png
diff --git a/src/gfx/cards/flareon2.8x6.png b/src/gfx/cards/flareon2.8x6.png
deleted file mode 100644
index 6c32566..0000000
--- a/src/gfx/cards/flareon2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/flareon2.pal b/src/gfx/cards/flareon2.pal
deleted file mode 100644
index 28c1b50..0000000
--- a/src/gfx/cards/flareon2.pal
+++ /dev/null
diff --git a/src/gfx/cards/flareon2.png b/src/gfx/cards/flareon2.png
new file mode 100644
index 0000000..9e822ae
--- /dev/null
+++ b/src/gfx/cards/flareon2.png
diff --git a/src/gfx/cards/flyingpikachu.8x6.png b/src/gfx/cards/flyingpikachu.8x6.png
deleted file mode 100644
index 14168a3..0000000
--- a/src/gfx/cards/flyingpikachu.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/flyingpikachu.pal b/src/gfx/cards/flyingpikachu.pal
deleted file mode 100644
index 00880ab..0000000
--- a/src/gfx/cards/flyingpikachu.pal
+++ /dev/null
diff --git a/src/gfx/cards/flyingpikachu.png b/src/gfx/cards/flyingpikachu.png
new file mode 100644
index 0000000..155855d
--- /dev/null
+++ b/src/gfx/cards/flyingpikachu.png
diff --git a/src/gfx/cards/fullheal.8x6.png b/src/gfx/cards/fullheal.8x6.png
deleted file mode 100644
index 281cc20..0000000
--- a/src/gfx/cards/fullheal.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/fullheal.pal b/src/gfx/cards/fullheal.pal
deleted file mode 100644
index 3a5a83c..0000000
--- a/src/gfx/cards/fullheal.pal
+++ /dev/null
diff --git a/src/gfx/cards/fullheal.png b/src/gfx/cards/fullheal.png
new file mode 100644
index 0000000..d6a5c34
--- /dev/null
+++ b/src/gfx/cards/fullheal.png
diff --git a/src/gfx/cards/gambler.8x6.png b/src/gfx/cards/gambler.8x6.png
deleted file mode 100644
index 1aeb1e3..0000000
--- a/src/gfx/cards/gambler.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/gambler.pal b/src/gfx/cards/gambler.pal
deleted file mode 100644
index 58f8ec9..0000000
--- a/src/gfx/cards/gambler.pal
+++ /dev/null
diff --git a/src/gfx/cards/gambler.png b/src/gfx/cards/gambler.png
new file mode 100644
index 0000000..aa67e41
--- /dev/null
+++ b/src/gfx/cards/gambler.png
diff --git a/src/gfx/cards/gastly1.8x6.png b/src/gfx/cards/gastly1.8x6.png
deleted file mode 100644
index 2a7bd88..0000000
--- a/src/gfx/cards/gastly1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/gastly1.pal b/src/gfx/cards/gastly1.pal
deleted file mode 100644
index 61e1ce3..0000000
--- a/src/gfx/cards/gastly1.pal
+++ /dev/null
diff --git a/src/gfx/cards/gastly1.png b/src/gfx/cards/gastly1.png
new file mode 100644
index 0000000..4bac9e6
--- /dev/null
+++ b/src/gfx/cards/gastly1.png
diff --git a/src/gfx/cards/gastly2.8x6.png b/src/gfx/cards/gastly2.8x6.png
deleted file mode 100644
index b9d56b2..0000000
--- a/src/gfx/cards/gastly2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/gastly2.pal b/src/gfx/cards/gastly2.pal
deleted file mode 100644
index ce711a8..0000000
--- a/src/gfx/cards/gastly2.pal
+++ /dev/null
@@ -1 +0,0 @@
-��0
\ No newline at end of file
diff --git a/src/gfx/cards/gastly2.png b/src/gfx/cards/gastly2.png
new file mode 100644
index 0000000..06d393f
--- /dev/null
+++ b/src/gfx/cards/gastly2.png
diff --git a/src/gfx/cards/gengar.8x6.png b/src/gfx/cards/gengar.8x6.png
deleted file mode 100644
index 53d9bf9..0000000
--- a/src/gfx/cards/gengar.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/gengar.pal b/src/gfx/cards/gengar.pal
deleted file mode 100644
index 42817c1..0000000
--- a/src/gfx/cards/gengar.pal
+++ /dev/null
@@ -1 +0,0 @@
-_ �T
\ No newline at end of file
diff --git a/src/gfx/cards/gengar.png b/src/gfx/cards/gengar.png
new file mode 100644
index 0000000..74026d0
--- /dev/null
+++ b/src/gfx/cards/gengar.png
diff --git a/src/gfx/cards/geodude.8x6.png b/src/gfx/cards/geodude.8x6.png
deleted file mode 100644
index 1c5a0fb..0000000
--- a/src/gfx/cards/geodude.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/geodude.pal b/src/gfx/cards/geodude.pal
deleted file mode 100644
index f4ca2f0..0000000
--- a/src/gfx/cards/geodude.pal
+++ /dev/null
diff --git a/src/gfx/cards/geodude.png b/src/gfx/cards/geodude.png
new file mode 100644
index 0000000..5d7c9eb
--- /dev/null
+++ b/src/gfx/cards/geodude.png
diff --git a/src/gfx/cards/gloom.8x6.png b/src/gfx/cards/gloom.8x6.png
deleted file mode 100644
index 973001b..0000000
--- a/src/gfx/cards/gloom.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/gloom.pal b/src/gfx/cards/gloom.pal
deleted file mode 100644
index c10860d..0000000
--- a/src/gfx/cards/gloom.pal
+++ /dev/null
diff --git a/src/gfx/cards/gloom.png b/src/gfx/cards/gloom.png
new file mode 100644
index 0000000..e306d98
--- /dev/null
+++ b/src/gfx/cards/gloom.png
diff --git a/src/gfx/cards/golbat.8x6.png b/src/gfx/cards/golbat.8x6.png
deleted file mode 100644
index 342b48c..0000000
--- a/src/gfx/cards/golbat.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/golbat.pal b/src/gfx/cards/golbat.pal
deleted file mode 100644
index 4d58109..0000000
--- a/src/gfx/cards/golbat.pal
+++ /dev/null
diff --git a/src/gfx/cards/golbat.png b/src/gfx/cards/golbat.png
new file mode 100644
index 0000000..239d662
--- /dev/null
+++ b/src/gfx/cards/golbat.png
diff --git a/src/gfx/cards/goldeen.8x6.png b/src/gfx/cards/goldeen.8x6.png
deleted file mode 100644
index 8427b7b..0000000
--- a/src/gfx/cards/goldeen.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/goldeen.pal b/src/gfx/cards/goldeen.pal
deleted file mode 100644
index 5cab2b8..0000000
--- a/src/gfx/cards/goldeen.pal
+++ /dev/null
diff --git a/src/gfx/cards/goldeen.png b/src/gfx/cards/goldeen.png
new file mode 100644
index 0000000..93bc336
--- /dev/null
+++ b/src/gfx/cards/goldeen.png
diff --git a/src/gfx/cards/golduck.8x6.png b/src/gfx/cards/golduck.8x6.png
deleted file mode 100644
index cdbdf51..0000000
--- a/src/gfx/cards/golduck.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/golduck.pal b/src/gfx/cards/golduck.pal
deleted file mode 100644
index 45e3791..0000000
--- a/src/gfx/cards/golduck.pal
+++ /dev/null
diff --git a/src/gfx/cards/golduck.png b/src/gfx/cards/golduck.png
new file mode 100644
index 0000000..ab6e83f
--- /dev/null
+++ b/src/gfx/cards/golduck.png
diff --git a/src/gfx/cards/golem.8x6.png b/src/gfx/cards/golem.8x6.png
deleted file mode 100644
index e64b911..0000000
--- a/src/gfx/cards/golem.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/golem.pal b/src/gfx/cards/golem.pal
deleted file mode 100644
index c0ec481..0000000
--- a/src/gfx/cards/golem.pal
+++ /dev/null
diff --git a/src/gfx/cards/golem.png b/src/gfx/cards/golem.png
new file mode 100644
index 0000000..cffba36
--- /dev/null
+++ b/src/gfx/cards/golem.png
diff --git a/src/gfx/cards/grassenergy.8x6.png b/src/gfx/cards/grassenergy.8x6.png
deleted file mode 100644
index 5cc6b30..0000000
--- a/src/gfx/cards/grassenergy.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/grassenergy.pal b/src/gfx/cards/grassenergy.pal
deleted file mode 100644
index e4d0aaa..0000000
--- a/src/gfx/cards/grassenergy.pal
+++ /dev/null
diff --git a/src/gfx/cards/grassenergy.png b/src/gfx/cards/grassenergy.png
new file mode 100644
index 0000000..e76556f
--- /dev/null
+++ b/src/gfx/cards/grassenergy.png
diff --git a/src/gfx/cards/graveler.8x6.png b/src/gfx/cards/graveler.8x6.png
deleted file mode 100644
index 13a8892..0000000
--- a/src/gfx/cards/graveler.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/graveler.pal b/src/gfx/cards/graveler.pal
deleted file mode 100644
index 50d56dc..0000000
--- a/src/gfx/cards/graveler.pal
+++ /dev/null
diff --git a/src/gfx/cards/graveler.png b/src/gfx/cards/graveler.png
new file mode 100644
index 0000000..0d83998
--- /dev/null
+++ b/src/gfx/cards/graveler.png
diff --git a/src/gfx/cards/grimer.8x6.png b/src/gfx/cards/grimer.8x6.png
deleted file mode 100644
index 19a6737..0000000
--- a/src/gfx/cards/grimer.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/grimer.pal b/src/gfx/cards/grimer.pal
deleted file mode 100644
index 7a5c4d1..0000000
--- a/src/gfx/cards/grimer.pal
+++ /dev/null
diff --git a/src/gfx/cards/grimer.png b/src/gfx/cards/grimer.png
new file mode 100644
index 0000000..19d3cbb
--- /dev/null
+++ b/src/gfx/cards/grimer.png
diff --git a/src/gfx/cards/growlithe.8x6.png b/src/gfx/cards/growlithe.8x6.png
deleted file mode 100644
index 76ce33c..0000000
--- a/src/gfx/cards/growlithe.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/growlithe.pal b/src/gfx/cards/growlithe.pal
deleted file mode 100644
index 6d8c3d2..0000000
--- a/src/gfx/cards/growlithe.pal
+++ /dev/null
diff --git a/src/gfx/cards/growlithe.png b/src/gfx/cards/growlithe.png
new file mode 100644
index 0000000..293020a
--- /dev/null
+++ b/src/gfx/cards/growlithe.png
diff --git a/src/gfx/cards/gustofwind.8x6.png b/src/gfx/cards/gustofwind.8x6.png
deleted file mode 100644
index 70de29d..0000000
--- a/src/gfx/cards/gustofwind.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/gustofwind.pal b/src/gfx/cards/gustofwind.pal
deleted file mode 100644
index 343e078..0000000
--- a/src/gfx/cards/gustofwind.pal
+++ /dev/null
@@ -1 +0,0 @@
-_k�!�@
\ No newline at end of file
diff --git a/src/gfx/cards/gustofwind.png b/src/gfx/cards/gustofwind.png
new file mode 100644
index 0000000..4d6e073
--- /dev/null
+++ b/src/gfx/cards/gustofwind.png
diff --git a/src/gfx/cards/gyarados.8x6.png b/src/gfx/cards/gyarados.8x6.png
deleted file mode 100644
index 20c5dac..0000000
--- a/src/gfx/cards/gyarados.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/gyarados.pal b/src/gfx/cards/gyarados.pal
deleted file mode 100644
index dd1984c..0000000
--- a/src/gfx/cards/gyarados.pal
+++ /dev/null
@@ -1 +0,0 @@
-�kH�A�
\ No newline at end of file
diff --git a/src/gfx/cards/gyarados.png b/src/gfx/cards/gyarados.png
new file mode 100644
index 0000000..7f5b645
--- /dev/null
+++ b/src/gfx/cards/gyarados.png
diff --git a/src/gfx/cards/haunter1.8x6.png b/src/gfx/cards/haunter1.8x6.png
deleted file mode 100644
index 1dc1869..0000000
--- a/src/gfx/cards/haunter1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/haunter1.pal b/src/gfx/cards/haunter1.pal
deleted file mode 100644
index f3af7c0..0000000
--- a/src/gfx/cards/haunter1.pal
+++ /dev/null
@@ -1 +0,0 @@
-_U 
\ No newline at end of file
diff --git a/src/gfx/cards/haunter1.png b/src/gfx/cards/haunter1.png
new file mode 100644
index 0000000..afef947
--- /dev/null
+++ b/src/gfx/cards/haunter1.png
diff --git a/src/gfx/cards/haunter2.8x6.png b/src/gfx/cards/haunter2.8x6.png
deleted file mode 100644
index ffb76a2..0000000
--- a/src/gfx/cards/haunter2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/haunter2.pal b/src/gfx/cards/haunter2.pal
deleted file mode 100644
index 09ac25b..0000000
--- a/src/gfx/cards/haunter2.pal
+++ /dev/null
diff --git a/src/gfx/cards/haunter2.png b/src/gfx/cards/haunter2.png
new file mode 100644
index 0000000..cb68e59
--- /dev/null
+++ b/src/gfx/cards/haunter2.png
diff --git a/src/gfx/cards/hitmonchan.8x6.png b/src/gfx/cards/hitmonchan.8x6.png
deleted file mode 100644
index e9869ac..0000000
--- a/src/gfx/cards/hitmonchan.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/hitmonchan.pal b/src/gfx/cards/hitmonchan.pal
deleted file mode 100644
index 60ce3d0..0000000
--- a/src/gfx/cards/hitmonchan.pal
+++ /dev/null
diff --git a/src/gfx/cards/hitmonchan.png b/src/gfx/cards/hitmonchan.png
new file mode 100644
index 0000000..2828e3f
--- /dev/null
+++ b/src/gfx/cards/hitmonchan.png
diff --git a/src/gfx/cards/hitmonlee.8x6.png b/src/gfx/cards/hitmonlee.8x6.png
deleted file mode 100644
index e67fe78..0000000
--- a/src/gfx/cards/hitmonlee.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/hitmonlee.pal b/src/gfx/cards/hitmonlee.pal
deleted file mode 100644
index 857d807..0000000
--- a/src/gfx/cards/hitmonlee.pal
+++ /dev/null
diff --git a/src/gfx/cards/hitmonlee.png b/src/gfx/cards/hitmonlee.png
new file mode 100644
index 0000000..6a40b93
--- /dev/null
+++ b/src/gfx/cards/hitmonlee.png
diff --git a/src/gfx/cards/horsea.8x6.png b/src/gfx/cards/horsea.8x6.png
deleted file mode 100644
index 19a95d8..0000000
--- a/src/gfx/cards/horsea.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/horsea.pal b/src/gfx/cards/horsea.pal
deleted file mode 100644
index 3dbe59a..0000000
--- a/src/gfx/cards/horsea.pal
+++ /dev/null
diff --git a/src/gfx/cards/horsea.png b/src/gfx/cards/horsea.png
new file mode 100644
index 0000000..43116fe
--- /dev/null
+++ b/src/gfx/cards/horsea.png
diff --git a/src/gfx/cards/hypno.8x6.png b/src/gfx/cards/hypno.8x6.png
deleted file mode 100644
index e58a6c2..0000000
--- a/src/gfx/cards/hypno.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/hypno.pal b/src/gfx/cards/hypno.pal
deleted file mode 100644
index c6f4cdd..0000000
--- a/src/gfx/cards/hypno.pal
+++ /dev/null
diff --git a/src/gfx/cards/hypno.png b/src/gfx/cards/hypno.png
new file mode 100644
index 0000000..22b1dfa
--- /dev/null
+++ b/src/gfx/cards/hypno.png
diff --git a/src/gfx/cards/imakuni.8x6.png b/src/gfx/cards/imakuni.8x6.png
deleted file mode 100644
index ff95e64..0000000
--- a/src/gfx/cards/imakuni.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/imakuni.pal b/src/gfx/cards/imakuni.pal
deleted file mode 100644
index f9c9e88..0000000
--- a/src/gfx/cards/imakuni.pal
+++ /dev/null
diff --git a/src/gfx/cards/imakuni.png b/src/gfx/cards/imakuni.png
new file mode 100644
index 0000000..ce74375
--- /dev/null
+++ b/src/gfx/cards/imakuni.png
diff --git a/src/gfx/cards/imposterprofessoroak.8x6.png b/src/gfx/cards/imposterprofessoroak.8x6.png
deleted file mode 100644
index 2f78301..0000000
--- a/src/gfx/cards/imposterprofessoroak.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/imposterprofessoroak.pal b/src/gfx/cards/imposterprofessoroak.pal
deleted file mode 100644
index 4fdad0f..0000000
--- a/src/gfx/cards/imposterprofessoroak.pal
+++ /dev/null
diff --git a/src/gfx/cards/imposterprofessoroak.png b/src/gfx/cards/imposterprofessoroak.png
new file mode 100644
index 0000000..88bfb1c
--- /dev/null
+++ b/src/gfx/cards/imposterprofessoroak.png
diff --git a/src/gfx/cards/itemfinder.8x6.png b/src/gfx/cards/itemfinder.8x6.png
deleted file mode 100644
index 3ba1499..0000000
--- a/src/gfx/cards/itemfinder.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/itemfinder.pal b/src/gfx/cards/itemfinder.pal
deleted file mode 100644
index 763c960..0000000
--- a/src/gfx/cards/itemfinder.pal
+++ /dev/null
diff --git a/src/gfx/cards/itemfinder.png b/src/gfx/cards/itemfinder.png
new file mode 100644
index 0000000..48bee2e
--- /dev/null
+++ b/src/gfx/cards/itemfinder.png
diff --git a/src/gfx/cards/ivysaur.8x6.png b/src/gfx/cards/ivysaur.8x6.png
deleted file mode 100644
index 4220b52..0000000
--- a/src/gfx/cards/ivysaur.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/ivysaur.pal b/src/gfx/cards/ivysaur.pal
deleted file mode 100644
index 4bf4f92..0000000
--- a/src/gfx/cards/ivysaur.pal
+++ /dev/null
diff --git a/src/gfx/cards/ivysaur.png b/src/gfx/cards/ivysaur.png
new file mode 100644
index 0000000..64d7d4f
--- /dev/null
+++ b/src/gfx/cards/ivysaur.png
diff --git a/src/gfx/cards/jigglypuff1.8x6.png b/src/gfx/cards/jigglypuff1.8x6.png
deleted file mode 100644
index 0986137..0000000
--- a/src/gfx/cards/jigglypuff1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/jigglypuff1.pal b/src/gfx/cards/jigglypuff1.pal
deleted file mode 100644
index 6a8a81a..0000000
--- a/src/gfx/cards/jigglypuff1.pal
+++ /dev/null
@@ -1 +0,0 @@
-��i�2
\ No newline at end of file
diff --git a/src/gfx/cards/jigglypuff1.png b/src/gfx/cards/jigglypuff1.png
new file mode 100644
index 0000000..4c1ae0a
--- /dev/null
+++ b/src/gfx/cards/jigglypuff1.png
diff --git a/src/gfx/cards/jigglypuff2.8x6.png b/src/gfx/cards/jigglypuff2.8x6.png
deleted file mode 100644
index 8fb626e..0000000
--- a/src/gfx/cards/jigglypuff2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/jigglypuff2.pal b/src/gfx/cards/jigglypuff2.pal
deleted file mode 100644
index 147ab62..0000000
--- a/src/gfx/cards/jigglypuff2.pal
+++ /dev/null
diff --git a/src/gfx/cards/jigglypuff2.png b/src/gfx/cards/jigglypuff2.png
new file mode 100644
index 0000000..a94cba9
--- /dev/null
+++ b/src/gfx/cards/jigglypuff2.png
diff --git a/src/gfx/cards/jigglypuff3.8x6.png b/src/gfx/cards/jigglypuff3.8x6.png
deleted file mode 100644
index b67b5ba..0000000
--- a/src/gfx/cards/jigglypuff3.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/jigglypuff3.pal b/src/gfx/cards/jigglypuff3.pal
deleted file mode 100644
index f7ef5d5..0000000
--- a/src/gfx/cards/jigglypuff3.pal
+++ /dev/null
@@ -1 +0,0 @@
-��0D#
\ No newline at end of file
diff --git a/src/gfx/cards/jigglypuff3.png b/src/gfx/cards/jigglypuff3.png
new file mode 100644
index 0000000..a7e8e54
--- /dev/null
+++ b/src/gfx/cards/jigglypuff3.png
diff --git a/src/gfx/cards/jolteon1.8x6.png b/src/gfx/cards/jolteon1.8x6.png
deleted file mode 100644
index 81d403b..0000000
--- a/src/gfx/cards/jolteon1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/jolteon1.pal b/src/gfx/cards/jolteon1.pal
deleted file mode 100644
index d88630e..0000000
--- a/src/gfx/cards/jolteon1.pal
+++ /dev/null
diff --git a/src/gfx/cards/jolteon1.png b/src/gfx/cards/jolteon1.png
new file mode 100644
index 0000000..2af9377
--- /dev/null
+++ b/src/gfx/cards/jolteon1.png
diff --git a/src/gfx/cards/jolteon2.8x6.png b/src/gfx/cards/jolteon2.8x6.png
deleted file mode 100644
index 308966c..0000000
--- a/src/gfx/cards/jolteon2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/jolteon2.pal b/src/gfx/cards/jolteon2.pal
deleted file mode 100644
index 2b1bea1..0000000
--- a/src/gfx/cards/jolteon2.pal
+++ /dev/null
diff --git a/src/gfx/cards/jolteon2.png b/src/gfx/cards/jolteon2.png
new file mode 100644
index 0000000..5a40770
--- /dev/null
+++ b/src/gfx/cards/jolteon2.png
diff --git a/src/gfx/cards/jynx.8x6.png b/src/gfx/cards/jynx.8x6.png
deleted file mode 100644
index 048ae21..0000000
--- a/src/gfx/cards/jynx.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/jynx.pal b/src/gfx/cards/jynx.pal
deleted file mode 100644
index 4992e3c..0000000
--- a/src/gfx/cards/jynx.pal
+++ /dev/null
diff --git a/src/gfx/cards/jynx.png b/src/gfx/cards/jynx.png
new file mode 100644
index 0000000..93a71f0
--- /dev/null
+++ b/src/gfx/cards/jynx.png
diff --git a/src/gfx/cards/kabuto.8x6.png b/src/gfx/cards/kabuto.8x6.png
deleted file mode 100644
index 3ebcaf7..0000000
--- a/src/gfx/cards/kabuto.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/kabuto.pal b/src/gfx/cards/kabuto.pal
deleted file mode 100644
index f26725b..0000000
--- a/src/gfx/cards/kabuto.pal
+++ /dev/null
diff --git a/src/gfx/cards/kabuto.png b/src/gfx/cards/kabuto.png
new file mode 100644
index 0000000..86ed76b
--- /dev/null
+++ b/src/gfx/cards/kabuto.png
diff --git a/src/gfx/cards/kabutops.8x6.png b/src/gfx/cards/kabutops.8x6.png
deleted file mode 100644
index 4efff6b..0000000
--- a/src/gfx/cards/kabutops.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/kabutops.pal b/src/gfx/cards/kabutops.pal
deleted file mode 100644
index 44fd608..0000000
--- a/src/gfx/cards/kabutops.pal
+++ /dev/null
diff --git a/src/gfx/cards/kabutops.png b/src/gfx/cards/kabutops.png
new file mode 100644
index 0000000..e16d426
--- /dev/null
+++ b/src/gfx/cards/kabutops.png
diff --git a/src/gfx/cards/kadabra.8x6.png b/src/gfx/cards/kadabra.8x6.png
deleted file mode 100644
index fe66443..0000000
--- a/src/gfx/cards/kadabra.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/kadabra.pal b/src/gfx/cards/kadabra.pal
deleted file mode 100644
index 6b874e3..0000000
--- a/src/gfx/cards/kadabra.pal
+++ /dev/null
diff --git a/src/gfx/cards/kadabra.png b/src/gfx/cards/kadabra.png
new file mode 100644
index 0000000..350ab8a
--- /dev/null
+++ b/src/gfx/cards/kadabra.png
diff --git a/src/gfx/cards/kakuna.8x6.png b/src/gfx/cards/kakuna.8x6.png
deleted file mode 100644
index 9739a1b..0000000
--- a/src/gfx/cards/kakuna.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/kakuna.pal b/src/gfx/cards/kakuna.pal
deleted file mode 100644
index 743ac9f..0000000
--- a/src/gfx/cards/kakuna.pal
+++ /dev/null
diff --git a/src/gfx/cards/kakuna.png b/src/gfx/cards/kakuna.png
new file mode 100644
index 0000000..e185ef6
--- /dev/null
+++ b/src/gfx/cards/kakuna.png
diff --git a/src/gfx/cards/kangaskhan.8x6.png b/src/gfx/cards/kangaskhan.8x6.png
deleted file mode 100644
index 192fba2..0000000
--- a/src/gfx/cards/kangaskhan.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/kangaskhan.pal b/src/gfx/cards/kangaskhan.pal
deleted file mode 100644
index 8a1f94c..0000000
--- a/src/gfx/cards/kangaskhan.pal
+++ /dev/null
diff --git a/src/gfx/cards/kangaskhan.png b/src/gfx/cards/kangaskhan.png
new file mode 100644
index 0000000..c14b97e
--- /dev/null
+++ b/src/gfx/cards/kangaskhan.png
diff --git a/src/gfx/cards/kingler.8x6.png b/src/gfx/cards/kingler.8x6.png
deleted file mode 100644
index 19966d9..0000000
--- a/src/gfx/cards/kingler.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/kingler.pal b/src/gfx/cards/kingler.pal
deleted file mode 100644
index 3b01628..0000000
--- a/src/gfx/cards/kingler.pal
+++ /dev/null
diff --git a/src/gfx/cards/kingler.png b/src/gfx/cards/kingler.png
new file mode 100644
index 0000000..a90a4f9
--- /dev/null
+++ b/src/gfx/cards/kingler.png
diff --git a/src/gfx/cards/koffing.8x6.png b/src/gfx/cards/koffing.8x6.png
deleted file mode 100644
index cda1a9d..0000000
--- a/src/gfx/cards/koffing.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/koffing.pal b/src/gfx/cards/koffing.pal
deleted file mode 100644
index e2f1b01..0000000
--- a/src/gfx/cards/koffing.pal
+++ /dev/null
@@ -1 +0,0 @@
-�3�U@
\ No newline at end of file
diff --git a/src/gfx/cards/koffing.png b/src/gfx/cards/koffing.png
new file mode 100644
index 0000000..eac4d34
--- /dev/null
+++ b/src/gfx/cards/koffing.png
diff --git a/src/gfx/cards/krabby.8x6.png b/src/gfx/cards/krabby.8x6.png
deleted file mode 100644
index 5dda9a9..0000000
--- a/src/gfx/cards/krabby.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/krabby.pal b/src/gfx/cards/krabby.pal
deleted file mode 100644
index b521b6e..0000000
--- a/src/gfx/cards/krabby.pal
+++ /dev/null
diff --git a/src/gfx/cards/krabby.png b/src/gfx/cards/krabby.png
new file mode 100644
index 0000000..a669a26
--- /dev/null
+++ b/src/gfx/cards/krabby.png
diff --git a/src/gfx/cards/lapras.8x6.png b/src/gfx/cards/lapras.8x6.png
deleted file mode 100644
index 2212622..0000000
--- a/src/gfx/cards/lapras.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/lapras.pal b/src/gfx/cards/lapras.pal
deleted file mode 100644
index 096c79d..0000000
--- a/src/gfx/cards/lapras.pal
+++ /dev/null
diff --git a/src/gfx/cards/lapras.png b/src/gfx/cards/lapras.png
new file mode 100644
index 0000000..7388e8c
--- /dev/null
+++ b/src/gfx/cards/lapras.png
diff --git a/src/gfx/cards/lass.8x6.png b/src/gfx/cards/lass.8x6.png
deleted file mode 100644
index aad9f17..0000000
--- a/src/gfx/cards/lass.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/lass.pal b/src/gfx/cards/lass.pal
deleted file mode 100644
index fdbadf4..0000000
--- a/src/gfx/cards/lass.pal
+++ /dev/null
diff --git a/src/gfx/cards/lass.png b/src/gfx/cards/lass.png
new file mode 100644
index 0000000..1c33c6f
--- /dev/null
+++ b/src/gfx/cards/lass.png
diff --git a/src/gfx/cards/lickitung.8x6.png b/src/gfx/cards/lickitung.8x6.png
deleted file mode 100644
index 857e21a..0000000
--- a/src/gfx/cards/lickitung.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/lickitung.pal b/src/gfx/cards/lickitung.pal
deleted file mode 100644
index 8f9a149..0000000
--- a/src/gfx/cards/lickitung.pal
+++ /dev/null
diff --git a/src/gfx/cards/lickitung.png b/src/gfx/cards/lickitung.png
new file mode 100644
index 0000000..0abc593
--- /dev/null
+++ b/src/gfx/cards/lickitung.png
diff --git a/src/gfx/cards/lightningenergy.8x6.png b/src/gfx/cards/lightningenergy.8x6.png
deleted file mode 100644
index 3fdc83c..0000000
--- a/src/gfx/cards/lightningenergy.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/lightningenergy.pal b/src/gfx/cards/lightningenergy.pal
deleted file mode 100644
index fc96784..0000000
--- a/src/gfx/cards/lightningenergy.pal
+++ /dev/null
diff --git a/src/gfx/cards/lightningenergy.png b/src/gfx/cards/lightningenergy.png
new file mode 100644
index 0000000..d4b627b
--- /dev/null
+++ b/src/gfx/cards/lightningenergy.png
diff --git a/src/gfx/cards/machamp.8x6.png b/src/gfx/cards/machamp.8x6.png
deleted file mode 100644
index 55f52fb..0000000
--- a/src/gfx/cards/machamp.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/machamp.pal b/src/gfx/cards/machamp.pal
deleted file mode 100644
index a138a9a..0000000
--- a/src/gfx/cards/machamp.pal
+++ /dev/null
@@ -1 +0,0 @@
-��V�U�
\ No newline at end of file
diff --git a/src/gfx/cards/machamp.png b/src/gfx/cards/machamp.png
new file mode 100644
index 0000000..3f21a3b
--- /dev/null
+++ b/src/gfx/cards/machamp.png
diff --git a/src/gfx/cards/machoke.8x6.png b/src/gfx/cards/machoke.8x6.png
deleted file mode 100644
index 943d13a..0000000
--- a/src/gfx/cards/machoke.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/machoke.pal b/src/gfx/cards/machoke.pal
deleted file mode 100644
index 948967d..0000000
--- a/src/gfx/cards/machoke.pal
+++ /dev/null
diff --git a/src/gfx/cards/machoke.png b/src/gfx/cards/machoke.png
new file mode 100644
index 0000000..fe76d14
--- /dev/null
+++ b/src/gfx/cards/machoke.png
diff --git a/src/gfx/cards/machop.8x6.png b/src/gfx/cards/machop.8x6.png
deleted file mode 100644
index 256a710..0000000
--- a/src/gfx/cards/machop.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/machop.pal b/src/gfx/cards/machop.pal
deleted file mode 100644
index 060094b..0000000
--- a/src/gfx/cards/machop.pal
+++ /dev/null
diff --git a/src/gfx/cards/machop.png b/src/gfx/cards/machop.png
new file mode 100644
index 0000000..ab9d40c
--- /dev/null
+++ b/src/gfx/cards/machop.png
diff --git a/src/gfx/cards/magikarp.8x6.png b/src/gfx/cards/magikarp.8x6.png
deleted file mode 100644
index 0f40b78..0000000
--- a/src/gfx/cards/magikarp.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/magikarp.pal b/src/gfx/cards/magikarp.pal
deleted file mode 100644
index 252df21..0000000
--- a/src/gfx/cards/magikarp.pal
+++ /dev/null
diff --git a/src/gfx/cards/magikarp.png b/src/gfx/cards/magikarp.png
new file mode 100644
index 0000000..41d79af
--- /dev/null
+++ b/src/gfx/cards/magikarp.png
diff --git a/src/gfx/cards/magmar1.8x6.png b/src/gfx/cards/magmar1.8x6.png
deleted file mode 100644
index 571bdc6..0000000
--- a/src/gfx/cards/magmar1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/magmar1.pal b/src/gfx/cards/magmar1.pal
deleted file mode 100644
index f201dfb..0000000
--- a/src/gfx/cards/magmar1.pal
+++ /dev/null
diff --git a/src/gfx/cards/magmar1.png b/src/gfx/cards/magmar1.png
new file mode 100644
index 0000000..b24106b
--- /dev/null
+++ b/src/gfx/cards/magmar1.png
diff --git a/src/gfx/cards/magmar2.8x6.png b/src/gfx/cards/magmar2.8x6.png
deleted file mode 100644
index 64cd043..0000000
--- a/src/gfx/cards/magmar2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/magmar2.pal b/src/gfx/cards/magmar2.pal
deleted file mode 100644
index 00ddb8f..0000000
--- a/src/gfx/cards/magmar2.pal
+++ /dev/null
diff --git a/src/gfx/cards/magmar2.png b/src/gfx/cards/magmar2.png
new file mode 100644
index 0000000..7722142
--- /dev/null
+++ b/src/gfx/cards/magmar2.png
diff --git a/src/gfx/cards/magnemite1.8x6.png b/src/gfx/cards/magnemite1.8x6.png
deleted file mode 100644
index d81dfb3..0000000
--- a/src/gfx/cards/magnemite1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/magnemite1.pal b/src/gfx/cards/magnemite1.pal
deleted file mode 100644
index 632ec88..0000000
--- a/src/gfx/cards/magnemite1.pal
+++ /dev/null
diff --git a/src/gfx/cards/magnemite1.png b/src/gfx/cards/magnemite1.png
new file mode 100644
index 0000000..ff85f09
--- /dev/null
+++ b/src/gfx/cards/magnemite1.png
diff --git a/src/gfx/cards/magnemite2.8x6.png b/src/gfx/cards/magnemite2.8x6.png
deleted file mode 100644
index 8cb3f4d..0000000
--- a/src/gfx/cards/magnemite2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/magnemite2.pal b/src/gfx/cards/magnemite2.pal
deleted file mode 100644
index 8b36fae..0000000
--- a/src/gfx/cards/magnemite2.pal
+++ /dev/null
diff --git a/src/gfx/cards/magnemite2.png b/src/gfx/cards/magnemite2.png
new file mode 100644
index 0000000..c1b84e6
--- /dev/null
+++ b/src/gfx/cards/magnemite2.png
diff --git a/src/gfx/cards/magneton1.8x6.png b/src/gfx/cards/magneton1.8x6.png
deleted file mode 100644
index efcc9f9..0000000
--- a/src/gfx/cards/magneton1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/magneton1.pal b/src/gfx/cards/magneton1.pal
deleted file mode 100644
index 632ec88..0000000
--- a/src/gfx/cards/magneton1.pal
+++ /dev/null
diff --git a/src/gfx/cards/magneton1.png b/src/gfx/cards/magneton1.png
new file mode 100644
index 0000000..d555492
--- /dev/null
+++ b/src/gfx/cards/magneton1.png
diff --git a/src/gfx/cards/magneton2.8x6.png b/src/gfx/cards/magneton2.8x6.png
deleted file mode 100644
index e20b2f4..0000000
--- a/src/gfx/cards/magneton2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/magneton2.pal b/src/gfx/cards/magneton2.pal
deleted file mode 100644
index 5b13617..0000000
--- a/src/gfx/cards/magneton2.pal
+++ /dev/null
@@ -1 +0,0 @@
-��B�
\ No newline at end of file
diff --git a/src/gfx/cards/magneton2.png b/src/gfx/cards/magneton2.png
new file mode 100644
index 0000000..77eebd7
--- /dev/null
+++ b/src/gfx/cards/magneton2.png
diff --git a/src/gfx/cards/maintenance.8x6.png b/src/gfx/cards/maintenance.8x6.png
deleted file mode 100644
index 915487a..0000000
--- a/src/gfx/cards/maintenance.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/maintenance.pal b/src/gfx/cards/maintenance.pal
deleted file mode 100644
index fb3554f..0000000
--- a/src/gfx/cards/maintenance.pal
+++ /dev/null
diff --git a/src/gfx/cards/maintenance.png b/src/gfx/cards/maintenance.png
new file mode 100644
index 0000000..dba26b4
--- /dev/null
+++ b/src/gfx/cards/maintenance.png
diff --git a/src/gfx/cards/mankey.8x6.png b/src/gfx/cards/mankey.8x6.png
deleted file mode 100644
index 06b4ab3..0000000
--- a/src/gfx/cards/mankey.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/mankey.pal b/src/gfx/cards/mankey.pal
deleted file mode 100644
index f63660e..0000000
--- a/src/gfx/cards/mankey.pal
+++ /dev/null
diff --git a/src/gfx/cards/mankey.png b/src/gfx/cards/mankey.png
new file mode 100644
index 0000000..74af8e1
--- /dev/null
+++ b/src/gfx/cards/mankey.png
diff --git a/src/gfx/cards/marowak1.8x6.png b/src/gfx/cards/marowak1.8x6.png
deleted file mode 100644
index 10d6eca..0000000
--- a/src/gfx/cards/marowak1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/marowak1.pal b/src/gfx/cards/marowak1.pal
deleted file mode 100644
index 021cbd4..0000000
--- a/src/gfx/cards/marowak1.pal
+++ /dev/null
diff --git a/src/gfx/cards/marowak1.png b/src/gfx/cards/marowak1.png
new file mode 100644
index 0000000..7926178
--- /dev/null
+++ b/src/gfx/cards/marowak1.png
diff --git a/src/gfx/cards/marowak2.8x6.png b/src/gfx/cards/marowak2.8x6.png
deleted file mode 100644
index a7023bc..0000000
--- a/src/gfx/cards/marowak2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/marowak2.pal b/src/gfx/cards/marowak2.pal
deleted file mode 100644
index 05e97c9..0000000
--- a/src/gfx/cards/marowak2.pal
+++ /dev/null
diff --git a/src/gfx/cards/marowak2.png b/src/gfx/cards/marowak2.png
new file mode 100644
index 0000000..ec924b6
--- /dev/null
+++ b/src/gfx/cards/marowak2.png
diff --git a/src/gfx/cards/meowth1.8x6.png b/src/gfx/cards/meowth1.8x6.png
deleted file mode 100644
index 3225611..0000000
--- a/src/gfx/cards/meowth1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/meowth1.pal b/src/gfx/cards/meowth1.pal
deleted file mode 100644
index 1505390..0000000
--- a/src/gfx/cards/meowth1.pal
+++ /dev/null
diff --git a/src/gfx/cards/meowth1.png b/src/gfx/cards/meowth1.png
new file mode 100644
index 0000000..80f502e
--- /dev/null
+++ b/src/gfx/cards/meowth1.png
diff --git a/src/gfx/cards/meowth2.8x6.png b/src/gfx/cards/meowth2.8x6.png
deleted file mode 100644
index 6dd0c10..0000000
--- a/src/gfx/cards/meowth2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/meowth2.pal b/src/gfx/cards/meowth2.pal
deleted file mode 100644
index ae55a01..0000000
--- a/src/gfx/cards/meowth2.pal
+++ /dev/null
diff --git a/src/gfx/cards/meowth2.png b/src/gfx/cards/meowth2.png
new file mode 100644
index 0000000..264ce17
--- /dev/null
+++ b/src/gfx/cards/meowth2.png
diff --git a/src/gfx/cards/metapod.8x6.png b/src/gfx/cards/metapod.8x6.png
deleted file mode 100644
index 3c1df91..0000000
--- a/src/gfx/cards/metapod.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/metapod.pal b/src/gfx/cards/metapod.pal
deleted file mode 100644
index 51a1848..0000000
--- a/src/gfx/cards/metapod.pal
+++ /dev/null
diff --git a/src/gfx/cards/metapod.png b/src/gfx/cards/metapod.png
new file mode 100644
index 0000000..3ab895a
--- /dev/null
+++ b/src/gfx/cards/metapod.png
diff --git a/src/gfx/cards/mew1.8x6.png b/src/gfx/cards/mew1.8x6.png
deleted file mode 100644
index aa5e5d5..0000000
--- a/src/gfx/cards/mew1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/mew1.pal b/src/gfx/cards/mew1.pal
deleted file mode 100644
index 7fc106d..0000000
--- a/src/gfx/cards/mew1.pal
+++ /dev/null
diff --git a/src/gfx/cards/mew1.png b/src/gfx/cards/mew1.png
new file mode 100644
index 0000000..983848f
--- /dev/null
+++ b/src/gfx/cards/mew1.png
diff --git a/src/gfx/cards/mew2.8x6.png b/src/gfx/cards/mew2.8x6.png
deleted file mode 100644
index 8658006..0000000
--- a/src/gfx/cards/mew2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/mew2.pal b/src/gfx/cards/mew2.pal
deleted file mode 100644
index 81ae1e6..0000000
--- a/src/gfx/cards/mew2.pal
+++ /dev/null
diff --git a/src/gfx/cards/mew2.png b/src/gfx/cards/mew2.png
new file mode 100644
index 0000000..a2106fb
--- /dev/null
+++ b/src/gfx/cards/mew2.png
diff --git a/src/gfx/cards/mew3.8x6.png b/src/gfx/cards/mew3.8x6.png
deleted file mode 100644
index 189a97b..0000000
--- a/src/gfx/cards/mew3.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/mew3.pal b/src/gfx/cards/mew3.pal
deleted file mode 100644
index e2c6160..0000000
--- a/src/gfx/cards/mew3.pal
+++ /dev/null
@@ -1 +0,0 @@
-��UB
\ No newline at end of file
diff --git a/src/gfx/cards/mew3.png b/src/gfx/cards/mew3.png
new file mode 100644
index 0000000..476c1bc
--- /dev/null
+++ b/src/gfx/cards/mew3.png
diff --git a/src/gfx/cards/mewtwo1.8x6.png b/src/gfx/cards/mewtwo1.8x6.png
deleted file mode 100644
index b5566c5..0000000
--- a/src/gfx/cards/mewtwo1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/mewtwo1.pal b/src/gfx/cards/mewtwo1.pal
deleted file mode 100644
index 5ae9d52..0000000
--- a/src/gfx/cards/mewtwo1.pal
+++ /dev/null
@@ -1 +0,0 @@
-�j�h 
\ No newline at end of file
diff --git a/src/gfx/cards/mewtwo1.png b/src/gfx/cards/mewtwo1.png
new file mode 100644
index 0000000..0200721
--- /dev/null
+++ b/src/gfx/cards/mewtwo1.png
diff --git a/src/gfx/cards/mewtwo2.8x6.png b/src/gfx/cards/mewtwo2.8x6.png
deleted file mode 100644
index 9f36308..0000000
--- a/src/gfx/cards/mewtwo2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/mewtwo2.pal b/src/gfx/cards/mewtwo2.pal
deleted file mode 100644
index bde36b5..0000000
--- a/src/gfx/cards/mewtwo2.pal
+++ /dev/null
diff --git a/src/gfx/cards/mewtwo2.png b/src/gfx/cards/mewtwo2.png
new file mode 100644
index 0000000..9ffefad
--- /dev/null
+++ b/src/gfx/cards/mewtwo2.png
diff --git a/src/gfx/cards/mewtwo3.8x6.png b/src/gfx/cards/mewtwo3.8x6.png
deleted file mode 100644
index bbe8c6e..0000000
--- a/src/gfx/cards/mewtwo3.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/mewtwo3.pal b/src/gfx/cards/mewtwo3.pal
deleted file mode 100644
index d643585..0000000
--- a/src/gfx/cards/mewtwo3.pal
+++ /dev/null
diff --git a/src/gfx/cards/mewtwo3.png b/src/gfx/cards/mewtwo3.png
new file mode 100644
index 0000000..18abd5c
--- /dev/null
+++ b/src/gfx/cards/mewtwo3.png
diff --git a/src/gfx/cards/moltres1.8x6.png b/src/gfx/cards/moltres1.8x6.png
deleted file mode 100644
index cc867ea..0000000
--- a/src/gfx/cards/moltres1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/moltres1.pal b/src/gfx/cards/moltres1.pal
deleted file mode 100644
index 481d6d0..0000000
--- a/src/gfx/cards/moltres1.pal
+++ /dev/null
diff --git a/src/gfx/cards/moltres1.png b/src/gfx/cards/moltres1.png
new file mode 100644
index 0000000..e12fe97
--- /dev/null
+++ b/src/gfx/cards/moltres1.png
diff --git a/src/gfx/cards/moltres2.8x6.png b/src/gfx/cards/moltres2.8x6.png
deleted file mode 100644
index 220cbee..0000000
--- a/src/gfx/cards/moltres2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/moltres2.pal b/src/gfx/cards/moltres2.pal
deleted file mode 100644
index a60186f..0000000
--- a/src/gfx/cards/moltres2.pal
+++ /dev/null
diff --git a/src/gfx/cards/moltres2.png b/src/gfx/cards/moltres2.png
new file mode 100644
index 0000000..5071ef4
--- /dev/null
+++ b/src/gfx/cards/moltres2.png
diff --git a/src/gfx/cards/mrfuji.8x6.png b/src/gfx/cards/mrfuji.8x6.png
deleted file mode 100644
index f012d07..0000000
--- a/src/gfx/cards/mrfuji.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/mrfuji.pal b/src/gfx/cards/mrfuji.pal
deleted file mode 100644
index 7a0bbac..0000000
--- a/src/gfx/cards/mrfuji.pal
+++ /dev/null
@@ -1 +0,0 @@
-_W" 
\ No newline at end of file
diff --git a/src/gfx/cards/mrfuji.png b/src/gfx/cards/mrfuji.png
new file mode 100644
index 0000000..d1b37ae
--- /dev/null
+++ b/src/gfx/cards/mrfuji.png
diff --git a/src/gfx/cards/mrmime.8x6.png b/src/gfx/cards/mrmime.8x6.png
deleted file mode 100644
index 2c16ea4..0000000
--- a/src/gfx/cards/mrmime.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/mrmime.pal b/src/gfx/cards/mrmime.pal
deleted file mode 100644
index 50495ae..0000000
--- a/src/gfx/cards/mrmime.pal
+++ /dev/null
diff --git a/src/gfx/cards/mrmime.png b/src/gfx/cards/mrmime.png
new file mode 100644
index 0000000..42605aa
--- /dev/null
+++ b/src/gfx/cards/mrmime.png
diff --git a/src/gfx/cards/muk.8x6.png b/src/gfx/cards/muk.8x6.png
deleted file mode 100644
index 972d445..0000000
--- a/src/gfx/cards/muk.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/muk.pal b/src/gfx/cards/muk.pal
deleted file mode 100644
index ed9a7d9..0000000
--- a/src/gfx/cards/muk.pal
+++ /dev/null
diff --git a/src/gfx/cards/muk.png b/src/gfx/cards/muk.png
new file mode 100644
index 0000000..51893c1
--- /dev/null
+++ b/src/gfx/cards/muk.png
diff --git a/src/gfx/cards/mysteriousfossil.8x6.png b/src/gfx/cards/mysteriousfossil.8x6.png
deleted file mode 100644
index 93752fc..0000000
--- a/src/gfx/cards/mysteriousfossil.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/mysteriousfossil.pal b/src/gfx/cards/mysteriousfossil.pal
deleted file mode 100644
index 0013d02..0000000
--- a/src/gfx/cards/mysteriousfossil.pal
+++ /dev/null
diff --git a/src/gfx/cards/mysteriousfossil.png b/src/gfx/cards/mysteriousfossil.png
new file mode 100644
index 0000000..1226faa
--- /dev/null
+++ b/src/gfx/cards/mysteriousfossil.png
diff --git a/src/gfx/cards/nidoking.8x6.png b/src/gfx/cards/nidoking.8x6.png
deleted file mode 100644
index eff3ccf..0000000
--- a/src/gfx/cards/nidoking.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/nidoking.pal b/src/gfx/cards/nidoking.pal
deleted file mode 100644
index a58a343..0000000
--- a/src/gfx/cards/nidoking.pal
+++ /dev/null
@@ -1 +0,0 @@
-��iU 
\ No newline at end of file
diff --git a/src/gfx/cards/nidoking.png b/src/gfx/cards/nidoking.png
new file mode 100644
index 0000000..2e6f08a
--- /dev/null
+++ b/src/gfx/cards/nidoking.png
diff --git a/src/gfx/cards/nidoqueen.8x6.png b/src/gfx/cards/nidoqueen.8x6.png
deleted file mode 100644
index 5c67daa..0000000
--- a/src/gfx/cards/nidoqueen.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/nidoqueen.pal b/src/gfx/cards/nidoqueen.pal
deleted file mode 100644
index fc2202a..0000000
--- a/src/gfx/cards/nidoqueen.pal
+++ /dev/null
diff --git a/src/gfx/cards/nidoqueen.png b/src/gfx/cards/nidoqueen.png
new file mode 100644
index 0000000..383bbe7
--- /dev/null
+++ b/src/gfx/cards/nidoqueen.png
diff --git a/src/gfx/cards/nidoranf.8x6.png b/src/gfx/cards/nidoranf.8x6.png
deleted file mode 100644
index 17de19e..0000000
--- a/src/gfx/cards/nidoranf.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/nidoranf.pal b/src/gfx/cards/nidoranf.pal
deleted file mode 100644
index e2209b7..0000000
--- a/src/gfx/cards/nidoranf.pal
+++ /dev/null
diff --git a/src/gfx/cards/nidoranf.png b/src/gfx/cards/nidoranf.png
new file mode 100644
index 0000000..f859596
--- /dev/null
+++ b/src/gfx/cards/nidoranf.png
diff --git a/src/gfx/cards/nidoranm.8x6.png b/src/gfx/cards/nidoranm.8x6.png
deleted file mode 100644
index 00718d9..0000000
--- a/src/gfx/cards/nidoranm.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/nidoranm.pal b/src/gfx/cards/nidoranm.pal
deleted file mode 100644
index b8f783c..0000000
--- a/src/gfx/cards/nidoranm.pal
+++ /dev/null
@@ -1 +0,0 @@
-_k�U�0 
\ No newline at end of file
diff --git a/src/gfx/cards/nidoranm.png b/src/gfx/cards/nidoranm.png
new file mode 100644
index 0000000..bbb304b
--- /dev/null
+++ b/src/gfx/cards/nidoranm.png
diff --git a/src/gfx/cards/nidorina.8x6.png b/src/gfx/cards/nidorina.8x6.png
deleted file mode 100644
index c879610..0000000
--- a/src/gfx/cards/nidorina.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/nidorina.pal b/src/gfx/cards/nidorina.pal
deleted file mode 100644
index cd74af4..0000000
--- a/src/gfx/cards/nidorina.pal
+++ /dev/null
diff --git a/src/gfx/cards/nidorina.png b/src/gfx/cards/nidorina.png
new file mode 100644
index 0000000..939e887
--- /dev/null
+++ b/src/gfx/cards/nidorina.png
diff --git a/src/gfx/cards/nidorino.8x6.png b/src/gfx/cards/nidorino.8x6.png
deleted file mode 100644
index 65f851c..0000000
--- a/src/gfx/cards/nidorino.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/nidorino.pal b/src/gfx/cards/nidorino.pal
deleted file mode 100644
index 8310b61..0000000
--- a/src/gfx/cards/nidorino.pal
+++ /dev/null
@@ -1 +0,0 @@
-_kVA 
\ No newline at end of file
diff --git a/src/gfx/cards/nidorino.png b/src/gfx/cards/nidorino.png
new file mode 100644
index 0000000..d9bc6ca
--- /dev/null
+++ b/src/gfx/cards/nidorino.png
diff --git a/src/gfx/cards/ninetails1.8x6.png b/src/gfx/cards/ninetails1.8x6.png
deleted file mode 100644
index eba870d..0000000
--- a/src/gfx/cards/ninetails1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/ninetails1.pal b/src/gfx/cards/ninetails1.pal
deleted file mode 100644
index 90d7857..0000000
--- a/src/gfx/cards/ninetails1.pal
+++ /dev/null
diff --git a/src/gfx/cards/ninetails1.png b/src/gfx/cards/ninetails1.png
new file mode 100644
index 0000000..38ed8be
--- /dev/null
+++ b/src/gfx/cards/ninetails1.png
diff --git a/src/gfx/cards/ninetails2.8x6.png b/src/gfx/cards/ninetails2.8x6.png
deleted file mode 100644
index 2003e52..0000000
--- a/src/gfx/cards/ninetails2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/ninetails2.pal b/src/gfx/cards/ninetails2.pal
deleted file mode 100644
index 8341ea2..0000000
--- a/src/gfx/cards/ninetails2.pal
+++ /dev/null
diff --git a/src/gfx/cards/ninetails2.png b/src/gfx/cards/ninetails2.png
new file mode 100644
index 0000000..43a165d
--- /dev/null
+++ b/src/gfx/cards/ninetails2.png
diff --git a/src/gfx/cards/oddish.8x6.png b/src/gfx/cards/oddish.8x6.png
deleted file mode 100644
index b37f1c0..0000000
--- a/src/gfx/cards/oddish.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/oddish.pal b/src/gfx/cards/oddish.pal
deleted file mode 100644
index e798b00..0000000
--- a/src/gfx/cards/oddish.pal
+++ /dev/null
diff --git a/src/gfx/cards/oddish.png b/src/gfx/cards/oddish.png
new file mode 100644
index 0000000..b5474e6
--- /dev/null
+++ b/src/gfx/cards/oddish.png
diff --git a/src/gfx/cards/omanyte.8x6.png b/src/gfx/cards/omanyte.8x6.png
deleted file mode 100644
index b56b359..0000000
--- a/src/gfx/cards/omanyte.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/omanyte.pal b/src/gfx/cards/omanyte.pal
deleted file mode 100644
index cddccc7..0000000
--- a/src/gfx/cards/omanyte.pal
+++ /dev/null
diff --git a/src/gfx/cards/omanyte.png b/src/gfx/cards/omanyte.png
new file mode 100644
index 0000000..f1ec65f
--- /dev/null
+++ b/src/gfx/cards/omanyte.png
diff --git a/src/gfx/cards/omastar.8x6.png b/src/gfx/cards/omastar.8x6.png
deleted file mode 100644
index ba090fc..0000000
--- a/src/gfx/cards/omastar.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/omastar.pal b/src/gfx/cards/omastar.pal
deleted file mode 100644
index b9f69b3..0000000
--- a/src/gfx/cards/omastar.pal
+++ /dev/null
diff --git a/src/gfx/cards/omastar.png b/src/gfx/cards/omastar.png
new file mode 100644
index 0000000..bce6c17
--- /dev/null
+++ b/src/gfx/cards/omastar.png
diff --git a/src/gfx/cards/onix.8x6.png b/src/gfx/cards/onix.8x6.png
deleted file mode 100644
index 5d48c2c..0000000
--- a/src/gfx/cards/onix.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/onix.pal b/src/gfx/cards/onix.pal
deleted file mode 100644
index b8cc75e..0000000
--- a/src/gfx/cards/onix.pal
+++ /dev/null
diff --git a/src/gfx/cards/onix.png b/src/gfx/cards/onix.png
new file mode 100644
index 0000000..44ef65e
--- /dev/null
+++ b/src/gfx/cards/onix.png
diff --git a/src/gfx/cards/paras.8x6.png b/src/gfx/cards/paras.8x6.png
deleted file mode 100644
index 6054beb..0000000
--- a/src/gfx/cards/paras.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/paras.pal b/src/gfx/cards/paras.pal
deleted file mode 100644
index 2865103..0000000
--- a/src/gfx/cards/paras.pal
+++ /dev/null
@@ -1 +0,0 @@
-��
\ No newline at end of file
diff --git a/src/gfx/cards/paras.png b/src/gfx/cards/paras.png
new file mode 100644
index 0000000..61a5e98
--- /dev/null
+++ b/src/gfx/cards/paras.png
diff --git a/src/gfx/cards/parasect.8x6.png b/src/gfx/cards/parasect.8x6.png
deleted file mode 100644
index 3c772f4..0000000
--- a/src/gfx/cards/parasect.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/parasect.pal b/src/gfx/cards/parasect.pal
deleted file mode 100644
index a6f1581..0000000
--- a/src/gfx/cards/parasect.pal
+++ /dev/null
diff --git a/src/gfx/cards/parasect.png b/src/gfx/cards/parasect.png
new file mode 100644
index 0000000..d5bd538
--- /dev/null
+++ b/src/gfx/cards/parasect.png
diff --git a/src/gfx/cards/persian.8x6.png b/src/gfx/cards/persian.8x6.png
deleted file mode 100644
index 0cdc9ee..0000000
--- a/src/gfx/cards/persian.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/persian.pal b/src/gfx/cards/persian.pal
deleted file mode 100644
index 17afb1f..0000000
--- a/src/gfx/cards/persian.pal
+++ /dev/null
diff --git a/src/gfx/cards/persian.png b/src/gfx/cards/persian.png
new file mode 100644
index 0000000..59144bf
--- /dev/null
+++ b/src/gfx/cards/persian.png
diff --git a/src/gfx/cards/pidgeot1.8x6.png b/src/gfx/cards/pidgeot1.8x6.png
deleted file mode 100644
index 4f3422a..0000000
--- a/src/gfx/cards/pidgeot1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pidgeot1.pal b/src/gfx/cards/pidgeot1.pal
deleted file mode 100644
index 0cb3532..0000000
--- a/src/gfx/cards/pidgeot1.pal
+++ /dev/null
diff --git a/src/gfx/cards/pidgeot1.png b/src/gfx/cards/pidgeot1.png
new file mode 100644
index 0000000..e6498b4
--- /dev/null
+++ b/src/gfx/cards/pidgeot1.png
diff --git a/src/gfx/cards/pidgeot2.8x6.png b/src/gfx/cards/pidgeot2.8x6.png
deleted file mode 100644
index ede4ad5..0000000
--- a/src/gfx/cards/pidgeot2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pidgeot2.pal b/src/gfx/cards/pidgeot2.pal
deleted file mode 100644
index b5f5ea0..0000000
--- a/src/gfx/cards/pidgeot2.pal
+++ /dev/null
diff --git a/src/gfx/cards/pidgeot2.png b/src/gfx/cards/pidgeot2.png
new file mode 100644
index 0000000..8e5f742
--- /dev/null
+++ b/src/gfx/cards/pidgeot2.png
diff --git a/src/gfx/cards/pidgeotto.8x6.png b/src/gfx/cards/pidgeotto.8x6.png
deleted file mode 100644
index ec7e03d..0000000
--- a/src/gfx/cards/pidgeotto.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pidgeotto.pal b/src/gfx/cards/pidgeotto.pal
deleted file mode 100644
index 14413aa..0000000
--- a/src/gfx/cards/pidgeotto.pal
+++ /dev/null
diff --git a/src/gfx/cards/pidgeotto.png b/src/gfx/cards/pidgeotto.png
new file mode 100644
index 0000000..f52c342
--- /dev/null
+++ b/src/gfx/cards/pidgeotto.png
diff --git a/src/gfx/cards/pidgey.8x6.png b/src/gfx/cards/pidgey.8x6.png
deleted file mode 100644
index 5fc97a5..0000000
--- a/src/gfx/cards/pidgey.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pidgey.pal b/src/gfx/cards/pidgey.pal
deleted file mode 100644
index 52c807a..0000000
--- a/src/gfx/cards/pidgey.pal
+++ /dev/null
diff --git a/src/gfx/cards/pidgey.png b/src/gfx/cards/pidgey.png
new file mode 100644
index 0000000..e32186a
--- /dev/null
+++ b/src/gfx/cards/pidgey.png
diff --git a/src/gfx/cards/pikachu1.8x6.png b/src/gfx/cards/pikachu1.8x6.png
deleted file mode 100644
index 5696eb2..0000000
--- a/src/gfx/cards/pikachu1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pikachu1.pal b/src/gfx/cards/pikachu1.pal
deleted file mode 100644
index 31ce085..0000000
--- a/src/gfx/cards/pikachu1.pal
+++ /dev/null
diff --git a/src/gfx/cards/pikachu1.png b/src/gfx/cards/pikachu1.png
new file mode 100644
index 0000000..a28298a
--- /dev/null
+++ b/src/gfx/cards/pikachu1.png
diff --git a/src/gfx/cards/pikachu2.8x6.png b/src/gfx/cards/pikachu2.8x6.png
deleted file mode 100644
index b97b530..0000000
--- a/src/gfx/cards/pikachu2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pikachu2.pal b/src/gfx/cards/pikachu2.pal
deleted file mode 100644
index 0a5206f..0000000
--- a/src/gfx/cards/pikachu2.pal
+++ /dev/null
diff --git a/src/gfx/cards/pikachu2.png b/src/gfx/cards/pikachu2.png
new file mode 100644
index 0000000..f85b40a
--- /dev/null
+++ b/src/gfx/cards/pikachu2.png
diff --git a/src/gfx/cards/pikachu3.8x6.png b/src/gfx/cards/pikachu3.8x6.png
deleted file mode 100644
index 4dec614..0000000
--- a/src/gfx/cards/pikachu3.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pikachu3.pal b/src/gfx/cards/pikachu3.pal
deleted file mode 100644
index 7e93511..0000000
--- a/src/gfx/cards/pikachu3.pal
+++ /dev/null
diff --git a/src/gfx/cards/pikachu3.png b/src/gfx/cards/pikachu3.png
new file mode 100644
index 0000000..e0155e5
--- /dev/null
+++ b/src/gfx/cards/pikachu3.png
diff --git a/src/gfx/cards/pikachu4.8x6.png b/src/gfx/cards/pikachu4.8x6.png
deleted file mode 100644
index b355807..0000000
--- a/src/gfx/cards/pikachu4.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pikachu4.pal b/src/gfx/cards/pikachu4.pal
deleted file mode 100644
index 4cdf54b..0000000
--- a/src/gfx/cards/pikachu4.pal
+++ /dev/null
diff --git a/src/gfx/cards/pikachu4.png b/src/gfx/cards/pikachu4.png
new file mode 100644
index 0000000..c918c94
--- /dev/null
+++ b/src/gfx/cards/pikachu4.png
diff --git a/src/gfx/cards/pinsir.8x6.png b/src/gfx/cards/pinsir.8x6.png
deleted file mode 100644
index 1e23b81..0000000
--- a/src/gfx/cards/pinsir.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pinsir.pal b/src/gfx/cards/pinsir.pal
deleted file mode 100644
index 13418da..0000000
--- a/src/gfx/cards/pinsir.pal
+++ /dev/null
diff --git a/src/gfx/cards/pinsir.png b/src/gfx/cards/pinsir.png
new file mode 100644
index 0000000..35a7a67
--- /dev/null
+++ b/src/gfx/cards/pinsir.png
diff --git a/src/gfx/cards/pluspower.8x6.png b/src/gfx/cards/pluspower.8x6.png
deleted file mode 100644
index efb4b1c..0000000
--- a/src/gfx/cards/pluspower.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pluspower.pal b/src/gfx/cards/pluspower.pal
deleted file mode 100644
index 6ab8631..0000000
--- a/src/gfx/cards/pluspower.pal
+++ /dev/null
diff --git a/src/gfx/cards/pluspower.png b/src/gfx/cards/pluspower.png
new file mode 100644
index 0000000..5882fcc
--- /dev/null
+++ b/src/gfx/cards/pluspower.png
diff --git a/src/gfx/cards/pokeball.8x6.png b/src/gfx/cards/pokeball.8x6.png
deleted file mode 100644
index bd99dfd..0000000
--- a/src/gfx/cards/pokeball.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pokeball.pal b/src/gfx/cards/pokeball.pal
deleted file mode 100644
index c6230de..0000000
--- a/src/gfx/cards/pokeball.pal
+++ /dev/null
diff --git a/src/gfx/cards/pokeball.png b/src/gfx/cards/pokeball.png
new file mode 100644
index 0000000..bb2750d
--- /dev/null
+++ b/src/gfx/cards/pokeball.png
diff --git a/src/gfx/cards/pokedex.8x6.png b/src/gfx/cards/pokedex.8x6.png
deleted file mode 100644
index 970be3e..0000000
--- a/src/gfx/cards/pokedex.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pokedex.pal b/src/gfx/cards/pokedex.pal
deleted file mode 100644
index ab3a819..0000000
--- a/src/gfx/cards/pokedex.pal
+++ /dev/null
diff --git a/src/gfx/cards/pokedex.png b/src/gfx/cards/pokedex.png
new file mode 100644
index 0000000..cb94fed
--- /dev/null
+++ b/src/gfx/cards/pokedex.png
diff --git a/src/gfx/cards/pokemonbreeder.8x6.png b/src/gfx/cards/pokemonbreeder.8x6.png
deleted file mode 100644
index 0661bde..0000000
--- a/src/gfx/cards/pokemonbreeder.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pokemonbreeder.pal b/src/gfx/cards/pokemonbreeder.pal
deleted file mode 100644
index 411a545..0000000
--- a/src/gfx/cards/pokemonbreeder.pal
+++ /dev/null
diff --git a/src/gfx/cards/pokemonbreeder.png b/src/gfx/cards/pokemonbreeder.png
new file mode 100644
index 0000000..c9b875f
--- /dev/null
+++ b/src/gfx/cards/pokemonbreeder.png
diff --git a/src/gfx/cards/pokemoncenter.8x6.png b/src/gfx/cards/pokemoncenter.8x6.png
deleted file mode 100644
index 2ddffb8..0000000
--- a/src/gfx/cards/pokemoncenter.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pokemoncenter.pal b/src/gfx/cards/pokemoncenter.pal
deleted file mode 100644
index 318425d..0000000
--- a/src/gfx/cards/pokemoncenter.pal
+++ /dev/null
diff --git a/src/gfx/cards/pokemoncenter.png b/src/gfx/cards/pokemoncenter.png
new file mode 100644
index 0000000..652446c
--- /dev/null
+++ b/src/gfx/cards/pokemoncenter.png
diff --git a/src/gfx/cards/pokemonflute.8x6.png b/src/gfx/cards/pokemonflute.8x6.png
deleted file mode 100644
index f9cb9df..0000000
--- a/src/gfx/cards/pokemonflute.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pokemonflute.pal b/src/gfx/cards/pokemonflute.pal
deleted file mode 100644
index 5185e49..0000000
--- a/src/gfx/cards/pokemonflute.pal
+++ /dev/null
diff --git a/src/gfx/cards/pokemonflute.png b/src/gfx/cards/pokemonflute.png
new file mode 100644
index 0000000..979ebf1
--- /dev/null
+++ b/src/gfx/cards/pokemonflute.png
diff --git a/src/gfx/cards/pokemontrader.8x6.png b/src/gfx/cards/pokemontrader.8x6.png
deleted file mode 100644
index c35959d..0000000
--- a/src/gfx/cards/pokemontrader.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/pokemontrader.pal b/src/gfx/cards/pokemontrader.pal
deleted file mode 100644
index c0ce4fc..0000000
--- a/src/gfx/cards/pokemontrader.pal
+++ /dev/null
diff --git a/src/gfx/cards/pokemontrader.png b/src/gfx/cards/pokemontrader.png
new file mode 100644
index 0000000..bc9dfc2
--- /dev/null
+++ b/src/gfx/cards/pokemontrader.png
diff --git a/src/gfx/cards/poliwag.8x6.png b/src/gfx/cards/poliwag.8x6.png
deleted file mode 100644
index e555007..0000000
--- a/src/gfx/cards/poliwag.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/poliwag.pal b/src/gfx/cards/poliwag.pal
deleted file mode 100644
index b7612e9..0000000
--- a/src/gfx/cards/poliwag.pal
+++ /dev/null
diff --git a/src/gfx/cards/poliwag.png b/src/gfx/cards/poliwag.png
new file mode 100644
index 0000000..f4e0ae8
--- /dev/null
+++ b/src/gfx/cards/poliwag.png
diff --git a/src/gfx/cards/poliwhirl.8x6.png b/src/gfx/cards/poliwhirl.8x6.png
deleted file mode 100644
index bf73eca..0000000
--- a/src/gfx/cards/poliwhirl.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/poliwhirl.pal b/src/gfx/cards/poliwhirl.pal
deleted file mode 100644
index 1ece94a..0000000
--- a/src/gfx/cards/poliwhirl.pal
+++ /dev/null
diff --git a/src/gfx/cards/poliwhirl.png b/src/gfx/cards/poliwhirl.png
new file mode 100644
index 0000000..e778014
--- /dev/null
+++ b/src/gfx/cards/poliwhirl.png
diff --git a/src/gfx/cards/poliwrath.8x6.png b/src/gfx/cards/poliwrath.8x6.png
deleted file mode 100644
index d4af8a2..0000000
--- a/src/gfx/cards/poliwrath.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/poliwrath.pal b/src/gfx/cards/poliwrath.pal
deleted file mode 100644
index 91d9eda..0000000
--- a/src/gfx/cards/poliwrath.pal
+++ /dev/null
diff --git a/src/gfx/cards/poliwrath.png b/src/gfx/cards/poliwrath.png
new file mode 100644
index 0000000..5d50e45
--- /dev/null
+++ b/src/gfx/cards/poliwrath.png
diff --git a/src/gfx/cards/ponyta.8x6.png b/src/gfx/cards/ponyta.8x6.png
deleted file mode 100644
index 051665a..0000000
--- a/src/gfx/cards/ponyta.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/ponyta.pal b/src/gfx/cards/ponyta.pal
deleted file mode 100644
index 0109046..0000000
--- a/src/gfx/cards/ponyta.pal
+++ /dev/null
diff --git a/src/gfx/cards/ponyta.png b/src/gfx/cards/ponyta.png
new file mode 100644
index 0000000..c4b7554
--- /dev/null
+++ b/src/gfx/cards/ponyta.png
diff --git a/src/gfx/cards/porygon.8x6.png b/src/gfx/cards/porygon.8x6.png
deleted file mode 100644
index bd21d61..0000000
--- a/src/gfx/cards/porygon.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/porygon.pal b/src/gfx/cards/porygon.pal
deleted file mode 100644
index 6d540f9..0000000
--- a/src/gfx/cards/porygon.pal
+++ /dev/null
@@ -1 +0,0 @@
-�j�  
\ No newline at end of file
diff --git a/src/gfx/cards/porygon.png b/src/gfx/cards/porygon.png
new file mode 100644
index 0000000..a2ebed7
--- /dev/null
+++ b/src/gfx/cards/porygon.png
diff --git a/src/gfx/cards/potion.8x6.png b/src/gfx/cards/potion.8x6.png
deleted file mode 100644
index 2ea8805..0000000
--- a/src/gfx/cards/potion.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/potion.pal b/src/gfx/cards/potion.pal
deleted file mode 100644
index 182bfcb..0000000
--- a/src/gfx/cards/potion.pal
+++ /dev/null
diff --git a/src/gfx/cards/potion.png b/src/gfx/cards/potion.png
new file mode 100644
index 0000000..15ae183
--- /dev/null
+++ b/src/gfx/cards/potion.png
diff --git a/src/gfx/cards/primeape.8x6.png b/src/gfx/cards/primeape.8x6.png
deleted file mode 100644
index 6b3186d..0000000
--- a/src/gfx/cards/primeape.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/primeape.pal b/src/gfx/cards/primeape.pal
deleted file mode 100644
index 56cdfa1..0000000
--- a/src/gfx/cards/primeape.pal
+++ /dev/null
diff --git a/src/gfx/cards/primeape.png b/src/gfx/cards/primeape.png
new file mode 100644
index 0000000..fdfc577
--- /dev/null
+++ b/src/gfx/cards/primeape.png
diff --git a/src/gfx/cards/professoroak.8x6.png b/src/gfx/cards/professoroak.8x6.png
deleted file mode 100644
index 1073c5a..0000000
--- a/src/gfx/cards/professoroak.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/professoroak.pal b/src/gfx/cards/professoroak.pal
deleted file mode 100644
index 4ad5671..0000000
--- a/src/gfx/cards/professoroak.pal
+++ /dev/null
diff --git a/src/gfx/cards/professoroak.png b/src/gfx/cards/professoroak.png
new file mode 100644
index 0000000..aaf249a
--- /dev/null
+++ b/src/gfx/cards/professoroak.png
diff --git a/src/gfx/cards/psychicenergy.8x6.png b/src/gfx/cards/psychicenergy.8x6.png
deleted file mode 100644
index d2ed9ab..0000000
--- a/src/gfx/cards/psychicenergy.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/psychicenergy.pal b/src/gfx/cards/psychicenergy.pal
deleted file mode 100644
index 44fd31a..0000000
--- a/src/gfx/cards/psychicenergy.pal
+++ /dev/null
@@ -1 +0,0 @@
-_�i�@ 
\ No newline at end of file
diff --git a/src/gfx/cards/psychicenergy.png b/src/gfx/cards/psychicenergy.png
new file mode 100644
index 0000000..20d54d8
--- /dev/null
+++ b/src/gfx/cards/psychicenergy.png
diff --git a/src/gfx/cards/psyduck.8x6.png b/src/gfx/cards/psyduck.8x6.png
deleted file mode 100644
index 22f2188..0000000
--- a/src/gfx/cards/psyduck.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/psyduck.pal b/src/gfx/cards/psyduck.pal
deleted file mode 100644
index e94c8ff..0000000
--- a/src/gfx/cards/psyduck.pal
+++ /dev/null
diff --git a/src/gfx/cards/psyduck.png b/src/gfx/cards/psyduck.png
new file mode 100644
index 0000000..323ae49
--- /dev/null
+++ b/src/gfx/cards/psyduck.png
diff --git a/src/gfx/cards/raichu1.8x6.png b/src/gfx/cards/raichu1.8x6.png
deleted file mode 100644
index 84aa606..0000000
--- a/src/gfx/cards/raichu1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/raichu1.pal b/src/gfx/cards/raichu1.pal
deleted file mode 100644
index 390ad34..0000000
--- a/src/gfx/cards/raichu1.pal
+++ /dev/null
diff --git a/src/gfx/cards/raichu1.png b/src/gfx/cards/raichu1.png
new file mode 100644
index 0000000..9b2d6ff
--- /dev/null
+++ b/src/gfx/cards/raichu1.png
diff --git a/src/gfx/cards/raichu2.8x6.png b/src/gfx/cards/raichu2.8x6.png
deleted file mode 100644
index 708699a..0000000
--- a/src/gfx/cards/raichu2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/raichu2.pal b/src/gfx/cards/raichu2.pal
deleted file mode 100644
index 8cef515..0000000
--- a/src/gfx/cards/raichu2.pal
+++ /dev/null
diff --git a/src/gfx/cards/raichu2.png b/src/gfx/cards/raichu2.png
new file mode 100644
index 0000000..8c35b05
--- /dev/null
+++ b/src/gfx/cards/raichu2.png
diff --git a/src/gfx/cards/rapidash.8x6.png b/src/gfx/cards/rapidash.8x6.png
deleted file mode 100644
index 0ae1186..0000000
--- a/src/gfx/cards/rapidash.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/rapidash.pal b/src/gfx/cards/rapidash.pal
deleted file mode 100644
index 87185a3..0000000
--- a/src/gfx/cards/rapidash.pal
+++ /dev/null
diff --git a/src/gfx/cards/rapidash.png b/src/gfx/cards/rapidash.png
new file mode 100644
index 0000000..d86f93e
--- /dev/null
+++ b/src/gfx/cards/rapidash.png
diff --git a/src/gfx/cards/raticate.8x6.png b/src/gfx/cards/raticate.8x6.png
deleted file mode 100644
index 8c79e7f..0000000
--- a/src/gfx/cards/raticate.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/raticate.pal b/src/gfx/cards/raticate.pal
deleted file mode 100644
index 9a861fc..0000000
--- a/src/gfx/cards/raticate.pal
+++ /dev/null
diff --git a/src/gfx/cards/raticate.png b/src/gfx/cards/raticate.png
new file mode 100644
index 0000000..a20c6b9
--- /dev/null
+++ b/src/gfx/cards/raticate.png
diff --git a/src/gfx/cards/rattata.8x6.png b/src/gfx/cards/rattata.8x6.png
deleted file mode 100644
index 2bf4f19..0000000
--- a/src/gfx/cards/rattata.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/rattata.pal b/src/gfx/cards/rattata.pal
deleted file mode 100644
index 9e49d97..0000000
--- a/src/gfx/cards/rattata.pal
+++ /dev/null
diff --git a/src/gfx/cards/rattata.png b/src/gfx/cards/rattata.png
new file mode 100644
index 0000000..d90ea49
--- /dev/null
+++ b/src/gfx/cards/rattata.png
diff --git a/src/gfx/cards/recycle.8x6.png b/src/gfx/cards/recycle.8x6.png
deleted file mode 100644
index e7e809c..0000000
--- a/src/gfx/cards/recycle.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/recycle.pal b/src/gfx/cards/recycle.pal
deleted file mode 100644
index 9da25ce..0000000
--- a/src/gfx/cards/recycle.pal
+++ /dev/null
diff --git a/src/gfx/cards/recycle.png b/src/gfx/cards/recycle.png
new file mode 100644
index 0000000..32637ce
--- /dev/null
+++ b/src/gfx/cards/recycle.png
diff --git a/src/gfx/cards/revive.8x6.png b/src/gfx/cards/revive.8x6.png
deleted file mode 100644
index 6cf1afa..0000000
--- a/src/gfx/cards/revive.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/revive.pal b/src/gfx/cards/revive.pal
deleted file mode 100644
index 5b62c4f..0000000
--- a/src/gfx/cards/revive.pal
+++ /dev/null
diff --git a/src/gfx/cards/revive.png b/src/gfx/cards/revive.png
new file mode 100644
index 0000000..e2df762
--- /dev/null
+++ b/src/gfx/cards/revive.png
diff --git a/src/gfx/cards/rhydon.8x6.png b/src/gfx/cards/rhydon.8x6.png
deleted file mode 100644
index c420a66..0000000
--- a/src/gfx/cards/rhydon.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/rhydon.pal b/src/gfx/cards/rhydon.pal
deleted file mode 100644
index 311cd3e..0000000
--- a/src/gfx/cards/rhydon.pal
+++ /dev/null
diff --git a/src/gfx/cards/rhydon.png b/src/gfx/cards/rhydon.png
new file mode 100644
index 0000000..550256f
--- /dev/null
+++ b/src/gfx/cards/rhydon.png
diff --git a/src/gfx/cards/rhyhorn.8x6.png b/src/gfx/cards/rhyhorn.8x6.png
deleted file mode 100644
index 591f7b5..0000000
--- a/src/gfx/cards/rhyhorn.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/rhyhorn.pal b/src/gfx/cards/rhyhorn.pal
deleted file mode 100644
index fd637ff..0000000
--- a/src/gfx/cards/rhyhorn.pal
+++ /dev/null
diff --git a/src/gfx/cards/rhyhorn.png b/src/gfx/cards/rhyhorn.png
new file mode 100644
index 0000000..62740d4
--- /dev/null
+++ b/src/gfx/cards/rhyhorn.png
diff --git a/src/gfx/cards/sandshrew.8x6.png b/src/gfx/cards/sandshrew.8x6.png
deleted file mode 100644
index db01d0c..0000000
--- a/src/gfx/cards/sandshrew.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/sandshrew.pal b/src/gfx/cards/sandshrew.pal
deleted file mode 100644
index 5b6f131..0000000
--- a/src/gfx/cards/sandshrew.pal
+++ /dev/null
diff --git a/src/gfx/cards/sandshrew.png b/src/gfx/cards/sandshrew.png
new file mode 100644
index 0000000..c83e2c4
--- /dev/null
+++ b/src/gfx/cards/sandshrew.png
diff --git a/src/gfx/cards/sandslash.8x6.png b/src/gfx/cards/sandslash.8x6.png
deleted file mode 100644
index 438b2e2..0000000
--- a/src/gfx/cards/sandslash.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/sandslash.pal b/src/gfx/cards/sandslash.pal
deleted file mode 100644
index 1935ba9..0000000
--- a/src/gfx/cards/sandslash.pal
+++ /dev/null
diff --git a/src/gfx/cards/sandslash.png b/src/gfx/cards/sandslash.png
new file mode 100644
index 0000000..a6d739d
--- /dev/null
+++ b/src/gfx/cards/sandslash.png
diff --git a/src/gfx/cards/scoopup.8x6.png b/src/gfx/cards/scoopup.8x6.png
deleted file mode 100644
index 3e75ec7..0000000
--- a/src/gfx/cards/scoopup.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/scoopup.pal b/src/gfx/cards/scoopup.pal
deleted file mode 100644
index 343e078..0000000
--- a/src/gfx/cards/scoopup.pal
+++ /dev/null
@@ -1 +0,0 @@
-_k�!�@
\ No newline at end of file
diff --git a/src/gfx/cards/scoopup.png b/src/gfx/cards/scoopup.png
new file mode 100644
index 0000000..e9364ff
--- /dev/null
+++ b/src/gfx/cards/scoopup.png
diff --git a/src/gfx/cards/scyther.8x6.png b/src/gfx/cards/scyther.8x6.png
deleted file mode 100644
index 85d9255..0000000
--- a/src/gfx/cards/scyther.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/scyther.pal b/src/gfx/cards/scyther.pal
deleted file mode 100644
index 1da0cd9..0000000
--- a/src/gfx/cards/scyther.pal
+++ /dev/null
diff --git a/src/gfx/cards/scyther.png b/src/gfx/cards/scyther.png
new file mode 100644
index 0000000..ddc9624
--- /dev/null
+++ b/src/gfx/cards/scyther.png
diff --git a/src/gfx/cards/seadra.8x6.png b/src/gfx/cards/seadra.8x6.png
deleted file mode 100644
index 168eb4e..0000000
--- a/src/gfx/cards/seadra.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/seadra.pal b/src/gfx/cards/seadra.pal
deleted file mode 100644
index 1fc8f85..0000000
--- a/src/gfx/cards/seadra.pal
+++ /dev/null
diff --git a/src/gfx/cards/seadra.png b/src/gfx/cards/seadra.png
new file mode 100644
index 0000000..1ceefc6
--- /dev/null
+++ b/src/gfx/cards/seadra.png
diff --git a/src/gfx/cards/seaking.8x6.png b/src/gfx/cards/seaking.8x6.png
deleted file mode 100644
index ada6702..0000000
--- a/src/gfx/cards/seaking.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/seaking.pal b/src/gfx/cards/seaking.pal
deleted file mode 100644
index 08a50b6..0000000
--- a/src/gfx/cards/seaking.pal
+++ /dev/null
diff --git a/src/gfx/cards/seaking.png b/src/gfx/cards/seaking.png
new file mode 100644
index 0000000..8f58c89
--- /dev/null
+++ b/src/gfx/cards/seaking.png
diff --git a/src/gfx/cards/seel.8x6.png b/src/gfx/cards/seel.8x6.png
deleted file mode 100644
index 9face9f..0000000
--- a/src/gfx/cards/seel.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/seel.pal b/src/gfx/cards/seel.pal
deleted file mode 100644
index ba76726..0000000
--- a/src/gfx/cards/seel.pal
+++ /dev/null
diff --git a/src/gfx/cards/seel.png b/src/gfx/cards/seel.png
new file mode 100644
index 0000000..dec2c2f
--- /dev/null
+++ b/src/gfx/cards/seel.png
diff --git a/src/gfx/cards/shellder.8x6.png b/src/gfx/cards/shellder.8x6.png
deleted file mode 100644
index ad49832..0000000
--- a/src/gfx/cards/shellder.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/shellder.pal b/src/gfx/cards/shellder.pal
deleted file mode 100644
index 70e70bf..0000000
--- a/src/gfx/cards/shellder.pal
+++ /dev/null
diff --git a/src/gfx/cards/shellder.png b/src/gfx/cards/shellder.png
new file mode 100644
index 0000000..1c336f6
--- /dev/null
+++ b/src/gfx/cards/shellder.png
diff --git a/src/gfx/cards/slowbro.8x6.png b/src/gfx/cards/slowbro.8x6.png
deleted file mode 100644
index ad59fd6..0000000
--- a/src/gfx/cards/slowbro.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/slowbro.pal b/src/gfx/cards/slowbro.pal
deleted file mode 100644
index 4b51616..0000000
--- a/src/gfx/cards/slowbro.pal
+++ /dev/null
@@ -1 +0,0 @@
-_3�
� 
\ No newline at end of file
diff --git a/src/gfx/cards/slowbro.png b/src/gfx/cards/slowbro.png
new file mode 100644
index 0000000..e574738
--- /dev/null
+++ b/src/gfx/cards/slowbro.png
diff --git a/src/gfx/cards/slowpoke1.8x6.png b/src/gfx/cards/slowpoke1.8x6.png
deleted file mode 100644
index a74d1a4..0000000
--- a/src/gfx/cards/slowpoke1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/slowpoke1.pal b/src/gfx/cards/slowpoke1.pal
deleted file mode 100644
index 81b0ad9..0000000
--- a/src/gfx/cards/slowpoke1.pal
+++ /dev/null
diff --git a/src/gfx/cards/slowpoke1.png b/src/gfx/cards/slowpoke1.png
new file mode 100644
index 0000000..54cd6c9
--- /dev/null
+++ b/src/gfx/cards/slowpoke1.png
diff --git a/src/gfx/cards/slowpoke2.8x6.png b/src/gfx/cards/slowpoke2.8x6.png
deleted file mode 100644
index 834cf05..0000000
--- a/src/gfx/cards/slowpoke2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/slowpoke2.pal b/src/gfx/cards/slowpoke2.pal
deleted file mode 100644
index 73881a1..0000000
--- a/src/gfx/cards/slowpoke2.pal
+++ /dev/null
@@ -1 +0,0 @@
-_k��0�
\ No newline at end of file
diff --git a/src/gfx/cards/slowpoke2.png b/src/gfx/cards/slowpoke2.png
new file mode 100644
index 0000000..c951930
--- /dev/null
+++ b/src/gfx/cards/slowpoke2.png
diff --git a/src/gfx/cards/snorlax.8x6.png b/src/gfx/cards/snorlax.8x6.png
deleted file mode 100644
index 4eb26a4..0000000
--- a/src/gfx/cards/snorlax.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/snorlax.pal b/src/gfx/cards/snorlax.pal
deleted file mode 100644
index e1d7d63..0000000
--- a/src/gfx/cards/snorlax.pal
+++ /dev/null
diff --git a/src/gfx/cards/snorlax.png b/src/gfx/cards/snorlax.png
new file mode 100644
index 0000000..cfd5ca7
--- /dev/null
+++ b/src/gfx/cards/snorlax.png
diff --git a/src/gfx/cards/spearow.8x6.png b/src/gfx/cards/spearow.8x6.png
deleted file mode 100644
index f76c643..0000000
--- a/src/gfx/cards/spearow.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/spearow.pal b/src/gfx/cards/spearow.pal
deleted file mode 100644
index f241eaa..0000000
--- a/src/gfx/cards/spearow.pal
+++ /dev/null
diff --git a/src/gfx/cards/spearow.png b/src/gfx/cards/spearow.png
new file mode 100644
index 0000000..c3d39dd
--- /dev/null
+++ b/src/gfx/cards/spearow.png
diff --git a/src/gfx/cards/squirtle.8x6.png b/src/gfx/cards/squirtle.8x6.png
deleted file mode 100644
index e8907eb..0000000
--- a/src/gfx/cards/squirtle.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/squirtle.pal b/src/gfx/cards/squirtle.pal
deleted file mode 100644
index a7aaec5..0000000
--- a/src/gfx/cards/squirtle.pal
+++ /dev/null
@@ -1 +0,0 @@
-�kLC��
\ No newline at end of file
diff --git a/src/gfx/cards/squirtle.png b/src/gfx/cards/squirtle.png
new file mode 100644
index 0000000..ba604ac
--- /dev/null
+++ b/src/gfx/cards/squirtle.png
diff --git a/src/gfx/cards/starmie.8x6.png b/src/gfx/cards/starmie.8x6.png
deleted file mode 100644
index 5e4c0b1..0000000
--- a/src/gfx/cards/starmie.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/starmie.pal b/src/gfx/cards/starmie.pal
deleted file mode 100644
index 7bcf392..0000000
--- a/src/gfx/cards/starmie.pal
+++ /dev/null
diff --git a/src/gfx/cards/starmie.png b/src/gfx/cards/starmie.png
new file mode 100644
index 0000000..96efadd
--- /dev/null
+++ b/src/gfx/cards/starmie.png
diff --git a/src/gfx/cards/staryu.8x6.png b/src/gfx/cards/staryu.8x6.png
deleted file mode 100644
index 1e63f1c..0000000
--- a/src/gfx/cards/staryu.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/staryu.pal b/src/gfx/cards/staryu.pal
deleted file mode 100644
index 2664741..0000000
--- a/src/gfx/cards/staryu.pal
+++ /dev/null
diff --git a/src/gfx/cards/staryu.png b/src/gfx/cards/staryu.png
new file mode 100644
index 0000000..23b5322
--- /dev/null
+++ b/src/gfx/cards/staryu.png
diff --git a/src/gfx/cards/superenergyremoval.8x6.png b/src/gfx/cards/superenergyremoval.8x6.png
deleted file mode 100644
index f71ac87..0000000
--- a/src/gfx/cards/superenergyremoval.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/superenergyremoval.pal b/src/gfx/cards/superenergyremoval.pal
deleted file mode 100644
index f6fab91..0000000
--- a/src/gfx/cards/superenergyremoval.pal
+++ /dev/null
diff --git a/src/gfx/cards/superenergyremoval.png b/src/gfx/cards/superenergyremoval.png
new file mode 100644
index 0000000..05460b7
--- /dev/null
+++ b/src/gfx/cards/superenergyremoval.png
diff --git a/src/gfx/cards/superenergyretrieval.8x6.png b/src/gfx/cards/superenergyretrieval.8x6.png
deleted file mode 100644
index be4c186..0000000
--- a/src/gfx/cards/superenergyretrieval.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/superenergyretrieval.pal b/src/gfx/cards/superenergyretrieval.pal
deleted file mode 100644
index 9dcf420..0000000
--- a/src/gfx/cards/superenergyretrieval.pal
+++ /dev/null
diff --git a/src/gfx/cards/superenergyretrieval.png b/src/gfx/cards/superenergyretrieval.png
new file mode 100644
index 0000000..93e967b
--- /dev/null
+++ b/src/gfx/cards/superenergyretrieval.png
diff --git a/src/gfx/cards/superpotion.8x6.png b/src/gfx/cards/superpotion.8x6.png
deleted file mode 100644
index b476aba..0000000
--- a/src/gfx/cards/superpotion.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/superpotion.pal b/src/gfx/cards/superpotion.pal
deleted file mode 100644
index fe84a56..0000000
--- a/src/gfx/cards/superpotion.pal
+++ /dev/null
diff --git a/src/gfx/cards/superpotion.png b/src/gfx/cards/superpotion.png
new file mode 100644
index 0000000..86ac5ef
--- /dev/null
+++ b/src/gfx/cards/superpotion.png
diff --git a/src/gfx/cards/surfingpikachu1.8x6.png b/src/gfx/cards/surfingpikachu1.8x6.png
deleted file mode 100644
index 9b84774..0000000
--- a/src/gfx/cards/surfingpikachu1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/surfingpikachu1.pal b/src/gfx/cards/surfingpikachu1.pal
deleted file mode 100644
index f7a0dd9..0000000
--- a/src/gfx/cards/surfingpikachu1.pal
+++ /dev/null
diff --git a/src/gfx/cards/surfingpikachu1.png b/src/gfx/cards/surfingpikachu1.png
new file mode 100644
index 0000000..029c89b
--- /dev/null
+++ b/src/gfx/cards/surfingpikachu1.png
diff --git a/src/gfx/cards/surfingpikachu2.8x6.png b/src/gfx/cards/surfingpikachu2.8x6.png
deleted file mode 100644
index 53e796a..0000000
--- a/src/gfx/cards/surfingpikachu2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/surfingpikachu2.pal b/src/gfx/cards/surfingpikachu2.pal
deleted file mode 100644
index f7a0dd9..0000000
--- a/src/gfx/cards/surfingpikachu2.pal
+++ /dev/null
diff --git a/src/gfx/cards/surfingpikachu2.png b/src/gfx/cards/surfingpikachu2.png
new file mode 100644
index 0000000..3fac2c2
--- /dev/null
+++ b/src/gfx/cards/surfingpikachu2.png
diff --git a/src/gfx/cards/switch.8x6.png b/src/gfx/cards/switch.8x6.png
deleted file mode 100644
index cdcec01..0000000
--- a/src/gfx/cards/switch.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/switch.pal b/src/gfx/cards/switch.pal
deleted file mode 100644
index 4675255..0000000
--- a/src/gfx/cards/switch.pal
+++ /dev/null
@@ -1 +0,0 @@
-_k�  
\ No newline at end of file
diff --git a/src/gfx/cards/switch.png b/src/gfx/cards/switch.png
new file mode 100644
index 0000000..c93063b
--- /dev/null
+++ b/src/gfx/cards/switch.png
diff --git a/src/gfx/cards/tangela1.8x6.png b/src/gfx/cards/tangela1.8x6.png
deleted file mode 100644
index 0907f14..0000000
--- a/src/gfx/cards/tangela1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/tangela1.pal b/src/gfx/cards/tangela1.pal
deleted file mode 100644
index 245aa95..0000000
--- a/src/gfx/cards/tangela1.pal
+++ /dev/null
diff --git a/src/gfx/cards/tangela1.png b/src/gfx/cards/tangela1.png
new file mode 100644
index 0000000..9f4fdb8
--- /dev/null
+++ b/src/gfx/cards/tangela1.png
diff --git a/src/gfx/cards/tangela2.8x6.png b/src/gfx/cards/tangela2.8x6.png
deleted file mode 100644
index 5fb06c8..0000000
--- a/src/gfx/cards/tangela2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/tangela2.pal b/src/gfx/cards/tangela2.pal
deleted file mode 100644
index 0eedb04..0000000
--- a/src/gfx/cards/tangela2.pal
+++ /dev/null
diff --git a/src/gfx/cards/tangela2.png b/src/gfx/cards/tangela2.png
new file mode 100644
index 0000000..c689a50
--- /dev/null
+++ b/src/gfx/cards/tangela2.png
diff --git a/src/gfx/cards/tauros.8x6.png b/src/gfx/cards/tauros.8x6.png
deleted file mode 100644
index 8a372a2..0000000
--- a/src/gfx/cards/tauros.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/tauros.pal b/src/gfx/cards/tauros.pal
deleted file mode 100644
index ac7554b..0000000
--- a/src/gfx/cards/tauros.pal
+++ /dev/null
diff --git a/src/gfx/cards/tauros.png b/src/gfx/cards/tauros.png
new file mode 100644
index 0000000..04a7a64
--- /dev/null
+++ b/src/gfx/cards/tauros.png
diff --git a/src/gfx/cards/tentacool.8x6.png b/src/gfx/cards/tentacool.8x6.png
deleted file mode 100644
index 7da303a..0000000
--- a/src/gfx/cards/tentacool.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/tentacool.pal b/src/gfx/cards/tentacool.pal
deleted file mode 100644
index 210122c..0000000
--- a/src/gfx/cards/tentacool.pal
+++ /dev/null
diff --git a/src/gfx/cards/tentacool.png b/src/gfx/cards/tentacool.png
new file mode 100644
index 0000000..fe24fae
--- /dev/null
+++ b/src/gfx/cards/tentacool.png
diff --git a/src/gfx/cards/tentacruel.8x6.png b/src/gfx/cards/tentacruel.8x6.png
deleted file mode 100644
index 74b2c43..0000000
--- a/src/gfx/cards/tentacruel.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/tentacruel.pal b/src/gfx/cards/tentacruel.pal
deleted file mode 100644
index 212e1bf..0000000
--- a/src/gfx/cards/tentacruel.pal
+++ /dev/null
diff --git a/src/gfx/cards/tentacruel.png b/src/gfx/cards/tentacruel.png
new file mode 100644
index 0000000..9c69872
--- /dev/null
+++ b/src/gfx/cards/tentacruel.png
diff --git a/src/gfx/cards/vaporeon1.8x6.png b/src/gfx/cards/vaporeon1.8x6.png
deleted file mode 100644
index 3ac523a..0000000
--- a/src/gfx/cards/vaporeon1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/vaporeon1.pal b/src/gfx/cards/vaporeon1.pal
deleted file mode 100644
index 0c16866..0000000
--- a/src/gfx/cards/vaporeon1.pal
+++ /dev/null
diff --git a/src/gfx/cards/vaporeon1.png b/src/gfx/cards/vaporeon1.png
new file mode 100644
index 0000000..487bc18
--- /dev/null
+++ b/src/gfx/cards/vaporeon1.png
diff --git a/src/gfx/cards/vaporeon2.8x6.png b/src/gfx/cards/vaporeon2.8x6.png
deleted file mode 100644
index a90ba62..0000000
--- a/src/gfx/cards/vaporeon2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/vaporeon2.pal b/src/gfx/cards/vaporeon2.pal
deleted file mode 100644
index 5455a43..0000000
--- a/src/gfx/cards/vaporeon2.pal
+++ /dev/null
diff --git a/src/gfx/cards/vaporeon2.png b/src/gfx/cards/vaporeon2.png
new file mode 100644
index 0000000..d370ea0
--- /dev/null
+++ b/src/gfx/cards/vaporeon2.png
diff --git a/src/gfx/cards/venomoth.8x6.png b/src/gfx/cards/venomoth.8x6.png
deleted file mode 100644
index d1c9fce..0000000
--- a/src/gfx/cards/venomoth.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/venomoth.pal b/src/gfx/cards/venomoth.pal
deleted file mode 100644
index 663c93f..0000000
--- a/src/gfx/cards/venomoth.pal
+++ /dev/null
@@ -1 +0,0 @@
-_U0
\ No newline at end of file
diff --git a/src/gfx/cards/venomoth.png b/src/gfx/cards/venomoth.png
new file mode 100644
index 0000000..47d6510
--- /dev/null
+++ b/src/gfx/cards/venomoth.png
diff --git a/src/gfx/cards/venonat.8x6.png b/src/gfx/cards/venonat.8x6.png
deleted file mode 100644
index 1638261..0000000
--- a/src/gfx/cards/venonat.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/venonat.pal b/src/gfx/cards/venonat.pal
deleted file mode 100644
index 5be80c9..0000000
--- a/src/gfx/cards/venonat.pal
+++ /dev/null
@@ -1 +0,0 @@
-ZT
\ No newline at end of file
diff --git a/src/gfx/cards/venonat.png b/src/gfx/cards/venonat.png
new file mode 100644
index 0000000..5b6d970
--- /dev/null
+++ b/src/gfx/cards/venonat.png
diff --git a/src/gfx/cards/venusaur1.8x6.png b/src/gfx/cards/venusaur1.8x6.png
deleted file mode 100644
index d2d3989..0000000
--- a/src/gfx/cards/venusaur1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/venusaur1.pal b/src/gfx/cards/venusaur1.pal
deleted file mode 100644
index ff5c74c..0000000
--- a/src/gfx/cards/venusaur1.pal
+++ /dev/null
diff --git a/src/gfx/cards/venusaur1.png b/src/gfx/cards/venusaur1.png
new file mode 100644
index 0000000..9f71a39
--- /dev/null
+++ b/src/gfx/cards/venusaur1.png
diff --git a/src/gfx/cards/venusaur2.8x6.png b/src/gfx/cards/venusaur2.8x6.png
deleted file mode 100644
index dcfa858..0000000
--- a/src/gfx/cards/venusaur2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/venusaur2.pal b/src/gfx/cards/venusaur2.pal
deleted file mode 100644
index fc789ff..0000000
--- a/src/gfx/cards/venusaur2.pal
+++ /dev/null
diff --git a/src/gfx/cards/venusaur2.png b/src/gfx/cards/venusaur2.png
new file mode 100644
index 0000000..5f91e9b
--- /dev/null
+++ b/src/gfx/cards/venusaur2.png
diff --git a/src/gfx/cards/victreebel.8x6.png b/src/gfx/cards/victreebel.8x6.png
deleted file mode 100644
index d8536a0..0000000
--- a/src/gfx/cards/victreebel.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/victreebel.pal b/src/gfx/cards/victreebel.pal
deleted file mode 100644
index 529eecf..0000000
--- a/src/gfx/cards/victreebel.pal
+++ /dev/null
diff --git a/src/gfx/cards/victreebel.png b/src/gfx/cards/victreebel.png
new file mode 100644
index 0000000..37cf69c
--- /dev/null
+++ b/src/gfx/cards/victreebel.png
diff --git a/src/gfx/cards/vileplume.8x6.png b/src/gfx/cards/vileplume.8x6.png
deleted file mode 100644
index a3766d5..0000000
--- a/src/gfx/cards/vileplume.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/vileplume.pal b/src/gfx/cards/vileplume.pal
deleted file mode 100644
index 3c4f707..0000000
--- a/src/gfx/cards/vileplume.pal
+++ /dev/null
diff --git a/src/gfx/cards/vileplume.png b/src/gfx/cards/vileplume.png
new file mode 100644
index 0000000..7ef4386
--- /dev/null
+++ b/src/gfx/cards/vileplume.png
diff --git a/src/gfx/cards/voltorb.8x6.png b/src/gfx/cards/voltorb.8x6.png
deleted file mode 100644
index cb39c66..0000000
--- a/src/gfx/cards/voltorb.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/voltorb.pal b/src/gfx/cards/voltorb.pal
deleted file mode 100644
index 01eca85..0000000
--- a/src/gfx/cards/voltorb.pal
+++ /dev/null
diff --git a/src/gfx/cards/voltorb.png b/src/gfx/cards/voltorb.png
new file mode 100644
index 0000000..a9e0ec9
--- /dev/null
+++ b/src/gfx/cards/voltorb.png
diff --git a/src/gfx/cards/vulpix.8x6.png b/src/gfx/cards/vulpix.8x6.png
deleted file mode 100644
index e83d888..0000000
--- a/src/gfx/cards/vulpix.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/vulpix.pal b/src/gfx/cards/vulpix.pal
deleted file mode 100644
index eb6af99..0000000
--- a/src/gfx/cards/vulpix.pal
+++ /dev/null
diff --git a/src/gfx/cards/vulpix.png b/src/gfx/cards/vulpix.png
new file mode 100644
index 0000000..987a5dd
--- /dev/null
+++ b/src/gfx/cards/vulpix.png
diff --git a/src/gfx/cards/wartortle.8x6.png b/src/gfx/cards/wartortle.8x6.png
deleted file mode 100644
index fad87c7..0000000
--- a/src/gfx/cards/wartortle.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/wartortle.pal b/src/gfx/cards/wartortle.pal
deleted file mode 100644
index 0c9dd7c..0000000
--- a/src/gfx/cards/wartortle.pal
+++ /dev/null
diff --git a/src/gfx/cards/wartortle.png b/src/gfx/cards/wartortle.png
new file mode 100644
index 0000000..5c046f7
--- /dev/null
+++ b/src/gfx/cards/wartortle.png
diff --git a/src/gfx/cards/waterenergy.8x6.png b/src/gfx/cards/waterenergy.8x6.png
deleted file mode 100644
index 1fe022e..0000000
--- a/src/gfx/cards/waterenergy.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/waterenergy.pal b/src/gfx/cards/waterenergy.pal
deleted file mode 100644
index 387346f..0000000
--- a/src/gfx/cards/waterenergy.pal
+++ /dev/null
diff --git a/src/gfx/cards/waterenergy.png b/src/gfx/cards/waterenergy.png
new file mode 100644
index 0000000..d1f28e2
--- /dev/null
+++ b/src/gfx/cards/waterenergy.png
diff --git a/src/gfx/cards/weedle.8x6.png b/src/gfx/cards/weedle.8x6.png
deleted file mode 100644
index f53e060..0000000
--- a/src/gfx/cards/weedle.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/weedle.pal b/src/gfx/cards/weedle.pal
deleted file mode 100644
index e640ad3..0000000
--- a/src/gfx/cards/weedle.pal
+++ /dev/null
@@ -1 +0,0 @@
-�k_1
\ No newline at end of file
diff --git a/src/gfx/cards/weedle.png b/src/gfx/cards/weedle.png
new file mode 100644
index 0000000..6073fb7
--- /dev/null
+++ b/src/gfx/cards/weedle.png
diff --git a/src/gfx/cards/weepinbell.8x6.png b/src/gfx/cards/weepinbell.8x6.png
deleted file mode 100644
index bdff148..0000000
--- a/src/gfx/cards/weepinbell.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/weepinbell.pal b/src/gfx/cards/weepinbell.pal
deleted file mode 100644
index b1c7dc7..0000000
--- a/src/gfx/cards/weepinbell.pal
+++ /dev/null
@@ -1 +0,0 @@
-�C�

\ No newline at end of file
diff --git a/src/gfx/cards/weepinbell.png b/src/gfx/cards/weepinbell.png
new file mode 100644
index 0000000..aa0acb7
--- /dev/null
+++ b/src/gfx/cards/weepinbell.png
diff --git a/src/gfx/cards/weezing.8x6.png b/src/gfx/cards/weezing.8x6.png
deleted file mode 100644
index 12d3514..0000000
--- a/src/gfx/cards/weezing.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/weezing.pal b/src/gfx/cards/weezing.pal
deleted file mode 100644
index 4d7faab..0000000
--- a/src/gfx/cards/weezing.pal
+++ /dev/null
@@ -1 +0,0 @@
-�L3�@ 
\ No newline at end of file
diff --git a/src/gfx/cards/weezing.png b/src/gfx/cards/weezing.png
new file mode 100644
index 0000000..eaadb67
--- /dev/null
+++ b/src/gfx/cards/weezing.png
diff --git a/src/gfx/cards/wigglytuff.8x6.png b/src/gfx/cards/wigglytuff.8x6.png
deleted file mode 100644
index 3429ddf..0000000
--- a/src/gfx/cards/wigglytuff.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/wigglytuff.pal b/src/gfx/cards/wigglytuff.pal
deleted file mode 100644
index b8f2caf..0000000
--- a/src/gfx/cards/wigglytuff.pal
+++ /dev/null
@@ -1 +0,0 @@
-�j�2
\ No newline at end of file
diff --git a/src/gfx/cards/wigglytuff.png b/src/gfx/cards/wigglytuff.png
new file mode 100644
index 0000000..762ad41
--- /dev/null
+++ b/src/gfx/cards/wigglytuff.png
diff --git a/src/gfx/cards/zapdos1.8x6.png b/src/gfx/cards/zapdos1.8x6.png
deleted file mode 100644
index b34c5c7..0000000
--- a/src/gfx/cards/zapdos1.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/zapdos1.pal b/src/gfx/cards/zapdos1.pal
deleted file mode 100644
index f68430a..0000000
--- a/src/gfx/cards/zapdos1.pal
+++ /dev/null
diff --git a/src/gfx/cards/zapdos1.png b/src/gfx/cards/zapdos1.png
new file mode 100644
index 0000000..321dba7
--- /dev/null
+++ b/src/gfx/cards/zapdos1.png
diff --git a/src/gfx/cards/zapdos2.8x6.png b/src/gfx/cards/zapdos2.8x6.png
deleted file mode 100644
index 1583f11..0000000
--- a/src/gfx/cards/zapdos2.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/zapdos2.pal b/src/gfx/cards/zapdos2.pal
deleted file mode 100644
index fe18659..0000000
--- a/src/gfx/cards/zapdos2.pal
+++ /dev/null
diff --git a/src/gfx/cards/zapdos2.png b/src/gfx/cards/zapdos2.png
new file mode 100644
index 0000000..43c1164
--- /dev/null
+++ b/src/gfx/cards/zapdos2.png
diff --git a/src/gfx/cards/zapdos3.8x6.png b/src/gfx/cards/zapdos3.8x6.png
deleted file mode 100644
index 3683243..0000000
--- a/src/gfx/cards/zapdos3.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/zapdos3.pal b/src/gfx/cards/zapdos3.pal
deleted file mode 100644
index fc0facc..0000000
--- a/src/gfx/cards/zapdos3.pal
+++ /dev/null
diff --git a/src/gfx/cards/zapdos3.png b/src/gfx/cards/zapdos3.png
new file mode 100644
index 0000000..def590c
--- /dev/null
+++ b/src/gfx/cards/zapdos3.png
diff --git a/src/gfx/cards/zubat.8x6.png b/src/gfx/cards/zubat.8x6.png
deleted file mode 100644
index 2a0c346..0000000
--- a/src/gfx/cards/zubat.8x6.png
+++ /dev/null
diff --git a/src/gfx/cards/zubat.pal b/src/gfx/cards/zubat.pal
deleted file mode 100644
index 3583362..0000000
--- a/src/gfx/cards/zubat.pal
+++ /dev/null
diff --git a/src/gfx/cards/zubat.png b/src/gfx/cards/zubat.png
new file mode 100644
index 0000000..f6cdc0e
--- /dev/null
+++ b/src/gfx/cards/zubat.png
diff --git a/src/gfx/duel/anims/51.t10.png b/src/gfx/duel/anims/51.png
index 98eb770..98eb770 100644
--- a/src/gfx/duel/anims/51.t10.png
+++ b/src/gfx/duel/anims/51.png
diff --git a/src/gfx/duel/cgb_symbols.t7.png b/src/gfx/duel/cgb_symbols.png
index ac0f54d..ac0f54d 100644
--- a/src/gfx/duel/cgb_symbols.t7.png
+++ b/src/gfx/duel/cgb_symbols.png
diff --git a/src/gfx/duel/dmg_sgb_symbols.t7.png b/src/gfx/duel/dmg_sgb_symbols.png
index 91eede5..91eede5 100644
--- a/src/gfx/duel/dmg_sgb_symbols.t7.png
+++ b/src/gfx/duel/dmg_sgb_symbols.png
diff --git a/src/gfx/duel/other.t7.png b/src/gfx/duel/other.png
index d2aa1e9..d2aa1e9 100644
--- a/src/gfx/duel/other.t7.png
+++ b/src/gfx/duel/other.png
diff --git a/src/gfx/fonts/full_width/4.t3.png b/src/gfx/fonts/full_width/4.png
index c872a6d..c872a6d 100644
--- a/src/gfx/fonts/full_width/4.t3.png
+++ b/src/gfx/fonts/full_width/4.png
diff --git a/src/gfx/overworld_map.t15.png b/src/gfx/overworld_map.png
index 5d8e819..5d8e819 100644
--- a/src/gfx/overworld_map.t15.png
+++ b/src/gfx/overworld_map.png
diff --git a/src/gfx/tilesets/challengehall.t3.png b/src/gfx/tilesets/challengehall.png
index 9783378..9783378 100644
--- a/src/gfx/tilesets/challengehall.t3.png
+++ b/src/gfx/tilesets/challengehall.png
diff --git a/src/gfx/tilesets/clubentrance.t15.png b/src/gfx/tilesets/clubentrance.png
index e641020..e641020 100644
--- a/src/gfx/tilesets/clubentrance.t15.png
+++ b/src/gfx/tilesets/clubentrance.png
diff --git a/src/gfx/tilesets/clublobby.t8.png b/src/gfx/tilesets/clublobby.png
index 7a5a7be..7a5a7be 100644
--- a/src/gfx/tilesets/clublobby.t8.png
+++ b/src/gfx/tilesets/clublobby.png
diff --git a/src/gfx/tilesets/fightingclub.t13.png b/src/gfx/tilesets/fightingclub.png
index 6747644..6747644 100644
--- a/src/gfx/tilesets/fightingclub.t13.png
+++ b/src/gfx/tilesets/fightingclub.png
diff --git a/src/gfx/tilesets/fireclub.t9.png b/src/gfx/tilesets/fireclub.png
index 28638bd..28638bd 100644
--- a/src/gfx/tilesets/fireclub.t9.png
+++ b/src/gfx/tilesets/fireclub.png
diff --git a/src/gfx/tilesets/grassclub.t9.png b/src/gfx/tilesets/grassclub.png
index 69496ad..69496ad 100644
--- a/src/gfx/tilesets/grassclub.t9.png
+++ b/src/gfx/tilesets/grassclub.png
diff --git a/src/gfx/tilesets/hallofhonor.t7.png b/src/gfx/tilesets/hallofhonor.png
index 358630d..358630d 100644
--- a/src/gfx/tilesets/hallofhonor.t7.png
+++ b/src/gfx/tilesets/hallofhonor.png
diff --git a/src/gfx/tilesets/ishihara.t3.png b/src/gfx/tilesets/ishihara.png
index 4761a69..4761a69 100644
--- a/src/gfx/tilesets/ishihara.t3.png
+++ b/src/gfx/tilesets/ishihara.png
diff --git a/src/gfx/tilesets/lightningclub.t13.png b/src/gfx/tilesets/lightningclub.png
index bbe0572..bbe0572 100644
--- a/src/gfx/tilesets/lightningclub.t13.png
+++ b/src/gfx/tilesets/lightningclub.png
diff --git a/src/gfx/tilesets/masonlaboratory.t9.png b/src/gfx/tilesets/masonlaboratory.png
index 4c5d90b..4c5d90b 100644
--- a/src/gfx/tilesets/masonlaboratory.t9.png
+++ b/src/gfx/tilesets/masonlaboratory.png
diff --git a/src/gfx/tilesets/pokemondome.t1.png b/src/gfx/tilesets/pokemondome.png
index b4abf6c..b4abf6c 100644
--- a/src/gfx/tilesets/pokemondome.t1.png
+++ b/src/gfx/tilesets/pokemondome.png
diff --git a/src/gfx/tilesets/pokemondomeentrance.t2.png b/src/gfx/tilesets/pokemondomeentrance.png
index c80ef7f..c80ef7f 100644
--- a/src/gfx/tilesets/pokemondomeentrance.t2.png
+++ b/src/gfx/tilesets/pokemondomeentrance.png
diff --git a/src/gfx/tilesets/psychicclub.t6.png b/src/gfx/tilesets/psychicclub.png
index 6a3a00f..6a3a00f 100644
--- a/src/gfx/tilesets/psychicclub.t6.png
+++ b/src/gfx/tilesets/psychicclub.png
diff --git a/src/gfx/tilesets/rockclub.t4.png b/src/gfx/tilesets/rockclub.png
index 59bf1bb..59bf1bb 100644
--- a/src/gfx/tilesets/rockclub.t4.png
+++ b/src/gfx/tilesets/rockclub.png
diff --git a/src/gfx/tilesets/scienceclub.t14.png b/src/gfx/tilesets/scienceclub.png
index a736fe1..a736fe1 100644
--- a/src/gfx/tilesets/scienceclub.t14.png
+++ b/src/gfx/tilesets/scienceclub.png
diff --git a/src/gfx/tilesets/waterclub.t15.png b/src/gfx/tilesets/waterclub.png
index 815e5ae..815e5ae 100644
--- a/src/gfx/tilesets/waterclub.t15.png
+++ b/src/gfx/tilesets/waterclub.png
diff --git a/src/gfx/titlescreen/titlescreen1.t15.png b/src/gfx/titlescreen/titlescreen1.png
index 82b39e5..82b39e5 100644
--- a/src/gfx/titlescreen/titlescreen1.t15.png
+++ b/src/gfx/titlescreen/titlescreen1.png
diff --git a/src/gfx/titlescreen/titlescreen2.t15.png b/src/gfx/titlescreen/titlescreen2.png
index f54b7c3..f54b7c3 100644
--- a/src/gfx/titlescreen/titlescreen2.t15.png
+++ b/src/gfx/titlescreen/titlescreen2.png
diff --git a/src/gfx/titlescreen/titlescreen3.t12.png b/src/gfx/titlescreen/titlescreen3.png
index adddee4..adddee4 100644
--- a/src/gfx/titlescreen/titlescreen3.t12.png
+++ b/src/gfx/titlescreen/titlescreen3.png
diff --git a/src/gfx/titlescreen/titlescreen4.t5.png b/src/gfx/titlescreen/titlescreen4.png
index 1d3cb92..1d3cb92 100644
--- a/src/gfx/titlescreen/titlescreen4.t5.png
+++ b/src/gfx/titlescreen/titlescreen4.png
diff --git a/src/gfx/titlescreen/titlescreen5.t4.png b/src/gfx/titlescreen/titlescreen5.png
index 3cb6ab3..3cb6ab3 100644
--- a/src/gfx/titlescreen/titlescreen5.t4.png
+++ b/src/gfx/titlescreen/titlescreen5.png
diff --git a/src/gfx/titlescreen/titlescreen6.t12.png b/src/gfx/titlescreen/titlescreen6.png
index 4f0dbe8..4f0dbe8 100644
--- a/src/gfx/titlescreen/titlescreen6.t12.png
+++ b/src/gfx/titlescreen/titlescreen6.png