diff --git a/ps-pokemon.sheet.mjs b/ps-pokemon.sheet.mjs
index 19b3881f..e119b4a9 100644
--- a/ps-pokemon.sheet.mjs
+++ b/ps-pokemon.sheet.mjs
@@ -15,6 +15,7 @@ function toPSID(name) {
 const BattlePokemonIconIndexes = {
 	unknown: 0,
     
+	// alt forms
 	egg: 1020 + 1,
 	pikachubelle: 1020 + 2,
 	pikachulibre: 1020 + 3,
@@ -131,7 +132,6 @@ const BattlePokemonIconIndexes = {
 	furfroustar: 1020 + 114,
 	meowsticf: 1020 + 115,
 	aegislashblade: 1020 + 116,
-	// Added
 	xerneasneutral: 1020 + 117,
 	hoopaunbound: 1020 + 118,
 	rattataalola: 1020 + 119,
@@ -198,8 +198,6 @@ const BattlePokemonIconIndexes = {
 	cramorantgulping: 1020 + 180,
 	cramorantgorging: 1020 + 181,
 	toxtricitylowkey: 1020 + 182,
-	//sinisteaantique: 854,
-	//polteageistantique: 855,
 	alcremierubycream: 1020 + 183,
 	alcremiematchacream: 1020 + 184,
 	alcremiemintcream: 1020 + 185,
@@ -223,211 +221,231 @@ const BattlePokemonIconIndexes = {
 	slowkinggalar: 1020 + 203,
 	calyrexice: 1020 + 204,
 	calyrexshadow: 1020 + 205,
-	// growlithehisui: 1020 + 206,
-	// arcaninehisui: 1020 + 207,
-	// voltorbhisui: 1020 + 208,
-	// electrodehisui: 1020 + 209,
-	// typhlosionhisui: 1020 + 210,
-	// qwilfishhisui: 1020 + 211,
-	// sneaselhisui: 1020 + 212,
-	// samurotthisui: 1020 + 213,
-	// lilliganthisui: 1020 + 214,
-	// zoruahisui: 1020 + 215,
-	// zoroarkhisui: 1020 + 216,
-	// braviaryhisui: 1020 + 217,
-	// sliggoohisui: 1020 + 218,
-	// goodrahisui: 1020 + 219,
-	// avalugghisui: 1020 + 220,
-	// decidueyehisui: 1020 + 221,
-	// basculegionf: 1020 + 222,
-	// enamorustherian: 1020 + 223,
-	// taurospaldea: 1020 + 224,
-	// taurospaldeafire: 1020 + 225,
-	// taurospaldeawater: 1020 + 226,
-	// wooperpaldea: 1020 + 227,
-	// oinkolognef: 1020 + 228,
-	// palafinhero: 1020 + 229,
-	// mausholdfour: 1020 + 230,
-	// tatsugiridroopy: 1020 + 231,
-	// tatsugiristretchy: 1020 + 232,
-	// squawkabillyblue: 1020 + 233,
-	// squawkabillyyellow: 1020 + 234,
-	// squawkabillywhite: 1020 + 235,
-	// gimmighoulroaming: 1020 + 236,
-	// dialgaorigin: 1020 + 237,
-	// palkiaorigin: 1020 + 238,
-	//basculinwhitestriped: 1020 + 239,
+	growlithehisui: 1020 + 206,
+	arcaninehisui: 1020 + 207,
+	voltorbhisui: 1020 + 208,
+	electrodehisui: 1020 + 209,
+	typhlosionhisui: 1020 + 210,
+	qwilfishhisui: 1020 + 211,
+	sneaselhisui: 1020 + 212,
+	samurotthisui: 1020 + 213,
+	lilliganthisui: 1020 + 214,
+	zoruahisui: 1020 + 215,
+	zoroarkhisui: 1020 + 216,
+	braviaryhisui: 1020 + 217,
+	sliggoohisui: 1020 + 218,
+	goodrahisui: 1020 + 219,
+	avalugghisui: 1020 + 220,
+	decidueyehisui: 1020 + 221,
+	basculegionf: 1020 + 222,
+	enamorustherian: 1020 + 223,
+	taurospaldeacombat: 1020 + 224,
+	taurospaldeablaze: 1020 + 225,
+	taurospaldeaaqua: 1020 + 226,
+	wooperpaldea: 1020 + 227,
+	oinkolognef: 1020 + 228,
+	palafinhero: 1020 + 229,
+	mausholdfour: 1020 + 230,
+	tatsugiridroopy: 1020 + 231,
+	tatsugiristretchy: 1020 + 232,
+	squawkabillyblue: 1020 + 233,
+	squawkabillyyellow: 1020 + 234,
+	squawkabillywhite: 1020 + 235,
+	gimmighoulroaming: 1020 + 236,
+	dialgaorigin: 1020 + 237,
+	palkiaorigin: 1020 + 238,
+	basculinwhitestriped: 1020 + 239,
+	ursalunabloodmoon: 1020 + 240,
+	ogerponwellspring: 1020 + 241,
+	ogerponhearthflame: 1020 + 242,
+	ogerponcornerstone: 1020 + 243,
 
-	//gumshoostotem: 735,
-	//raticatealolatotem: 900 + 120,
-	//marowakalolatotem: 900 + 136,
-	//araquanidtotem: 752,
-	//lurantistotem: 754,
-	//salazzletotem: 758,
-	//vikavolttotem: 738,
-	//togedemarutotem: 777,
-	//mimikyutotem: 778,
-	//mimikyubustedtotem: 778,
-	//ribombeetotem: 743,
-	//kommoototem: 784,
+	// alt forms with duplicate icons
+	/* greninjabond: 658,
+	gumshoostotem: 735,
+	raticatealolatotem: 1020 + 120,
+	marowakalolatotem: 1020 + 136,
+	araquanidtotem: 752,
+	lurantistotem: 754,
+	salazzletotem: 758,
+	vikavolttotem: 738,
+	togedemarutotem: 777,
+	mimikyutotem: 778,
+	mimikyubustedtotem: 778,
+	ribombeetotem: 743,
+	kommoototem: 784,
+	sinisteaantique: 854,
+	polteageistantique: 855,
+	poltchageistartisan: 1012,
+	sinistchamasterpiece: 1013,
+	ogerpontealtera: 1017,
+	ogerponwellspringtera: 1020 + 241,
+	ogerponhearthflametera: 1020 + 242,
+	ogerponcornerstonetera: 1020 + 243, */
 
-	venusaurmega: 1260 + 0,
-	charizardmegax: 1260 + 1,
-	charizardmegay: 1260 + 2,
-	blastoisemega: 1260 + 3,
-	beedrillmega: 1260 + 4,
-	pidgeotmega: 1260 + 5,
-	alakazammega: 1260 + 6,
-	slowbromega: 1260 + 7,
-	gengarmega: 1260 + 8,
-	kangaskhanmega: 1260 + 9,
-	pinsirmega: 1260 + 10,
-	gyaradosmega: 1260 + 11,
-	aerodactylmega: 1260 + 12,
-	mewtwomegax: 1260 + 13,
-	mewtwomegay: 1260 + 14,
-	ampharosmega: 1260 + 15,
-	steelixmega: 1260 + 16,
-	scizormega: 1260 + 17,
-	heracrossmega: 1260 + 18,
-	houndoommega: 1260 + 19,
-	tyranitarmega: 1260 + 20,
-	sceptilemega: 1260 + 21,
-	blazikenmega: 1260 + 22,
-	swampertmega: 1260 + 23,
-	gardevoirmega: 1260 + 24,
-	sableyemega: 1260 + 25,
-	mawilemega: 1260 + 26,
-	aggronmega: 1260 + 27,
-	medichammega: 1260 + 28,
-	manectricmega: 1260 + 29,
-	sharpedomega: 1260 + 30,
-	cameruptmega: 1260 + 31,
-	altariamega: 1260 + 32,
-	banettemega: 1260 + 33,
-	absolmega: 1260 + 34,
-	glaliemega: 1260 + 35,
-	salamencemega: 1260 + 36,
-	metagrossmega: 1260 + 37,
-	latiasmega: 1260 + 38,
-	latiosmega: 1260 + 39,
-	kyogreprimal: 1260 + 40,
-	groudonprimal: 1260 + 41,
-	rayquazamega: 1260 + 42,
-	lopunnymega: 1260 + 43,
-	garchompmega: 1260 + 44,
-	lucariomega: 1260 + 45,
-	abomasnowmega: 1260 + 46,
-	gallademega: 1260 + 47,
-	audinomega: 1260 + 48,
-	dianciemega: 1260 + 49,
-	charizardgmax: 1260 + 50,
-	butterfreegmax: 1260 + 51,
-	pikachugmax: 1260 + 52,
-	meowthgmax: 1260 + 53,
-	machampgmax: 1260 + 54,
-	gengargmax: 1260 + 55,
-	kinglergmax: 1260 + 56,
-	laprasgmax: 1260 + 57,
-	eeveegmax: 1260 + 58,
-	snorlaxgmax: 1260 + 59,
-	garbodorgmax: 1260 + 60,
-	melmetalgmax: 1260 + 61,
-	corviknightgmax: 1260 + 62,
-	orbeetlegmax: 1260 + 63,
-	drednawgmax: 1260 + 64,
-	coalossalgmax: 1260 + 65,
-	flapplegmax: 1260 + 66,
-	appletungmax: 1260 + 67,
-	sandacondagmax: 1260 + 68,
-	toxtricitygmax: 1260 + 69,
-	//toxtricitylowkeygmax: 1260 + 69,
-	centiskorchgmax: 1260 + 70,
-	hatterenegmax: 1260 + 71,
-	grimmsnarlgmax: 1260 + 72,
-	alcremiegmax: 1260 + 73,
-	copperajahgmax: 1260 + 74,
-	duraludongmax: 1260 + 75,
-	eternatuseternamax: 1260 + 76,
-	venusaurgmax: 1260 + 77,
-	blastoisegmax: 1260 + 78,
-	rillaboomgmax: 1260 + 79,
-	cinderacegmax: 1260 + 80,
-	inteleongmax: 1260 + 81,
-	urshifugmax: 1260 + 82,
-	urshifurapidstrikegmax: 1260 + 83,
+	// Mega/G-Max
+	venusaurmega: 1272 + 0,
+	charizardmegax: 1272 + 1,
+	charizardmegay: 1272 + 2,
+	blastoisemega: 1272 + 3,
+	beedrillmega: 1272 + 4,
+	pidgeotmega: 1272 + 5,
+	alakazammega: 1272 + 6,
+	slowbromega: 1272 + 7,
+	gengarmega: 1272 + 8,
+	kangaskhanmega: 1272 + 9,
+	pinsirmega: 1272 + 10,
+	gyaradosmega: 1272 + 11,
+	aerodactylmega: 1272 + 12,
+	mewtwomegax: 1272 + 13,
+	mewtwomegay: 1272 + 14,
+	ampharosmega: 1272 + 15,
+	steelixmega: 1272 + 16,
+	scizormega: 1272 + 17,
+	heracrossmega: 1272 + 18,
+	houndoommega: 1272 + 19,
+	tyranitarmega: 1272 + 20,
+	sceptilemega: 1272 + 21,
+	blazikenmega: 1272 + 22,
+	swampertmega: 1272 + 23,
+	gardevoirmega: 1272 + 24,
+	sableyemega: 1272 + 25,
+	mawilemega: 1272 + 26,
+	aggronmega: 1272 + 27,
+	medichammega: 1272 + 28,
+	manectricmega: 1272 + 29,
+	sharpedomega: 1272 + 30,
+	cameruptmega: 1272 + 31,
+	altariamega: 1272 + 32,
+	banettemega: 1272 + 33,
+	absolmega: 1272 + 34,
+	glaliemega: 1272 + 35,
+	salamencemega: 1272 + 36,
+	metagrossmega: 1272 + 37,
+	latiasmega: 1272 + 38,
+	latiosmega: 1272 + 39,
+	kyogreprimal: 1272 + 40,
+	groudonprimal: 1272 + 41,
+	rayquazamega: 1272 + 42,
+	lopunnymega: 1272 + 43,
+	garchompmega: 1272 + 44,
+	lucariomega: 1272 + 45,
+	abomasnowmega: 1272 + 46,
+	gallademega: 1272 + 47,
+	audinomega: 1272 + 48,
+	dianciemega: 1272 + 49,
+	charizardgmax: 1272 + 50,
+	butterfreegmax: 1272 + 51,
+	pikachugmax: 1272 + 52,
+	meowthgmax: 1272 + 53,
+	machampgmax: 1272 + 54,
+	gengargmax: 1272 + 55,
+	kinglergmax: 1272 + 56,
+	laprasgmax: 1272 + 57,
+	eeveegmax: 1272 + 58,
+	snorlaxgmax: 1272 + 59,
+	garbodorgmax: 1272 + 60,
+	melmetalgmax: 1272 + 61,
+	corviknightgmax: 1272 + 62,
+	orbeetlegmax: 1272 + 63,
+	drednawgmax: 1272 + 64,
+	coalossalgmax: 1272 + 65,
+	flapplegmax: 1272 + 66,
+	appletungmax: 1272 + 67,
+	sandacondagmax: 1272 + 68,
+	toxtricitygmax: 1272 + 69,
+	toxtricitylowkeygmax: 1272 + 69,
+	centiskorchgmax: 1272 + 70,
+	hatterenegmax: 1272 + 71,
+	grimmsnarlgmax: 1272 + 72,
+	alcremiegmax: 1272 + 73,
+	copperajahgmax: 1272 + 74,
+	duraludongmax: 1272 + 75,
+	eternatuseternamax: 1272 + 76,
+	venusaurgmax: 1272 + 77,
+	blastoisegmax: 1272 + 78,
+	rillaboomgmax: 1272 + 79,
+	cinderacegmax: 1272 + 80,
+	inteleongmax: 1272 + 81,
+	urshifugmax: 1272 + 82,
+	urshifurapidstrikegmax: 1272 + 83,
 
-	syclant: 1452 + 0,
-	revenankh: 1452 + 1,
-	pyroak: 1452 + 2,
-	fidgit: 1452 + 3,
-	stratagem: 1452 + 4,
-	arghonaut: 1452 + 5,
-	kitsunoh: 1452 + 6,
-	cyclohm: 1452 + 7,
-	colossoil: 1452 + 8,
-	krilowatt: 1452 + 9,
-	voodoom: 1452 + 10,
-	tomohawk: 1452 + 11,
-	necturna: 1452 + 12,
-	mollux: 1452 + 13,
-	aurumoth: 1452 + 14,
-	malaconda: 1452 + 15,
-	cawmodore: 1452 + 16,
-	volkraken: 1452 + 17,
-	plasmanta: 1452 + 18,
-	naviathan: 1452 + 19,
-	crucibelle: 1452 + 20,
-	crucibellemega: 1452 + 21,
-	kerfluffle: 1452 + 22,
-	pajantom: 1452 + 23,
-	jumbao: 1452 + 24,
-	caribolt: 1452 + 25,
-	smokomodo: 1452 + 26,
-	snaelstrom: 1452 + 27,
-	equilibra: 1452 + 28,
-	astrolotl: 1452 + 29,
-	miasmaw: 1452 + 30,
-	chromera: 1452 + 31,
-	venomicon: 1452 + 32,
-	venomiconepilogue: 1452 + 33,
-	saharaja: 1452 + 34,
+	// CAP
+	syclant: 1464 + 0,
+	revenankh: 1464 + 1,
+	pyroak: 1464 + 2,
+	fidgit: 1464 + 3,
+	stratagem: 1464 + 4,
+	arghonaut: 1464 + 5,
+	kitsunoh: 1464 + 6,
+	cyclohm: 1464 + 7,
+	colossoil: 1464 + 8,
+	krilowatt: 1464 + 9,
+	voodoom: 1464 + 10,
+	tomohawk: 1464 + 11,
+	necturna: 1464 + 12,
+	mollux: 1464 + 13,
+	aurumoth: 1464 + 14,
+	malaconda: 1464 + 15,
+	cawmodore: 1464 + 16,
+	volkraken: 1464 + 17,
+	plasmanta: 1464 + 18,
+	naviathan: 1464 + 19,
+	crucibelle: 1464 + 20,
+	crucibellemega: 1464 + 21,
+	kerfluffle: 1464 + 22,
+	pajantom: 1464 + 23,
+	jumbao: 1464 + 24,
+	caribolt: 1464 + 25,
+	smokomodo: 1464 + 26,
+	snaelstrom: 1464 + 27,
+	equilibra: 1464 + 28,
+	astrolotl: 1464 + 29,
+	miasmaw: 1464 + 30,
+	chromera: 1464 + 31,
+	venomicon: 1464 + 32,
+	venomiconepilogue: 1464 + 33,
+	saharaja: 1464 + 34,
+	hemogoblin: 1464 + 35,
 
-	syclar: 1488 + 0,
-	embirch: 1488 + 1,
-	flarelm: 1488 + 2,
-	breezi: 1488 + 3,
-	scratchet: 1488 + 4,
-	necturine: 1488 + 5,
-	cupra: 1488 + 6,
-	argalis: 1488 + 7,
-	brattler: 1488 + 8,
-	cawdet: 1488 + 9,
-	volkritter: 1488 + 10,
-	snugglow: 1488 + 11,
-	floatoy: 1488 + 12,
-	caimanoe: 1488 + 13,
-	pluffle: 1488 + 14,
-	rebble: 1488 + 15,
-	tactite: 1488 + 16,
-	privatyke: 1488 + 17,
-	nohface: 1488 + 18,
-	monohm: 1488 + 19,
-	duohm: 1488 + 20,
-	protowatt: 1488 + 21,
-	voodoll: 1488 + 22,
-	mumbao: 1488 + 23,
-	fawnifer: 1488 + 24,
-	electrelk: 1488 + 25,
-	smogecko: 1488 + 26,
-	smoguana: 1488 + 27,
-	swirlpool: 1488 + 28,
-	coribalis: 1488 + 29,
-	justyke: 1488 + 30,
-	solotl: 1488 + 31,
-	miasmite: 1488 + 32,
-	dorsoil: 1488 + 33,
-	//saharascal: 1488 + 34,
+	// CAP prevos
+	syclar: 1500 + 0,
+	embirch: 1500 + 1,
+	flarelm: 1500 + 2,
+	breezi: 1500 + 3,
+	scratchet: 1500 + 4,
+	necturine: 1500 + 5,
+	cupra: 1500 + 6,
+	argalis: 1500 + 7,
+	brattler: 1500 + 8,
+	cawdet: 1500 + 9,
+	volkritter: 1500 + 10,
+	snugglow: 1500 + 11,
+	floatoy: 1500 + 12,
+	caimanoe: 1500 + 13,
+	pluffle: 1500 + 14,
+	rebble: 1500 + 15,
+	tactite: 1500 + 16,
+	privatyke: 1500 + 17,
+	nohface: 1500 + 18,
+	monohm: 1500 + 19,
+	duohm: 1500 + 20,
+	protowatt: 1500 + 21,
+	voodoll: 1500 + 22,
+	mumbao: 1500 + 23,
+	fawnifer: 1500 + 24,
+	electrelk: 1500 + 25,
+	smogecko: 1500 + 26,
+	smoguana: 1500 + 27,
+	swirlpool: 1500 + 28,
+	coribalis: 1500 + 29,
+	justyke: 1500 + 30,
+	solotl: 1500 + 31,
+	miasmite: 1500 + 32,
+	dorsoil: 1500 + 33,
+	saharascal: 1500 + 34,
+	ababo: 1500 + 35,
+	scattervein: 1500 + 36,
 };
 
 const BattlePokemonIconIndexesLeft = {