diff --git a/ps-pokemon.sheet.mjs b/ps-pokemon.sheet.mjs
index 7344f8c6..82bae179 100644
--- a/ps-pokemon.sheet.mjs
+++ b/ps-pokemon.sheet.mjs
@@ -303,31 +303,31 @@ const BattlePokemonIconIndexes = {
 	silvallysteel: 1032 + 282,
 	silvallywater: 1032 + 283,
 
-
-
 	// alt forms with duplicate icons
-	/* greninjabond: 658,
-	gumshoostotem: 735,
-	raticatealolatotem: 1032 + 120,
-	marowakalolatotem: 1032 + 136,
-	araquanidtotem: 752,
-	lurantistotem: 754,
-	salazzletotem: 758,
-	vikavolttotem: 738,
-	togedemarutotem: 777,
-	mimikyutotem: 778,
-	mimikyubustedtotem: 778,
-	ribombeetotem: 743,
-	kommoototem: 784,
+	// greninjabond: 658,
+	// gumshoostotem: 735,
+	// raticatealolatotem: 1032 + 120,
+	// marowakalolatotem: 1032 + 136,
+	// araquanidtotem: 752,
+	// lurantistotem: 754,
+	// salazzletotem: 758,
+	// vikavolttotem: 738,
+	// togedemarutotem: 777,
+	// mimikyutotem: 778,
+	// mimikyubustedtotem: 778,
+	// ribombeetotem: 743,
+	// kommoototem: 784,
+	// toxtricitylowkeygmax: 1320 + 69,
 	sinisteaantique: 854,
 	polteageistantique: 855,
+	urshifurapidstrike: 892,
+	dudunsparcethreesegment: 982,
 	poltchageistartisan: 1012,
 	sinistchamasterpiece: 1013,
 	ogerpontealtera: 1017,
 	ogerponwellspringtera: 1032 + 241,
 	ogerponhearthflametera: 1032 + 242,
 	ogerponcornerstonetera: 1032 + 243,
- 	toxtricitylowkeygmax: 1320 + 69, */
 
 	// Mega/G-Max
 	venusaurmega: 1320 + 0,
@@ -414,197 +414,249 @@ const BattlePokemonIconIndexes = {
 	inteleongmax: 1320 + 81,
 	urshifugmax: 1320 + 82,
 	urshifurapidstrikegmax: 1320 + 83,
+	clefablemega: 1320 + 84,
+	victreebelmega: 1320 + 85,
+	starmiemega: 1320 + 86,
+	dragonitemega: 1320 + 87,
+	meganiummega: 1320 + 88,
+	feraligatrmega: 1320 + 89,
+	skarmorymega: 1320 + 90,
+	froslassmega: 1320 + 91,
+	emboarmega: 1320 + 92,
+	excadrillmega: 1320 + 93,
+	scolipedemega: 1320 + 94,
+	scraftymega: 1320 + 95,
+	eelektrossmega: 1320 + 96,
+	chandeluremega: 1320 + 97,
+	chesnaughtmega: 1320 + 98,
+	delphoxmega: 1320 + 99,
+	greninjamega: 1320 + 100,
+	pyroarmega: 1320 + 101,
+	floettemega: 1320 + 102,
+	malamarmega: 1320 + 103,
+	barbaraclemega: 1320 + 104,
+	dragalgemega: 1320 + 105,
+	hawluchamega: 1320 + 106,
+	zygardemega: 1320 + 107,
+	drampamega: 1320 + 108,
+	falinksmega: 1320 + 109,
+	raichumegax: 1320 + 110,
+	raichumegay: 1320 + 111,
+	chimechomega: 1320 + 112,
+	absolmegaz: 1320 + 113,
+	staraptormega: 1320 + 114,
+	garchompmegaz: 1320 + 115,
+	lucariomegaz: 1320 + 116,
+	heatranmega: 1320 + 117,
+	darkraimega: 1320 + 118,
+	golurkmega: 1320 + 119,
+	meowsticmmega: 1320 + 120,
+	meowsticfmega: 1320 + 120,
+	crabominablemega: 1320 + 121,
+	golisopodmega: 1320 + 122,
+	magearnamega: 1320 + 123,
+	magearnaoriginalmega: 1320 + 124,
+	zeraoramega: 1320 + 125,
+	scovillainmega: 1320 + 126,
+	glimmoramega: 1320 + 127,
+	tatsugiricurlymega: 1320 + 128,
+	tatsugiridroopymega: 1320 + 129,
+	tatsugiristretchymega: 1320 + 130,
+	baxcaliburmega: 1320 + 131,
 
 	// CAP
-	syclant: 1512 + 0,
-	revenankh: 1512 + 1,
-	pyroak: 1512 + 2,
-	fidgit: 1512 + 3,
-	stratagem: 1512 + 4,
-	arghonaut: 1512 + 5,
-	kitsunoh: 1512 + 6,
-	cyclohm: 1512 + 7,
-	colossoil: 1512 + 8,
-	krilowatt: 1512 + 9,
-	voodoom: 1512 + 10,
-	tomohawk: 1512 + 11,
-	necturna: 1512 + 12,
-	mollux: 1512 + 13,
-	aurumoth: 1512 + 14,
-	malaconda: 1512 + 15,
-	cawmodore: 1512 + 16,
-	volkraken: 1512 + 17,
-	plasmanta: 1512 + 18,
-	naviathan: 1512 + 19,
-	crucibelle: 1512 + 20,
-	crucibellemega: 1512 + 21,
-	kerfluffle: 1512 + 22,
-	pajantom: 1512 + 23,
-	jumbao: 1512 + 24,
-	caribolt: 1512 + 25,
-	smokomodo: 1512 + 26,
-	snaelstrom: 1512 + 27,
-	equilibra: 1512 + 28,
-	astrolotl: 1512 + 29,
-	miasmaw: 1512 + 30,
-	chromera: 1512 + 31,
-	venomicon: 1512 + 32,
-	venomiconepilogue: 1512 + 33,
-	saharaja: 1512 + 34,
-	hemogoblin: 1512 + 35,
-	syclar: 1512 + 36,
-	embirch: 1512 + 37,
-	flarelm: 1512 + 38,
-	breezi: 1512 + 39,
-	scratchet: 1512 + 40,
-	necturine: 1512 + 41,
-	cupra: 1512 + 42,
-	argalis: 1512 + 43,
-	brattler: 1512 + 44,
-	cawdet: 1512 + 45,
-	volkritter: 1512 + 46,
-	snugglow: 1512 + 47,
-	floatoy: 1512 + 48,
-	caimanoe: 1512 + 49,
-	pluffle: 1512 + 50,
-	rebble: 1512 + 51,
-	tactite: 1512 + 52,
-	privatyke: 1512 + 53,
-	nohface: 1512 + 54,
-	monohm: 1512 + 55,
-	duohm: 1512 + 56,
-	protowatt: 1512 + 57,
-	voodoll: 1512 + 58,
-	mumbao: 1512 + 59,
-	fawnifer: 1512 + 60,
-	electrelk: 1512 + 61,
-	smogecko: 1512 + 62,
-	smoguana: 1512 + 63,
-	swirlpool: 1512 + 64,
-	coribalis: 1512 + 65,
-	justyke: 1512 + 66,
-	solotl: 1512 + 67,
-	miasmite: 1512 + 68,
-	dorsoil: 1512 + 69,
-	saharascal: 1512 + 70,
-	ababo: 1512 + 71,
-	scattervein: 1512 + 72,
-	cresceidon: 1512 + 73,
-	chuggalong: 1512 + 74,
-	shox: 1512 + 75,
-	chuggon: 1512 + 76,
-	draggalong: 1512 + 77,
-	ramnarok: 1512 + 78,
-	ramnarokradiant: 1512 + 79,
+	syclant: 1560 + 0,
+	revenankh: 1560 + 1,
+	pyroak: 1560 + 2,
+	fidgit: 1560 + 3,
+	stratagem: 1560 + 4,
+	arghonaut: 1560 + 5,
+	kitsunoh: 1560 + 6,
+	cyclohm: 1560 + 7,
+	colossoil: 1560 + 8,
+	krilowatt: 1560 + 9,
+	voodoom: 1560 + 10,
+	tomohawk: 1560 + 11,
+	necturna: 1560 + 12,
+	mollux: 1560 + 13,
+	aurumoth: 1560 + 14,
+	malaconda: 1560 + 15,
+	cawmodore: 1560 + 16,
+	volkraken: 1560 + 17,
+	plasmanta: 1560 + 18,
+	naviathan: 1560 + 19,
+	crucibelle: 1560 + 20,
+	crucibellemega: 1560 + 21,
+	kerfluffle: 1560 + 22,
+	pajantom: 1560 + 23,
+	jumbao: 1560 + 24,
+	caribolt: 1560 + 25,
+	smokomodo: 1560 + 26,
+	snaelstrom: 1560 + 27,
+	equilibra: 1560 + 28,
+	astrolotl: 1560 + 29,
+	miasmaw: 1560 + 30,
+	chromera: 1560 + 31,
+	venomicon: 1560 + 32,
+	venomiconepilogue: 1560 + 33,
+	saharaja: 1560 + 34,
+	hemogoblin: 1560 + 35,
+	syclar: 1560 + 36,
+	embirch: 1560 + 37,
+	flarelm: 1560 + 38,
+	breezi: 1560 + 39,
+	scratchet: 1560 + 40,
+	necturine: 1560 + 41,
+	cupra: 1560 + 42,
+	argalis: 1560 + 43,
+	brattler: 1560 + 44,
+	cawdet: 1560 + 45,
+	volkritter: 1560 + 46,
+	snugglow: 1560 + 47,
+	floatoy: 1560 + 48,
+	caimanoe: 1560 + 49,
+	pluffle: 1560 + 50,
+	rebble: 1560 + 51,
+	tactite: 1560 + 52,
+	privatyke: 1560 + 53,
+	nohface: 1560 + 54,
+	monohm: 1560 + 55,
+	duohm: 1560 + 56,
+	protowatt: 1560 + 57,
+	voodoll: 1560 + 58,
+	mumbao: 1560 + 59,
+	fawnifer: 1560 + 60,
+	electrelk: 1560 + 61,
+	smogecko: 1560 + 62,
+	smoguana: 1560 + 63,
+	swirlpool: 1560 + 64,
+	coribalis: 1560 + 65,
+	justyke: 1560 + 66,
+	solotl: 1560 + 67,
+	miasmite: 1560 + 68,
+	dorsoil: 1560 + 69,
+	saharascal: 1560 + 70,
+	ababo: 1560 + 71,
+	scattervein: 1560 + 72,
+	cresceidon: 1560 + 73,
+	chuggalong: 1560 + 74,
+	shox: 1560 + 75,
+	chuggon: 1560 + 76,
+	draggalong: 1560 + 77,
+	ramnarok: 1560 + 78,
+	ramnarokradiant: 1560 + 79,
+	flox: 1560 + 80,
+	obliteryx: 1560 + 81,
 };
 
 const BattlePokemonIconIndexesLeft = {
-	pikachubelle: 1404 + 0,
-	pikachupopstar: 1404 + 1,
-	clefairy: 1404 + 2,
-	clefable: 1404 + 3,
-	jigglypuff: 1404 + 4,
-	wigglytuff: 1404 + 5,
-	dugtrioalola: 1404 + 6,
-	poliwhirl: 1404 + 7,
-	poliwrath: 1404 + 8,
-	mukalola: 1404 + 9,
-	kingler: 1404 + 10,
-	croconaw: 1404 + 11,
-	cleffa: 1404 + 12,
-	igglybuff: 1404 + 13,
-	politoed: 1404 + 14,
-	unownb: 1404 + 15,
-	unownc: 1404 + 16,
-	unownd: 1404 + 17,
-	unowne: 1404 + 18,
-	unownf: 1404 + 19,
-	unowng: 1404 + 20,
-	unownh: 1404 + 21,
-	unownj: 1404 + 22,
-	unownk: 1404 + 23,
-	unownl: 1404 + 24,
-	unownm: 1404 + 25,
-	unownn: 1404 + 26,
-	unownp: 1404 + 27,
-	unownq: 1404 + 28,
-	unownquestion: 1404 + 29,
-	unownr: 1404 + 30,
-	unowns: 1404 + 31,
-	unownt: 1404 + 32,
-	unownv: 1404 + 33,
-	unownz: 1404 + 34,
-	sneasel: 1404 + 35,
-	teddiursa: 1404 + 36,
-	roselia: 1404 + 37,
-	zangoose: 1404 + 38,
-	seviper: 1404 + 39,
-	castformsnowy: 1404 + 40,
-	absolmega: 1404 + 41,
-	absol: 1404 + 42,
-	regirock: 1404 + 43,
-	torterra: 1404 + 44,
-	budew: 1404 + 45,
-	roserade: 1404 + 46,
-	magmortar: 1404 + 47,
-	togekiss: 1404 + 48,
-	rotomwash: 1404 + 49,
-	shayminsky: 1404 + 50,
-	emboar: 1404 + 51,
-	pansear: 1404 + 52,
-	simisear: 1404 + 53,
-	drilbur: 1404 + 54,
-	excadrill: 1404 + 55,
-	sawk: 1404 + 56,
-	lilligant: 1404 + 57,
-	garbodor: 1404 + 58,
-	solosis: 1404 + 59,
-	vanilluxe: 1404 + 60,
-	amoonguss: 1404 + 61,
-	klink: 1404 + 62,
-	klang: 1404 + 63,
-	klinklang: 1404 + 64,
-	litwick: 1404 + 65,
-	golett: 1404 + 66,
-	golurk: 1404 + 67,
-	kyuremblack: 1404 + 68,
-	kyuremwhite: 1404 + 69,
-	kyurem: 1404 + 70,
-	keldeoresolute: 1404 + 71,
-	meloetta: 1404 + 72,
-	greninja: 1404 + 73,
-	greninjaash: 1404 + 74,
-	furfroudebutante: 1404 + 75,
-	barbaracle: 1404 + 76,
-	clauncher: 1404 + 77,
-	clawitzer: 1404 + 78,
-	sylveon: 1404 + 79,
-	klefki: 1404 + 80,
-	zygarde: 1404 + 81,
-	zygarde10: 1404 + 82,
-	zygardecomplete: 1404 + 83,
-	dartrix: 1404 + 84,
-	steenee: 1404 + 85,
-	tsareena: 1404 + 86,
-	comfey: 1404 + 87,
-	miniormeteor: 1404 + 88,
-	minior: 1404 + 89,
-	miniororange: 1404 + 90,
-	minioryellow: 1404 + 91,
-	miniorgreen: 1404 + 92,
-	miniorblue: 1404 + 93,
-	miniorviolet: 1404 + 94,
-	miniorindigo: 1404 + 95,
-	dhelmise: 1404 + 96,
-	necrozma: 1404 + 97,
-	marshadow: 1404 + 98,
-	pikachuoriginal: 1404 + 99,
-	pikachupartner: 1404 + 100,
-	necrozmaduskmane: 1404 + 101,
-	necrozmadawnwings: 1404 + 102,
-	necrozmaultra: 1404 + 103,
-	stakataka: 1404 + 104,
-	blacephalon: 1404 + 105,
+	pikachubelle: 1452 + 0,
+	pikachupopstar: 1452 + 1,
+	clefairy: 1452 + 2,
+	clefable: 1452 + 3,
+	jigglypuff: 1452 + 4,
+	wigglytuff: 1452 + 5,
+	dugtrioalola: 1452 + 6,
+	poliwhirl: 1452 + 7,
+	poliwrath: 1452 + 8,
+	mukalola: 1452 + 9,
+	kingler: 1452 + 10,
+	croconaw: 1452 + 11,
+	cleffa: 1452 + 12,
+	igglybuff: 1452 + 13,
+	politoed: 1452 + 14,
+	unownb: 1452 + 15,
+	unownc: 1452 + 16,
+	unownd: 1452 + 17,
+	unowne: 1452 + 18,
+	unownf: 1452 + 19,
+	unowng: 1452 + 20,
+	unownh: 1452 + 21,
+	unownj: 1452 + 22,
+	unownk: 1452 + 23,
+	unownl: 1452 + 24,
+	unownm: 1452 + 25,
+	unownn: 1452 + 26,
+	unownp: 1452 + 27,
+	unownq: 1452 + 28,
+	unownquestion: 1452 + 29,
+	unownr: 1452 + 30,
+	unowns: 1452 + 31,
+	unownt: 1452 + 32,
+	unownv: 1452 + 33,
+	unownz: 1452 + 34,
+	sneasel: 1452 + 35,
+	teddiursa: 1452 + 36,
+	roselia: 1452 + 37,
+	zangoose: 1452 + 38,
+	seviper: 1452 + 39,
+	castformsnowy: 1452 + 40,
+	absolmega: 1452 + 41,
+	absol: 1452 + 42,
+	regirock: 1452 + 43,
+	torterra: 1452 + 44,
+	budew: 1452 + 45,
+	roserade: 1452 + 46,
+	magmortar: 1452 + 47,
+	togekiss: 1452 + 48,
+	rotomwash: 1452 + 49,
+	shayminsky: 1452 + 50,
+	emboar: 1452 + 51,
+	pansear: 1452 + 52,
+	simisear: 1452 + 53,
+	drilbur: 1452 + 54,
+	excadrill: 1452 + 55,
+	sawk: 1452 + 56,
+	lilligant: 1452 + 57,
+	garbodor: 1452 + 58,
+	solosis: 1452 + 59,
+	vanilluxe: 1452 + 60,
+	amoonguss: 1452 + 61,
+	klink: 1452 + 62,
+	klang: 1452 + 63,
+	klinklang: 1452 + 64,
+	litwick: 1452 + 65,
+	golett: 1452 + 66,
+	golurk: 1452 + 67,
+	kyuremblack: 1452 + 68,
+	kyuremwhite: 1452 + 69,
+	kyurem: 1452 + 70,
+	keldeoresolute: 1452 + 71,
+	meloetta: 1452 + 72,
+	greninja: 1452 + 73,
+	// greninjabond: 1452 + 73,
+	greninjaash: 1452 + 74,
+	furfroudebutante: 1452 + 75,
+	barbaracle: 1452 + 76,
+	clauncher: 1452 + 77,
+	clawitzer: 1452 + 78,
+	sylveon: 1452 + 79,
+	klefki: 1452 + 80,
+	zygarde: 1452 + 81,
+	zygarde10: 1452 + 82,
+	zygardecomplete: 1452 + 83,
+	dartrix: 1452 + 84,
+	steenee: 1452 + 85,
+	tsareena: 1452 + 86,
+	comfey: 1452 + 87,
+	miniormeteor: 1452 + 88,
+	minior: 1452 + 89,
+	miniororange: 1452 + 90,
+	minioryellow: 1452 + 91,
+	miniorgreen: 1452 + 92,
+	miniorblue: 1452 + 93,
+	miniorviolet: 1452 + 94,
+	miniorindigo: 1452 + 95,
+	dhelmise: 1452 + 96,
+	necrozma: 1452 + 97,
+	marshadow: 1452 + 98,
+	pikachuoriginal: 1452 + 99,
+	pikachupartner: 1452 + 100,
+	necrozmaduskmane: 1452 + 101,
+	necrozmadawnwings: 1452 + 102,
+	necrozmaultra: 1452 + 103,
+	stakataka: 1452 + 104,
+	blacephalon: 1452 + 105,
 };
 
 const entries = [];
@@ -635,7 +687,7 @@ for (const name of fs.readdirSync(spritesDir)) {
     }
     
     if (index === undefined) {
-        if (entry) {
+        if (entry && !entry.forme) {
             index = entry.num;
         } else {
             errors.push(`can't find ${name}`);